summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Grover <andy.grover@oracle.com>2010-03-30 01:46:46 +0200
committerAndy Grover <andy.grover@oracle.com>2010-09-09 03:12:17 +0200
commitf2ec76f288118fb18449402d75383212cbcb6762 (patch)
tree0b5969496be44c1c94ec73fec1d97d7ccc88fcc7
parentRDS: Bypass workqueue when queueing cong updates (diff)
downloadlinux-f2ec76f288118fb18449402d75383212cbcb6762.tar.xz
linux-f2ec76f288118fb18449402d75383212cbcb6762.zip
RDS: Use NOWAIT in message_map_pages()
Can no longer block, so use NOWAIT. Signed-off-by: Andy Grover <andy.grover@oracle.com>
-rw-r--r--net/rds/message.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/rds/message.c b/net/rds/message.c
index 1f73a7358a8e..dd915e3e492d 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);