iscsi: Use GFP_ATOMIC in iscsi_offload_mesg().
authorMichael Chan <mchan@broadcom.com>
Wed, 29 Jul 2009 08:49:52 +0000 (08:49 +0000)
committerDavid S. Miller <davem@davemloft.net>
Thu, 30 Jul 2009 18:05:03 +0000 (11:05 -0700)
Changing to GFP_ATOMIC because the only caller in cnic/bnx2i may
be calling this function while holding spin_lock.

This problem was discovered by Mike Christie.

Signed-off-by: Michael Chan <mchan@broadcom.com>
Acked-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/scsi/scsi_transport_iscsi.c

index 783e33c65eb7c354a5e6613f2653c0b95517f51c..b47240ca4b19ad81f3ff72fbd0a15781c50ed5c8 100644 (file)
@@ -990,7 +990,7 @@ int iscsi_offload_mesg(struct Scsi_Host *shost,
        struct iscsi_uevent *ev;
        int len = NLMSG_SPACE(sizeof(*ev) + data_size);
 
-       skb = alloc_skb(len, GFP_NOIO);
+       skb = alloc_skb(len, GFP_ATOMIC);
        if (!skb) {
                printk(KERN_ERR "can not deliver iscsi offload message:OOM\n");
                return -ENOMEM;
@@ -1012,7 +1012,7 @@ int iscsi_offload_mesg(struct Scsi_Host *shost,
 
        memcpy((char *)ev + sizeof(*ev), data, data_size);
 
-       return iscsi_multicast_skb(skb, ISCSI_NL_GRP_UIP, GFP_NOIO);
+       return iscsi_multicast_skb(skb, ISCSI_NL_GRP_UIP, GFP_ATOMIC);
 }
 EXPORT_SYMBOL_GPL(iscsi_offload_mesg);