From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752301AbbBUTvB (ORCPT ); Sat, 21 Feb 2015 14:51:01 -0500 Received: from mout.web.de ([212.227.17.11]:55930 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751707AbbBUTvA (ORCPT ); Sat, 21 Feb 2015 14:51:00 -0500 Message-ID: <54E8E185.8070008@users.sourceforge.net> Date: Sat, 21 Feb 2015 20:50:29 +0100 From: SF Markus Elfring User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.4.0 MIME-Version: 1.0 To: Joel Becker , Mark Fasheh , ocfs2-devel@oss.oracle.com CC: linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Julia Lawall Subject: [PATCH 7/7] ocfs2: One function call less in user_cluster_connect() after error detection References: <5307CAA2.8060406@users.sourceforge.net> <530A086E.8010901@users.sourceforge.net> <530A72AA.3000601@users.sourceforge.net> <530B5FB6.6010207@users.sourceforge.net> <530C5E18.1020800@users.sourceforge.net> <530CD2C4.4050903@users.sourceforge.net> <530CF8FF.8080600@users.sourceforge.net> <530DD06F.4090703@users.sourceforge.net> <5317A59D.4@users.sourceforge.net> <5455FC05.4010606@users.sourceforge.net> <54E8DDDB.9020902@users.sourceforge.net> In-Reply-To: <54E8DDDB.9020902@users.sourceforge.net> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:43ijcOb9ijShkpfUZl33o+7yHxhZOmSWD/BPLhZnB2wskH61WUp Cz44+y9b1MdXL2nSgXNMuJpLb0wspSvBEGOEluBnA0CUjO/693IsukFOIpep+Ou5vX5hnMT t03Qz7V7gIcMy3hdkdfl8kM6GECOLcksPt5955mRxmJJqHabyLaFrnwuWVBTbB+U0ph67hV 0AKqFJZ+RlNNLkm6p1RWg== X-UI-Out-Filterresults: notjunk:1; Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring 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 --- 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