]> rtime.felk.cvut.cz Git - linux-imx.git/commitdiff
SUNRPC: remove BUG_ON from bc_malloc
authorWeston Andros Adamson <dros@netapp.com>
Tue, 23 Oct 2012 14:43:43 +0000 (10:43 -0400)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Sun, 4 Nov 2012 19:43:42 +0000 (14:43 -0500)
Replace BUG_ON() with WARN_ON_ONCE() and NULL return - the caller will handle
this like a memory allocation failure.

Signed-off-by: Weston Andros Adamson <dros@netapp.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
net/sunrpc/xprtsock.c

index 46c1a8798ed8881a75c9558de0419881b4db844b..6db26e5538fb4cf483b04a82bea18a21be4a0f81 100644 (file)
@@ -2330,9 +2330,11 @@ static void *bc_malloc(struct rpc_task *task, size_t size)
        struct page *page;
        struct rpc_buffer *buf;
 
-       BUG_ON(size > PAGE_SIZE - sizeof(struct rpc_buffer));
-       page = alloc_page(GFP_KERNEL);
+       WARN_ON_ONCE(size > PAGE_SIZE - sizeof(struct rpc_buffer));
+       if (size > PAGE_SIZE - sizeof(struct rpc_buffer))
+               return NULL;
 
+       page = alloc_page(GFP_KERNEL);
        if (!page)
                return NULL;