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

Groups > linux.kernel > #1710832 > unrolled thread

[PATCH 0/2] zpool: Adjustments for zpool_create_pool()

Started bySF Markus Elfring <elfring@users.sourceforge.net>
First post2017-08-14 13:20 +0200
Last post2017-08-16 13:30 +0200
Articles 5 — 2 participants

Back to article view | Back to linux.kernel

Contents

  [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

#1710832 — [PATCH 0/2] zpool: Adjustments for zpool_create_pool()

FromSF Markus Elfring <elfring@users.sourceforge.net>
Date2017-08-14 13:20 +0200
Subject[PATCH 0/2] zpool: Adjustments for zpool_create_pool()
Message-ID<uelzz-3tE-1@gated-at.bofh.it>
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Mon, 14 Aug 2017 13:12:34 +0200

Two update suggestions were taken into account
from static source code analysis.

Markus Elfring (2):
  Delete an error message for a failed memory allocation
  Use common error handling code

 mm/zpool.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

-- 
2.14.0

[toc] | [next] | [standalone]

#1710833 — [PATCH 1/2] zpool: Delete an error message for a failed memory allocation in zpool_create_pool()

FromSF Markus Elfring <elfring@users.sourceforge.net>
Date2017-08-14 13:20 +0200
Subject[PATCH 1/2] zpool: Delete an error message for a failed memory allocation in zpool_create_pool()
Message-ID<uelzA-3tE-3@gated-at.bofh.it>
In reply to#1710832
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Mon, 14 Aug 2017 12:57:16 +0200

Omit an extra message for a memory allocation failure in this function.

This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
 mm/zpool.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/mm/zpool.c b/mm/zpool.c
index fd3ff719c32c..fe1943f7d844 100644
--- a/mm/zpool.c
+++ b/mm/zpool.c
@@ -172,7 +172,6 @@ struct zpool *zpool_create_pool(const char *type, const char *name, gfp_t gfp,
 
 	zpool = kmalloc(sizeof(*zpool), gfp);
 	if (!zpool) {
-		pr_err("couldn't create zpool - out of memory\n");
 		zpool_put_driver(driver);
 		return NULL;
 	}
-- 
2.14.0

[toc] | [prev] | [next] | [standalone]

#1712843 — Re: [PATCH 1/2] zpool: Delete an error message for a failed memory allocation in zpool_create_pool()

FromDan Streetman <ddstreet@ieee.org>
Date2017-08-16 13:20 +0200
SubjectRe: [PATCH 1/2] zpool: Delete an error message for a failed memory allocation in zpool_create_pool()
Message-ID<uf4wG-6mG-9@gated-at.bofh.it>
In reply to#1710833
On Mon, Aug 14, 2017 at 7:15 AM, SF Markus Elfring
<elfring@users.sourceforge.net> wrote:
> From: Markus Elfring <elfring@users.sourceforge.net>
> Date: Mon, 14 Aug 2017 12:57:16 +0200
>
> Omit an extra message for a memory allocation failure in this function.
>
> This issue was detected by using the Coccinelle software.
>
> Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>

Acked-by: Dan Streetman <ddstreet@ieee.org>

> ---
>  mm/zpool.c | 1 -
>  1 file changed, 1 deletion(-)
>
> diff --git a/mm/zpool.c b/mm/zpool.c
> index fd3ff719c32c..fe1943f7d844 100644
> --- a/mm/zpool.c
> +++ b/mm/zpool.c
> @@ -172,7 +172,6 @@ struct zpool *zpool_create_pool(const char *type, const char *name, gfp_t gfp,
>
>         zpool = kmalloc(sizeof(*zpool), gfp);
>         if (!zpool) {
> -               pr_err("couldn't create zpool - out of memory\n");
>                 zpool_put_driver(driver);
>                 return NULL;
>         }
> --
> 2.14.0
>

[toc] | [prev] | [next] | [standalone]

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

FromSF Markus Elfring <elfring@users.sourceforge.net>
Date2017-08-14 13:20 +0200
Subject[PATCH 2/2] zpool: Use common error handling code in zpool_create_pool()
Message-ID<uelzA-3tE-9@gated-at.bofh.it>
In reply to#1710832
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

[toc] | [prev] | [next] | [standalone]

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

FromDan Streetman <ddstreet@ieee.org>
Date2017-08-16 13:30 +0200
SubjectRe: [PATCH 2/2] zpool: Use common error handling code in zpool_create_pool()
Message-ID<uf4Gl-6q1-13@gated-at.bofh.it>
In reply to#1710837
On Mon, Aug 14, 2017 at 7:16 AM, SF Markus Elfring
<elfring@users.sourceforge.net> wrote:
> 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>

Acked-by: Dan Streetman <ddstreet@ieee.org>

> ---
>  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
>

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web