From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755142AbcIEGyg (ORCPT ); Mon, 5 Sep 2016 02:54:36 -0400 Received: from mail-out.m-online.net ([212.18.0.9]:35019 "EHLO mail-out.m-online.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753023AbcIEGyf (ORCPT ); Mon, 5 Sep 2016 02:54:35 -0400 From: Heiko Schocher To: linux-mtd@lists.infradead.org Cc: Masahiro Yamada , Heiko Schocher , Artem Bityutskiy , Richard Weinberger , Adrian Hunter , linux-kernel@vger.kernel.org Subject: [PATCH v2] ubifs: compress lines for immediate return Date: Mon, 5 Sep 2016 08:54:26 +0200 Message-Id: <1473058466-10831-1-git-send-email-hs@denx.de> X-Mailer: git-send-email 2.5.5 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Masahiro Yamada Cleanup the following code construct: ret = expression; if (ret) return ret; return 0; into a simple form: return expression; From: Masahiro Yamada posted on the U-Boot mailinglist. Signed-off-by: Masahiro Yamada Signed-off-by: Heiko Schocher --- Changes in v2: - add comment from Richard Weinberger: rephrase commit message add Masahiros "Signed-off-by" tag. fs/ubifs/budget.c | 7 ++----- fs/ubifs/gc.c | 6 ++---- fs/ubifs/lpt_commit.c | 5 +---- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/fs/ubifs/budget.c b/fs/ubifs/budget.c index 11a11b3..48d6851 100644 --- a/fs/ubifs/budget.c +++ b/fs/ubifs/budget.c @@ -77,7 +77,7 @@ static void shrink_liability(struct ubifs_info *c, int nr_to_write) */ static int run_gc(struct ubifs_info *c) { - int err, lnum; + int lnum; /* Make some free space by garbage-collecting dirty space */ down_read(&c->commit_sem); @@ -88,10 +88,7 @@ static int run_gc(struct ubifs_info *c) /* GC freed one LEB, return it to lprops */ dbg_budg("GC freed LEB %d", lnum); - err = ubifs_return_leb(c, lnum); - if (err) - return err; - return 0; + return = ubifs_return_leb(c, lnum); } /** diff --git a/fs/ubifs/gc.c b/fs/ubifs/gc.c index 821b348..88cd61d 100644 --- a/fs/ubifs/gc.c +++ b/fs/ubifs/gc.c @@ -297,10 +297,8 @@ static int sort_nodes(struct ubifs_info *c, struct ubifs_scan_leb *sleb, err = dbg_check_data_nodes_order(c, &sleb->nodes); if (err) return err; - err = dbg_check_nondata_nodes_order(c, nondata); - if (err) - return err; - return 0; + + return dbg_check_nondata_nodes_order(c, nondata); } /** diff --git a/fs/ubifs/lpt_commit.c b/fs/ubifs/lpt_commit.c index ce89bdc..79a8e96 100644 --- a/fs/ubifs/lpt_commit.c +++ b/fs/ubifs/lpt_commit.c @@ -313,10 +313,7 @@ static int layout_cnodes(struct ubifs_info *c) alen = ALIGN(offs, c->min_io_size); upd_ltab(c, lnum, c->leb_size - alen, alen - offs); dbg_chk_lpt_sz(c, 4, alen - offs); - err = dbg_chk_lpt_sz(c, 3, alen); - if (err) - return err; - return 0; + return dbg_chk_lpt_sz(c, 3, alen); no_space: ubifs_err(c, "LPT out of space at LEB %d:%d needing %d, done_ltab %d, done_lsave %d", -- 2.5.5