From: Andy Grover <andy.grover@oracle.com>
Date: Mon, 29 Mar 2010 23:46:46 +0000 (-0700)
Subject: RDS: Use NOWAIT in message_map_pages()
X-Git-Tag: v2.6.37-rc1~147^2~499^2~60
X-Git-Url: http://bbs.cooldavid.org/git/?a=commitdiff_plain;h=f2ec76f288118fb18449402d75383212cbcb6762;p=net-next-2.6.git

RDS: Use NOWAIT in message_map_pages()

Can no longer block, so use NOWAIT.

Signed-off-by: Andy Grover <andy.grover@oracle.com>
---

diff --git a/net/rds/message.c b/net/rds/message.c
index 1f73a7358a8..dd915e3e492 100644
--- a/net/rds/message.c
+++ b/net/rds/message.c
@@ -256,7 +256,7 @@ struct rds_message *rds_message_map_pages(unsigned long *page_addrs, unsigned in
 	int num_sgs = ceil(total_len, PAGE_SIZE);
 	int extra_bytes = num_sgs * sizeof(struct scatterlist);
 
-	rm = rds_message_alloc(extra_bytes, GFP_KERNEL);
+	rm = rds_message_alloc(extra_bytes, GFP_NOWAIT);
 	if (!rm)
 		return ERR_PTR(-ENOMEM);