From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: + ocfs2-cluster-clean-up-unnecessary-assignment-for-ret.patch added to -mm tree Date: Mon, 18 Jul 2016 13:54:58 -0700 Message-ID: <578d4222.wcbO6l+EUEFoxyo+%akpm@linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Return-path: Received: from mail.linuxfoundation.org ([140.211.169.12]:47908 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751597AbcGRUy7 (ORCPT ); Mon, 18 Jul 2016 16:54:59 -0400 Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: piaojun@huawei.com, jlbec@evilplan.org, joseph.qi@huawei.com, junxiao.bi@oracle.com, mfasheh@suse.de, mm-commits@vger.kernel.org The patch titled Subject: ocfs2/cluster: clean up unnecessary assignment for 'ret' has been added to the -mm tree. Its filename is ocfs2-cluster-clean-up-unnecessary-assignment-for-ret.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/ocfs2-cluster-clean-up-unnecessary-assignment-for-ret.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/ocfs2-cluster-clean-up-unnecessary-assignment-for-ret.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: piaojun Subject: ocfs2/cluster: clean up unnecessary assignment for 'ret' Clean up unnecessary assignment for 'ret'. Link: http://lkml.kernel.org/r/578C61F6.4080403@huawei.com Signed-off-by: Jun Piao Reviewed-by: Joseph Qi Cc: Mark Fasheh Cc: Joel Becker Cc: Junxiao Bi Signed-off-by: Andrew Morton --- fs/ocfs2/cluster/tcp.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff -puN fs/ocfs2/cluster/tcp.c~ocfs2-cluster-clean-up-unnecessary-assignment-for-ret fs/ocfs2/cluster/tcp.c --- a/fs/ocfs2/cluster/tcp.c~ocfs2-cluster-clean-up-unnecessary-assignment-for-ret +++ a/fs/ocfs2/cluster/tcp.c @@ -1618,16 +1618,12 @@ static void o2net_start_connect(struct w /* watch for racing with tearing a node down */ node = o2nm_get_node_by_num(o2net_num_from_nn(nn)); - if (node == NULL) { - ret = 0; + if (node == NULL) goto out; - } mynode = o2nm_get_node_by_num(o2nm_this_node()); - if (mynode == NULL) { - ret = 0; + if (mynode == NULL) goto out; - } spin_lock(&nn->nn_lock); /* _ Patches currently in -mm which might be from piaojun@huawei.com are ocfs2-cluster-clean-up-unnecessary-assignment-for-ret.patch ocfs2-dlm-disable-bug_on-when-dlm_lock_res_dropping_ref-is-cleared-before-dlm_deref_lockres_done_handler.patch ocfs2-dlm-solve-a-bug-when-deref-failed-in-dlm_drop_lockres_ref.patch ocfs2-dlm-continue-to-purge-recovery-lockres-when-recovery-master-goes-down.patch