]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
RDS: Use NOWAIT in message_map_pages()
authorAndy Grover <andy.grover@oracle.com>
Mon, 29 Mar 2010 23:46:46 +0000 (16:46 -0700)
committerAndy Grover <andy.grover@oracle.com>
Thu, 9 Sep 2010 01:12:17 +0000 (18:12 -0700)
Can no longer block, so use NOWAIT.

Signed-off-by: Andy Grover <andy.grover@oracle.com>
net/rds/message.c

index 1f73a7358a8e9eeaa238dcd687627ed14e9c6be6..dd915e3e492dc6f64ea7b4af1651d064b3ca4427 100644 (file)
@@ -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);