Re: [PATCH 6/6] staging: lustre: lustre: fix all braces issues reported by checkpatch

Joe Perches
2017-06-15T16:58:52Z

On Thu, 2017-06-15 at 17:38 +0100, James Simmons wrote:
> > On Wed, 2017-06-14 at 11:01 -0400, James Simmons wrote:
> > > Cleanup all braces that was reported by checkpatch. The only
> > > issue not fixed up is in mdc_lock.c. Removing the braces in
> > > the case of mdc_lock.c will break the build.
> >
> > []
> >
> > > diff --git a/drivers/staging/lustre/lustre/llite/vvp_dev.c b/drivers/staging/lustre/lustre/llite/vvp_dev.c
> >
> > []
> > > @@ -591,9 +591,10 @@ static void *vvp_pgcache_start(struct seq_file *f, loff_t *pos)
> > > env = cl_env_get(&refcheck);
> > > if (!IS_ERR(env)) {
> > > sbi = f->private;
> > > - if (sbi->ll_site->ls_obj_hash->hs_cur_bits > 64 - PGC_OBJ_SHIFT)
> > > + if (sbi->ll_site->ls_obj_hash->hs_cur_bits >
> > > + 64 - PGC_OBJ_SHIFT) {
> > > pos = ERR_PTR(-EFBIG);
> > > - else {
> > > + } else {
> > > *pos = vvp_pgcache_find(env, &sbi->ll_cl->cd_lu_dev,
> > > *pos);
> > > if (*pos == ~0ULL)
> >
> > Sometimes is nicer to rearrange the code with smaller
> > indentation by using early returns and/or goto <labels>.
>
> Do you mind if I submit a separate patch for this?
> It would be nice to land the current cleanups as is.

Of course not.

> Looking at the code I see where more
> simplication along this line can be done. I submitted a patch for our
> test harness:

Oh good.

> In the near future it will be pushed here.

Swell.

One of the blocks in vvp_pgcache_show looks like it
has asymmetric braces though.

} else

Perhaps you should be using the linux-next version
of checkpatch which warns about this.

And don't take any of what I wrote as a requirement.

All were merely suggestions and could be implemented
an appropriate time or ignored completely.