From 5cb5da4e896ed0713b0c467d113a81f05a24fc8e Mon Sep 17 00:00:00 2001 From: "kirjanov@gmail.com" Date: Sat, 15 May 2010 12:32:34 -0400 Subject: [PATCH] --- yaml --- r: 190894 b: refs/heads/master c: 43aa7ac736a4e21aae4882bd8f7c67403aed45b8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/lib/btree.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b5215e505346..5a56b4d2a79b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bdef2fe88b1e4bde7458aedd207929ce3f9d66ee +refs/heads/master: 43aa7ac736a4e21aae4882bd8f7c67403aed45b8 diff --git a/trunk/lib/btree.c b/trunk/lib/btree.c index 41859a820218..c9c6f0351526 100644 --- a/trunk/lib/btree.c +++ b/trunk/lib/btree.c @@ -95,7 +95,8 @@ static unsigned long *btree_node_alloc(struct btree_head *head, gfp_t gfp) unsigned long *node; node = mempool_alloc(head->mempool, gfp); - memset(node, 0, NODESIZE); + if (likely(node)) + memset(node, 0, NODESIZE); return node; }