linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] nbd: Use common error handling code in nbd_genl_connect()
@ 2017-10-21 18:55 SF Markus Elfring
  0 siblings, 0 replies; only message in thread
From: SF Markus Elfring @ 2017-10-21 18:55 UTC (permalink / raw)
  To: linux-block, nbd, Josef Bacik; +Cc: LKML, kernel-janitors

From: Markus Elfring <elfring@users.sourceforge.net>
Date: Sat, 21 Oct 2017 20:50:37 +0200

Add a jump target so that a bit of exception handling can be better reused
at the end of this function.

This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
 drivers/block/nbd.c | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index 883dfebd3014..05bd1fc70ee3 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -1585,22 +1585,18 @@ static int nbd_genl_connect(struct sk_buff *skb, struct genl_info *info)
 		if (ret == 0) {
 			int new_index;
 			new_index = nbd_dev_add(-1);
-			if (new_index < 0) {
-				mutex_unlock(&nbd_index_mutex);
-				printk(KERN_ERR "nbd: failed to add new device\n");
-				return ret;
-			}
+			if (new_index < 0)
+				goto report_failure;
+
 			nbd = idr_find(&nbd_index_idr, new_index);
 		}
 	} else {
 		nbd = idr_find(&nbd_index_idr, index);
 		if (!nbd) {
 			ret = nbd_dev_add(index);
-			if (ret < 0) {
-				mutex_unlock(&nbd_index_mutex);
-				printk(KERN_ERR "nbd: failed to add new device\n");
-				return ret;
-			}
+			if (ret < 0)
+				goto report_failure;
+
 			nbd = idr_find(&nbd_index_idr, index);
 		}
 	}
@@ -1716,6 +1712,11 @@ static int nbd_genl_connect(struct sk_buff *skb, struct genl_info *info)
 	if (put_dev)
 		nbd_put(nbd);
 	return ret;
+
+report_failure:
+	mutex_unlock(&nbd_index_mutex);
+	pr_err("nbd: failed to add new device\n");
+	return ret;
 }
 
 static int nbd_genl_disconnect(struct sk_buff *skb, struct genl_info *info)
-- 
2.14.2

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2017-10-21 18:55 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-10-21 18:55 [PATCH] nbd: Use common error handling code in nbd_genl_connect() SF Markus Elfring

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).