Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1710837

[PATCH 2/2] zpool: Use common error handling code in zpool_create_pool()

Show all headers | View raw

From: Markus Elfring <elfring@users.sourceforge.net>
Date: Mon, 14 Aug 2017 13:04:33 +0200

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

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
 mm/zpool.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/mm/zpool.c b/mm/zpool.c
index fe1943f7d844..e4634edef86d 100644
--- a/mm/zpool.c
+++ b/mm/zpool.c
@@ -171,10 +171,8 @@ struct zpool *zpool_create_pool(const char *type, const char *name, gfp_t gfp,
 	}
 
 	zpool = kmalloc(sizeof(*zpool), gfp);
-	if (!zpool) {
-		zpool_put_driver(driver);
-		return NULL;
-	}
+	if (!zpool)
+		goto put_driver;
 
 	zpool->driver = driver;
 	zpool->pool = driver->create(name, gfp, ops, zpool);
@@ -182,8 +180,9 @@ struct zpool *zpool_create_pool(const char *type, const char *name, gfp_t gfp,
 
 	if (!zpool->pool) {
 		pr_err("couldn't create %s pool\n", type);
-		zpool_put_driver(driver);
 		kfree(zpool);
+put_driver:
+		zpool_put_driver(driver);
 		return NULL;
 	}
 
-- 
2.14.0

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/2] zpool: Adjustments for zpool_create_pool() SF Markus Elfring <elfring@users.sourceforge.net> - 2017-08-14 13:20 +0200
  [PATCH 1/2] zpool: Delete an error message for a failed memory  allocation in zpool_create_pool() SF Markus Elfring <elfring@users.sourceforge.net> - 2017-08-14 13:20 +0200
    Re: [PATCH 1/2] zpool: Delete an error message for a failed memory  allocation in zpool_create_pool() Dan Streetman <ddstreet@ieee.org> - 2017-08-16 13:20 +0200
  [PATCH 2/2] zpool: Use common error handling code in  zpool_create_pool() SF Markus Elfring <elfring@users.sourceforge.net> - 2017-08-14 13:20 +0200
    Re: [PATCH 2/2] zpool: Use common error handling code in zpool_create_pool() Dan Streetman <ddstreet@ieee.org> - 2017-08-16 13:30 +0200

csiph-web