Merge tag 'v4.0-rc1' into locking/core, to refresh the tree before merging new changes

[firefly-linux-kernel-4.4.55.git] / fs / dlm / memory.c

diff --git a/fs/dlm/memory.c b/fs/dlm/memory.c
index da64df7576e18f5b5386aa3d9d5dde9465bba0be..7cd24bccd4fe56aab54db611c4587a8bdc51a7e8 100644 (file)
--- a/fs/dlm/memory.c
+++ b/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)