From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ying Xue Subject: Re: [PATCH net-next v2 1/2] tipc: make the code look more better Date: Wed, 25 Dec 2013 10:42:42 +0800 Message-ID: <52BA4622.3060702@windriver.com> References: <1387937473-5804-1-git-send-email-wangweidong1@huawei.com> <1387937473-5804-2-git-send-email-wangweidong1@huawei.com> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Cc: , To: Wang Weidong , , , Return-path: Received: from mail1.windriver.com ([147.11.146.13]:39400 "EHLO mail1.windriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751244Ab3LYCm6 (ORCPT ); Tue, 24 Dec 2013 21:42:58 -0500 In-Reply-To: <1387937473-5804-2-git-send-email-wangweidong1@huawei.com> Sender: netdev-owner@vger.kernel.org List-ID: On 12/25/2013 10:11 AM, Wang Weidong wrote: > In commit 0cee6bbe06f ("tipc: remove unnecessary variables and conditions") > didn't make the code look best. So fix it. This patch is cosmetic > and does not change the operation of TIPC in any way. > I cannot see what value the patch does provide. Actually the original logic seems better understandable for us because it immediately lets us know how to do if "tp_ptr->connected" is true. Instead the patch has a little negative effect on performance because "tp_ptr->connected" is true in most time. Regards, Ying > Suggested-by: David Laight > Signed-off-by: Wang Weidong > --- > net/tipc/port.c | 13 ++++++------- > 1 file changed, 6 insertions(+), 7 deletions(-) > > diff --git a/net/tipc/port.c b/net/tipc/port.c > index 5fd4c8c..ee81be0 100644 > --- a/net/tipc/port.c > +++ b/net/tipc/port.c > @@ -832,14 +832,13 @@ exit: > */ > int __tipc_disconnect(struct tipc_port *tp_ptr) > { > - if (tp_ptr->connected) { > - tp_ptr->connected = 0; > - /* let timer expire on it's own to avoid deadlock! */ > - tipc_nodesub_unsubscribe(&tp_ptr->subscription); > - return 0; > - } > + if (!tp_ptr->connected) > + return -ENOTCONN; > > - return -ENOTCONN; > + tp_ptr->connected = 0; > + /* let timer expire on it's own to avoid deadlock! */ > + tipc_nodesub_unsubscribe(&tp_ptr->subscription); > + return 0; > } > > /* >