Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755576AbbESRm1 (ORCPT ); Tue, 19 May 2015 13:42:27 -0400 Received: from mailsec102.isp.belgacom.be ([195.238.20.98]:25001 "EHLO mailsec102.isp.belgacom.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751478AbbESRmX convert rfc822-to-8bit (ORCPT ); Tue, 19 May 2015 13:42:23 -0400 X-Cloudmark-SP-Filtered: true X-Cloudmark-SP-Result: v=1.1 cv=+BsAzE94k0WpM8AtezFGaEXBVpw1lpSE4R7UN5Nfg4g= c=1 sm=2 a=IkcTkHD0fZMA:10 a=pGLkceISAAAA:8 a=9l-WKI9bjeYnGqXrHHYA:9 a=QEXdDO2ut3YA:10 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: A2BPBQDNdFtV/9QU7sNcgxCBMoMer2oBAgaZVAKBQUwBAQEBAQGBC4QiAQEBAwEjBFIFCwUEAhgCAhgOAgIhNgYTEYgGAwoMkXidEIZUmFMNhHoBAQEHAiCBIYR1hSSCTYIFMweCaIFFBZwVgnyObYMjg1kjYYEpHIFUPDGCRwEBAQ Date: Tue, 19 May 2015 19:42:22 +0200 (CEST) From: Fabian Frederick Reply-To: Fabian Frederick To: Richard Weinberger Cc: "linux-mtd@lists.infradead.org" , Artem Bityutskiy , LKML , Adrian Hunter Message-ID: <1796356142.534811.1432057342188.open-xchange@webmail.nmp.proximus.be> In-Reply-To: References: <1431726240-4675-1-git-send-email-fabf@skynet.be> <1431726240-4675-6-git-send-email-fabf@skynet.be> Subject: Re: [PATCH 6/6 linux-next] ubifs: remove else after return MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8BIT X-Priority: 3 Importance: Medium X-Mailer: Open-Xchange Mailer v7.2.2-Rev27 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1818 Lines: 55 > On 19 May 2015 at 00:17 Richard Weinberger > wrote: > > > 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? 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@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/