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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAFLxGvy=QWcaHbgQyk+WjH1KX__u1Ye6eZ+W4NR7RTifQy3CWQ@mail.gmail.com>
Date:	Tue, 19 May 2015 00:17:10 +0200
From:	Richard Weinberger <richard.weinberger@...il.com>
To:	Fabian Frederick <fabf@...net.be>
Cc:	LKML <linux-kernel@...r.kernel.org>,
	Artem Bityutskiy <dedekind1@...il.com>,
	Adrian Hunter <adrian.hunter@...el.com>,
	"linux-mtd@...ts.infradead.org" <linux-mtd@...ts.infradead.org>
Subject: Re: [PATCH 6/6 linux-next] ubifs: remove else after return

On Fri, May 15, 2015 at 11:44 PM, Fabian Frederick <fabf@...net.be> wrote:
> simplify code in add_to_lpt_heap()
>
> Signed-off-by: Fabian Frederick <fabf@...net.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 majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/