Re: [PATCH 6/6 linux-next] ubifs: remove else after return

From: Fabian Frederick
Date: Tue May 19 2015 - 13:42:29 EST




> On 19 May 2015 at 00:17 Richard Weinberger <richard.weinberger@xxxxxxxxx>
> wrote:
>
>
> On Fri, May 15, 2015 at 11:44 PM, Fabian Frederick <fabf@xxxxxxxxx> wrote:
> > simplify code in add_to_lpt_heap()
> >
> > Signed-off-by: Fabian Frederick <fabf@xxxxxxxxx>
> > ---
> >Â fs/ubifs/lprops.c | 11 +++++------
> >Â 1 file changed, 5 insertions(+), 6 deletions(-)
> >
> > diff --git a/fs/ubifs/lprops.c b/fs/ubifs/lprops.c
> > index a0011aa..e1454cf 100644
> > --- a/fs/ubifs/lprops.c
> > +++ b/fs/ubifs/lprops.c
> > @@ -208,13 +208,12 @@ static int add_to_lpt_heap(struct ubifs_info *c,
> > struct ubifs_lprops *lprops,
> >Â Â Â Â Â Â Â Â Â}
> >Â Â Â Â Â Â Â Â Âdbg_check_heap(c, heap, cat, -1);
> >Â Â Â Â Â Â Â Â Âreturn 0; /* Not added to heap */
> > -Â Â Â Â} else {
> > -Â Â Â Â Â Â Â Âlprops->hpos = heap->cnt++;
> > -Â Â Â Â Â Â Â Âheap->arr[lprops->hpos] = lprops;
> > -Â Â Â Â Â Â Â Âmove_up_lpt_heap(c, heap, lprops, cat);
> > -Â Â Â Â Â Â Â Âdbg_check_heap(c, heap, cat, lprops->hpos);
> > -Â Â Â Â Â Â Â Âreturn 1; /* Added to heap */
> >Â Â Â Â Â}
> > +Â Â Â Âlprops->hpos = heap->cnt++;
> > +Â Â Â Âheap->arr[lprops->hpos] = lprops;
> > +Â Â Â Âmove_up_lpt_heap(c, heap, lprops, cat);
> > +Â Â Â Âdbg_check_heap(c, heap, cat, lprops->hpos);
> > +Â Â Â Âreturn 1; /* Added to heap */
>
> Just because of paranoia, did you test your changes?

Hello Richard,

    All was compiled but untested.
   Â
Regards,
Fabian


>
> --
> Thanks,
> //richard
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/