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

Fabian Frederick fabf at skynet.be
Tue May 19 10:42:22 PDT 2015



> On 19 May 2015 at 00:17 Richard Weinberger <richard.weinberger at gmail.com>
> wrote:
>
>
> On Fri, May 15, 2015 at 11:44 PM, Fabian Frederick <fabf at skynet.be> wrote:
> > simplify code in add_to_lpt_heap()
> >
> > Signed-off-by: Fabian Frederick <fabf at skynet.be>
> > ---
> >  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



More information about the linux-mtd mailing list