[PATCH V2 linux-next] UBIFS: simplify returns

[PATCH V2 linux-next] UBIFS: simplify returns

[Fabian Frederick]

directly return recover_head() and ubifs_leb_unmap()
instead of storing value in err and testing it.

Signed-off-by: Fabian Frederick <fabf@skynet.be>
---
V2: Keep curly braces around comment + 1 line in if.
    (suggested by Geert Uytterhoeven)

 fs/ubifs/recovery.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/fs/ubifs/recovery.c b/fs/ubifs/recovery.c
index c640938..13ca4db 100644
--- a/fs/ubifs/recovery.c
+++ b/fs/ubifs/recovery.c
@@ -975,11 +975,8 @@ int ubifs_recover_inl_heads(struct ubifs_info *c, void *sbuf)
 		return err;
 
 	dbg_rcvry("checking LPT head at %d:%d", c->nhead_lnum, c->nhead_offs);
-	err = recover_head(c, c->nhead_lnum, c->nhead_offs, sbuf);
-	if (err)
-		return err;
 
-	return 0;
+	return recover_head(c, c->nhead_lnum, c->nhead_offs, sbuf);
 }
 
 /**
@@ -1004,10 +1001,7 @@ static int clean_an_unclean_leb(struct ubifs_info *c,
 
 	if (len == 0) {
 		/* Nothing to read, just unmap it */
-		err = ubifs_leb_unmap(c, lnum);
-		if (err)
-			return err;
-		return 0;
+		return ubifs_leb_unmap(c, lnum);
 	}
 
 	err = ubifs_leb_read(c, lnum, buf, offs, len, 0);
-- 
1.9.1

Re: [PATCH V2 linux-next] UBIFS: simplify returns

[Geert Uytterhoeven]

On Thu, Mar 12, 2015 at 9:34 PM, Fabian Frederick <fabf@skynet.be> wrote:
> directly return recover_head() and ubifs_leb_unmap()
> instead of storing value in err and testing it.
>
> Signed-off-by: Fabian Frederick <fabf@skynet.be>

Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

Re: [PATCH V2 linux-next] UBIFS: simplify returns

[Artem Bityutskiy]

On Thu, 2015-03-12 at 21:34 +0100, Fabian Frederick wrote:
> directly return recover_head() and ubifs_leb_unmap()
> instead of storing value in err and testing it.
> 
> Signed-off-by: Fabian Frederick <fabf@skynet.be>
> ---

Pushed to linux-ubifs/master, thanks!