[06/9] ib/iser: use atomic allocations

Commit Message

Or Gerlitz Feb. 3, 2010, 3:39 p.m. UTC

None

Patch

Index: linux-2.6.33-rc4/drivers/infiniband/ulp/iser/iser_initiator.c
===================================================================
--- linux-2.6.33-rc4.orig/drivers/infiniband/ulp/iser/iser_initiator.c
+++ linux-2.6.33-rc4/drivers/infiniband/ulp/iser/iser_initiator.c
@@ -373,7 +373,7 @@  int iser_send_data_out(struct iscsi_conn
 	iser_dbg("%s itt %d dseg_len %d offset %d\n",
 		 __func__,(int)itt,(int)data_seg_len,(int)buf_offset);

-	tx_desc = kmem_cache_zalloc(ig.desc_cache, GFP_NOIO);
+	tx_desc = kmem_cache_zalloc(ig.desc_cache, GFP_ATOMIC);
 	if (tx_desc == NULL) {
 		iser_err("Failed to alloc desc for post dataout\n");
 		return -ENOMEM;
Index: linux-2.6.33-rc4/drivers/infiniband/ulp/iser/iser_memory.c
===================================================================
--- linux-2.6.33-rc4.orig/drivers/infiniband/ulp/iser/iser_memory.c
+++ linux-2.6.33-rc4/drivers/infiniband/ulp/iser/iser_memory.c
@@ -53,10 +53,10 @@  static int iser_start_rdma_unaligned_sg(
 	unsigned long  cmd_data_len = data->data_len;

 	if (cmd_data_len > ISER_KMALLOC_THRESHOLD)
-		mem = (void *)__get_free_pages(GFP_NOIO,
+		mem = (void *)__get_free_pages(GFP_ATOMIC,
 		      ilog2(roundup_pow_of_two(cmd_data_len)) - PAGE_SHIFT);
 	else
-		mem = kmalloc(cmd_data_len, GFP_NOIO);
+		mem = kmalloc(cmd_data_len, GFP_ATOMIC);

 	if (mem == NULL) {
 		iser_err("Failed to allocate mem size %d %d for copying sglist\n",