ocfs2: one function call less in user_cluster_connect() after error detection
authorMarkus Elfring <elfring@users.sourceforge.net>
Tue, 14 Apr 2015 22:42:59 +0000 (15:42 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 14 Apr 2015 23:48:57 +0000 (16:48 -0700)
kfree() was called by user_cluster_connect() even if a previous call of
the kzalloc() function failed.

Return from this implementation directly after failure detection.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
Cc: Mark Fasheh <mfasheh@suse.com>
Cc: Joel Becker <jlbec@evilplan.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
fs/ocfs2/stack_user.c

index c3b7807c65d6f72812a9bfa6512a0e9e705d3165..2768eb1da2b865f4afba3c35087da7c477c87309 100644 (file)
@@ -1004,10 +1004,8 @@ static int user_cluster_connect(struct ocfs2_cluster_connection *conn)
        BUG_ON(conn == NULL);
 
        lc = kzalloc(sizeof(struct ocfs2_live_connection), GFP_KERNEL);
-       if (!lc) {
-               rc = -ENOMEM;
-               goto out;
-       }
+       if (!lc)
+               return -ENOMEM;
 
        init_waitqueue_head(&lc->oc_wait);
        init_completion(&lc->oc_sync_wait);