Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933239AbbFIMJW (ORCPT ); Tue, 9 Jun 2015 08:09:22 -0400 Received: from mx3-phx2.redhat.com ([209.132.183.24]:43112 "EHLO mx3-phx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752804AbbFIMJM (ORCPT ); Tue, 9 Jun 2015 08:09:12 -0400 Date: Tue, 9 Jun 2015 08:09:09 -0400 (EDT) From: Bob Peterson To: Guoqing Jiang Cc: ccaulfie@redhat.com, teigland@redhat.com, cluster-devel@redhat.com, linux-kernel@vger.kernel.org Message-ID: <1545280635.13245793.1433851749238.JavaMail.zimbra@redhat.com> In-Reply-To: <1433843172-8953-1-git-send-email-gqjiang@suse.com> References: <1433843172-8953-1-git-send-email-gqjiang@suse.com> Subject: Re: [Cluster-devel] [PATCH] dlm: remove unnecessary error check MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [10.3.113.34] X-Mailer: Zimbra 8.0.6_GA_5922 (ZimbraWebClient - FF38 (Linux)/8.0.6_GA_5922) Thread-Topic: remove unnecessary error check Thread-Index: Y6dRQ/Hs/99NIkw4UAr2Cp4IThJR+g== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1587 Lines: 58 ----- Original Message ----- > We don't need the redundant logic since send_message always returns 0. > > Signed-off-by: Guoqing Jiang > --- > fs/dlm/lock.c | 10 ++-------- > 1 file changed, 2 insertions(+), 8 deletions(-) > > diff --git a/fs/dlm/lock.c b/fs/dlm/lock.c > index 35502d4..6fc3de9 100644 > --- a/fs/dlm/lock.c > +++ b/fs/dlm/lock.c > @@ -3656,10 +3656,7 @@ static int send_common(struct dlm_rsb *r, struct > dlm_lkb *lkb, int mstype) > > send_args(r, lkb, ms); > > - error = send_message(mh, ms); > - if (error) > - goto fail; > - return 0; > + return send_message(mh, ms); > > fail: > remove_from_waiters(lkb, msg_reply_type(mstype)); > @@ -3763,10 +3760,7 @@ static int send_lookup(struct dlm_rsb *r, struct > dlm_lkb *lkb) > > send_args(r, lkb, ms); > > - error = send_message(mh, ms); > - if (error) > - goto fail; > - return 0; > + return send_message(mh, ms); > > fail: > remove_from_waiters(lkb, DLM_MSG_LOOKUP_REPLY); > -- > 1.7.12.4 Hi, The patch looks okay, but if remove_from_waiters() always returns 0, wouldn't it be better to change the function from int to void and return 0 here? The advantage is that code spelunkers wouldn't need to back-track one more level (not to mention the instruction or two it might save). Regards, Bob Peterson Red Hat File Systems -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/