From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Date: Sat, 15 Apr 2017 18:55:35 +0000 (+0200)
Subject: lightnvm: Fix error handling
X-Git-Tag: v4.12-rc1~175^2~137
X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=654a01b78846b96527263acb2fc373371c281896;hp=a88086e09876f468356cfec5319ff62004e36a1b;p=karo-tx-linux.git

lightnvm: Fix error handling

According to error handling in this function, it is likely that going to
'out' was expected here.

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: Matias Bjørling <matias@cnexlabs.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
---

diff --git a/drivers/lightnvm/rrpc.c b/drivers/lightnvm/rrpc.c
index e00b1d7b976f..e68efbcf1188 100644
--- a/drivers/lightnvm/rrpc.c
+++ b/drivers/lightnvm/rrpc.c
@@ -1275,8 +1275,10 @@ static int rrpc_bb_discovery(struct nvm_tgt_dev *dev, struct rrpc_lun *rlun)
 	}
 
 	nr_blks = nvm_bb_tbl_fold(dev->parent, blks, nr_blks);
-	if (nr_blks < 0)
-		return nr_blks;
+	if (nr_blks < 0) {
+		ret = nr_blks;
+		goto out;
+	}
 
 	for (i = 0; i < nr_blks; i++) {
 		if (blks[i] == NVM_BLK_T_FREE)