[PATCH 4/6 linux-next] ubifs: simplify return in sort_nodes()

Fabian Frederick fabf at skynet.be
Fri May 15 14:43:58 PDT 2015


Directly return dbg_check_nondata_nodes_order()
instead of storing value in err and testing it.

Signed-off-by: Fabian Frederick <fabf at skynet.be>
---
 fs/ubifs/gc.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/fs/ubifs/gc.c b/fs/ubifs/gc.c
index 9718da8..bf0a3eb 100644
--- a/fs/ubifs/gc.c
+++ b/fs/ubifs/gc.c
@@ -301,10 +301,7 @@ 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);
 }
 
 /**
-- 
2.4.0




More information about the linux-mtd mailing list