rds: scheduling while atomic on failover orabug: 16275095

Signed-off-by: Bang Nguyen <band.nguyen@oracle.com>
(cherry picked from commit a1b048d2106086119400fccbf37129414edf3f3a)

diff --git a/net/rds/ib.c b/net/rds/ib.c
index 9baaa8c8ecc042b605eaf4de76837133693cc9b1..3c26e282750c3d7ad2c57f0b4602d669f8079a9d 100644 (file)
--- a/net/rds/ib.c
+++ b/net/rds/ib.c
@@ -891,7 +891,7 @@ static void rds_ib_event_handler(struct ib_event_handler *handler,
                        (event->event == IB_EVENT_PORT_ACTIVE) ?
                                "ACTIVE" : "ERROR");
 
-               work = kzalloc(sizeof *work, GFP_KERNEL);
+               work = kzalloc(sizeof *work, GFP_ATOMIC);
                if (!work) {
                        printk(KERN_ERR
                                "RDS/IB: failed to allocate port work\n");
@@ -1238,7 +1238,7 @@ static int rds_ib_netdev_callback(struct notifier_block *self, unsigned long eve
                ip_config[port].port_num, ndev->name,
                (event == NETDEV_UP) ? "UP" : "DOWN");
 
-       work = kzalloc(sizeof *work, GFP_KERNEL);
+       work = kzalloc(sizeof *work, GFP_ATOMIC);
        if (!work) {
                printk(KERN_ERR "RDS/IB: failed to allocate port work\n");
                return NOTIFY_DONE;