From 77ddde520acb9dd8ff399e4384701a78cd114662 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Tue, 15 May 2012 11:58:12 +0300 Subject: [PATCH] --- yaml --- r: 305200 b: refs/heads/master c: 75af271ed5f51b1f3506c7c1d567b1f32e5c9206 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/dlm/memory.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 2f886529cce8..187854cbd209 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1a058f5288a74a20d5567a85ab1a04a9de69a212 +refs/heads/master: 75af271ed5f51b1f3506c7c1d567b1f32e5c9206 diff --git a/trunk/fs/dlm/memory.c b/trunk/fs/dlm/memory.c index da64df7576e1..7cd24bccd4fe 100644 --- a/trunk/fs/dlm/memory.c +++ b/trunk/fs/dlm/memory.c @@ -21,21 +21,19 @@ static struct kmem_cache *rsb_cache; int __init dlm_memory_init(void) { - int ret = 0; - lkb_cache = kmem_cache_create("dlm_lkb", sizeof(struct dlm_lkb), __alignof__(struct dlm_lkb), 0, NULL); if (!lkb_cache) - ret = -ENOMEM; + return -ENOMEM; rsb_cache = kmem_cache_create("dlm_rsb", sizeof(struct dlm_rsb), __alignof__(struct dlm_rsb), 0, NULL); if (!rsb_cache) { kmem_cache_destroy(lkb_cache); - ret = -ENOMEM; + return -ENOMEM; } - return ret; + return 0; } void dlm_memory_exit(void)