Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754709AbbERWRN (ORCPT ); Mon, 18 May 2015 18:17:13 -0400 Received: from mail-vn0-f51.google.com ([209.85.216.51]:34701 "EHLO mail-vn0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752533AbbERWRM (ORCPT ); Mon, 18 May 2015 18:17:12 -0400 MIME-Version: 1.0 In-Reply-To: <1431726240-4675-6-git-send-email-fabf@skynet.be> References: <1431726240-4675-1-git-send-email-fabf@skynet.be> <1431726240-4675-6-git-send-email-fabf@skynet.be> Date: Tue, 19 May 2015 00:17:10 +0200 Message-ID: Subject: Re: [PATCH 6/6 linux-next] ubifs: remove else after return From: Richard Weinberger To: Fabian Frederick Cc: LKML , Artem Bityutskiy , Adrian Hunter , "linux-mtd@lists.infradead.org" Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1470 Lines: 39 On Fri, May 15, 2015 at 11:44 PM, Fabian Frederick wrote: > simplify code in add_to_lpt_heap() > > Signed-off-by: Fabian Frederick > --- > 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 majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/