[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <54E8E185.8070008@users.sourceforge.net>
Date: Sat, 21 Feb 2015 20:50:29 +0100
From: SF Markus Elfring <elfring@...rs.sourceforge.net>
To: Joel Becker <jlbec@...lplan.org>, Mark Fasheh <mfasheh@...e.com>,
ocfs2-devel@....oracle.com
CC: linux-kernel@...r.kernel.org, kernel-janitors@...r.kernel.org,
Julia Lawall <julia.lawall@...6.fr>
Subject: [PATCH 7/7] ocfs2: One function call less in user_cluster_connect()
after error detection
From: Markus Elfring <elfring@...rs.sourceforge.net>
Date: Sat, 21 Feb 2015 20:09:00 +0100
The kfree() function was called by the user_cluster_connect() function
even if a previous call of the kzalloc() function failed.
Return from this implementation directly after failure detection.
Signed-off-by: Markus Elfring <elfring@...rs.sourceforge.net>
---
fs/ocfs2/stack_user.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/fs/ocfs2/stack_user.c b/fs/ocfs2/stack_user.c
index c3b7807..2768eb1 100644
--- a/fs/ocfs2/stack_user.c
+++ b/fs/ocfs2/stack_user.c
@@ -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);
--
2.3.0
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists