UBIFS: simplify returns

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>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
This commit is contained in:
Fabian Frederick 2015-03-12 21:34:21 +01:00 committed by Artem Bityutskiy
parent d3f9db00d0
commit 8a87dc55f7

View File

@ -975,11 +975,8 @@ int ubifs_recover_inl_heads(struct ubifs_info *c, void *sbuf)
return err; return err;
dbg_rcvry("checking LPT head at %d:%d", c->nhead_lnum, c->nhead_offs); 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) { if (len == 0) {
/* Nothing to read, just unmap it */ /* Nothing to read, just unmap it */
err = ubifs_leb_unmap(c, lnum); return ubifs_leb_unmap(c, lnum);
if (err)
return err;
return 0;
} }
err = ubifs_leb_read(c, lnum, buf, offs, len, 0); err = ubifs_leb_read(c, lnum, buf, offs, len, 0);