On Fri, May 15, 2015 at 11:44 PM, Fabian Frederick <f...@skynet.be> wrote: > simplify code in add_to_lpt_heap() > > Signed-off-by: Fabian Frederick <f...@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? -- Thanks, //richard -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/