| Message ID | 1488219268-3006-1-git-send-email-singhalsimran0@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, 2017-02-27 at 23:44 +0530, simran singhal wrote: > This patch fixes the checkpatch warning that else is not generally > useful after a break or return. checkpatch doesn't actually warn for this style if (foo) return bar; else return baz; > @@ > expression e2; > statement s1; > @@ > if(e2) { ... return ...; } > -else > s1 > > Signed-off-by: simran singhal <singhalsimran0@gmail.com> > --- > drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c | 3 +-- > drivers/staging/lustre/lustre/ldlm/ldlm_pool.c | 3 +-- > 2 files changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c > index fbbd8a5..02d49b7 100644 > --- a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c > +++ b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c > @@ -1806,8 +1806,7 @@ ksocknal_close_matching_conns(struct lnet_process_id id, __u32 ipaddr) > > if (!count) > return -ENOENT; > - else > - return 0; > + return 0; > } > > void > diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_pool.c b/drivers/staging/lustre/lustre/ldlm/ldlm_pool.c > index cf3fc57..ac32c82 100644 > --- a/drivers/staging/lustre/lustre/ldlm/ldlm_pool.c > +++ b/drivers/staging/lustre/lustre/ldlm/ldlm_pool.c > @@ -338,8 +338,7 @@ static int ldlm_cli_pool_shrink(struct ldlm_pool *pl, > > if (nr == 0) > return (unused / 100) * sysctl_vfs_cache_pressure; > - else > - return ldlm_cancel_lru(ns, nr, LCF_ASYNC, LDLM_LRU_FLAG_SHRINK); > + return ldlm_cancel_lru(ns, nr, LCF_ASYNC, LDLM_LRU_FLAG_SHRINK); > } > > static const struct ldlm_pool_ops ldlm_cli_pool_ops = { -- To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Feb 28, 2017 at 12:55 AM, Joe Perches <joe@perches.com> wrote: > On Mon, 2017-02-27 at 23:44 +0530, simran singhal wrote: >> This patch fixes the checkpatch warning that else is not generally >> useful after a break or return. > > checkpatch doesn't actually warn for this style > > if (foo) > return bar; > else > return baz; > ok, My bad so, I have to change commit message as checkpatch doesn't warn for this style. >> @@ >> expression e2; >> statement s1; >> @@ >> if(e2) { ... return ...; } >> -else >> s1 >> >> Signed-off-by: simran singhal <singhalsimran0@gmail.com> >> --- >> drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c | 3 +-- >> drivers/staging/lustre/lustre/ldlm/ldlm_pool.c | 3 +-- >> 2 files changed, 2 insertions(+), 4 deletions(-) >> >> diff --git a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c >> index fbbd8a5..02d49b7 100644 >> --- a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c >> +++ b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c >> @@ -1806,8 +1806,7 @@ ksocknal_close_matching_conns(struct lnet_process_id id, __u32 ipaddr) >> >> if (!count) >> return -ENOENT; >> - else >> - return 0; >> + return 0; >> } >> >> void >> diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_pool.c b/drivers/staging/lustre/lustre/ldlm/ldlm_pool.c >> index cf3fc57..ac32c82 100644 >> --- a/drivers/staging/lustre/lustre/ldlm/ldlm_pool.c >> +++ b/drivers/staging/lustre/lustre/ldlm/ldlm_pool.c >> @@ -338,8 +338,7 @@ static int ldlm_cli_pool_shrink(struct ldlm_pool *pl, >> >> if (nr == 0) >> return (unused / 100) * sysctl_vfs_cache_pressure; >> - else >> - return ldlm_cancel_lru(ns, nr, LCF_ASYNC, LDLM_LRU_FLAG_SHRINK); >> + return ldlm_cancel_lru(ns, nr, LCF_ASYNC, LDLM_LRU_FLAG_SHRINK); >> } >> >> static const struct ldlm_pool_ops ldlm_cli_pool_ops = { -- To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, 2017-02-28 at 01:51 +0530, SIMRAN SINGHAL wrote: > On Tue, Feb 28, 2017 at 12:55 AM, Joe Perches <joe@perches.com> wrote: > > On Mon, 2017-02-27 at 23:44 +0530, simran singhal wrote: > > > This patch fixes the checkpatch warning that else is not generally > > > useful after a break or return. > > > > checkpatch doesn't actually warn for this style > > > > if (foo) > > return bar; > > else > > return baz; > > > > ok, My bad > so, I have to change commit message as checkpatch doesn't warn for this style. Perhaps better would be to leave them unchanged instead. > > > diff --git a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c [] > > > @@ -1806,8 +1806,7 @@ ksocknal_close_matching_conns(struct lnet_process_id id, __u32 ipaddr) > > > > > > if (!count) > > > return -ENOENT; > > > - else > > > - return 0; > > > + return 0; There might be a case for this one. error returns are generally in the form { [...] err = func(...); if (err < 0) return err; return 0; } -- To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Feb 28, 2017 at 2:13 AM, Joe Perches <joe@perches.com> wrote: > On Tue, 2017-02-28 at 01:51 +0530, SIMRAN SINGHAL wrote: >> On Tue, Feb 28, 2017 at 12:55 AM, Joe Perches <joe@perches.com> wrote: >> > On Mon, 2017-02-27 at 23:44 +0530, simran singhal wrote: >> > > This patch fixes the checkpatch warning that else is not generally >> > > useful after a break or return. >> > >> > checkpatch doesn't actually warn for this style >> > >> > if (foo) >> > return bar; >> > else >> > return baz; >> > >> >> ok, My bad >> so, I have to change commit message as checkpatch doesn't warn for this style. > > Perhaps better would be to leave them unchanged instead. > >> > > diff --git a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c > [] >> > > @@ -1806,8 +1806,7 @@ ksocknal_close_matching_conns(struct lnet_process_id id, __u32 ipaddr) >> > > >> > > if (!count) >> > > return -ENOENT; >> > > - else >> > > - return 0; >> > > + return 0; > > There might be a case for this one. > error returns are generally in the form > > { > [...] > > err = func(...); > if (err < 0) > return err; > > return 0; > } Not sure, what's the problem in removing else as according to me there is no use of else. In this case if (if condition) does not satisfy then else condition will be satisfied and function will return 0. -- To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, 1 Mar 2017, SIMRAN SINGHAL wrote: > On Tue, Feb 28, 2017 at 2:13 AM, Joe Perches <joe@perches.com> wrote: > > On Tue, 2017-02-28 at 01:51 +0530, SIMRAN SINGHAL wrote: > >> On Tue, Feb 28, 2017 at 12:55 AM, Joe Perches <joe@perches.com> wrote: > >> > On Mon, 2017-02-27 at 23:44 +0530, simran singhal wrote: > >> > > This patch fixes the checkpatch warning that else is not generally > >> > > useful after a break or return. > >> > > >> > checkpatch doesn't actually warn for this style > >> > > >> > if (foo) > >> > return bar; > >> > else > >> > return baz; > >> > > >> > >> ok, My bad > >> so, I have to change commit message as checkpatch doesn't warn for this style. > > > > Perhaps better would be to leave them unchanged instead. > > > >> > > diff --git a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c > > [] > >> > > @@ -1806,8 +1806,7 @@ ksocknal_close_matching_conns(struct lnet_process_id id, __u32 ipaddr) > >> > > > >> > > if (!count) > >> > > return -ENOENT; > >> > > - else > >> > > - return 0; > >> > > + return 0; > > > > There might be a case for this one. > > error returns are generally in the form > > > > { > > [...] > > > > err = func(...); > > if (err < 0) > > return err; > > > > return 0; > > } > Not sure, what's the problem in removing else as according to me > there is no use of else. > > In this case if (if condition) does not satisfy then else condition will > be satisfied and function will return 0. I think that "there might be a case for" was a positive comment. In any case, it looks nicer to me if success is outside of a conditional and failure is under a conditional. Or to be more precise, Coccinelle bug finding rules tend to work better if that property is respected. julia > > -- > You received this message because you are subscribed to the Google Groups "outreachy-kernel" group. > To unsubscribe from this group and stop receiving emails from it, send an email to outreachy-kernel+unsubscribe@googlegroups.com. > To post to this group, send email to outreachy-kernel@googlegroups.com. > To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/CALrZqyP-BRPj4jEFgU%3DB_AV7E4-tJfgaXwwxRhUprLg_4gWQkg%40mail.gmail.com. > For more options, visit https://groups.google.com/d/optout. > -- To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c index fbbd8a5..02d49b7 100644 --- a/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c +++ b/drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c @@ -1806,8 +1806,7 @@ ksocknal_close_matching_conns(struct lnet_process_id id, __u32 ipaddr) if (!count) return -ENOENT; - else - return 0; + return 0; } void diff --git a/drivers/staging/lustre/lustre/ldlm/ldlm_pool.c b/drivers/staging/lustre/lustre/ldlm/ldlm_pool.c index cf3fc57..ac32c82 100644 --- a/drivers/staging/lustre/lustre/ldlm/ldlm_pool.c +++ b/drivers/staging/lustre/lustre/ldlm/ldlm_pool.c @@ -338,8 +338,7 @@ static int ldlm_cli_pool_shrink(struct ldlm_pool *pl, if (nr == 0) return (unused / 100) * sysctl_vfs_cache_pressure; - else - return ldlm_cancel_lru(ns, nr, LCF_ASYNC, LDLM_LRU_FLAG_SHRINK); + return ldlm_cancel_lru(ns, nr, LCF_ASYNC, LDLM_LRU_FLAG_SHRINK); } static const struct ldlm_pool_ops ldlm_cli_pool_ops = {
This patch fixes the checkpatch warning that else is not generally useful after a break or return. @@ expression e2; statement s1; @@ if(e2) { ... return ...; } -else s1 Signed-off-by: simran singhal <singhalsimran0@gmail.com> --- drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c | 3 +-- drivers/staging/lustre/lustre/ldlm/ldlm_pool.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-)