[PATCH 0/3] bcache: Fix variable assignment in if condition in super.c

[PATCH 0/3] bcache: Fix variable assignment in if condition in super.c

[Florian Schmaus]

This patch set attempts to improve bcache's super.c code by moving the
assignment of variables out of 'if' conditions. It does not address
all occurences of this style issue (which is reported as error by
checkpatch.pl).

Florian Schmaus (3):
  bcache: do not assign in if condition register_bcache()
  bcache: do not assign in if condition in bcache_init()
  bcache: do not assign in if condition in bcache_device_init()

 drivers/md/bcache/super.c | 36 ++++++++++++++++++++++++++----------
 1 file changed, 26 insertions(+), 10 deletions(-)

-- 
2.16.4

[PATCH 1/3] bcache: do not assign in if condition register_bcache()

[Florian Schmaus]

Fixes an error condition reported by checkpatch.pl which is caused by
assigning a variable in an if condition.

Signed-off-by: Florian Schmaus <flo@geekplace.eu>
---
 drivers/md/bcache/super.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c
index fa4058e43202..db7177d422e5 100644
--- a/drivers/md/bcache/super.c
+++ b/drivers/md/bcache/super.c
@@ -2163,8 +2163,12 @@ static ssize_t register_bcache(struct kobject *k, struct kobj_attribute *attr,
 	if (!try_module_get(THIS_MODULE))
 		return -EBUSY;
 
-	if (!(path = kstrndup(buffer, size, GFP_KERNEL)) ||
-	    !(sb = kmalloc(sizeof(struct cache_sb), GFP_KERNEL)))
+	path = kstrndup(buffer, size, GFP_KERNEL);
+	if (!path)
+		goto err;
+
+	sb = kmalloc(sizeof(struct cache_sb), GFP_KERNEL);
+	if (!sb)
 		goto err;
 
 	err = "failed to open device";
-- 
2.16.4

[PATCH 2/3] bcache: do not assign in if condition in bcache_init()

[Florian Schmaus]

Fixes an error condition reported by checkpatch.pl which is caused by
assigning a variable in an if condition.

Signed-off-by: Florian Schmaus <flo@geekplace.eu>
---
 drivers/md/bcache/super.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c
index db7177d422e5..f09f4f046315 100644
--- a/drivers/md/bcache/super.c
+++ b/drivers/md/bcache/super.c
@@ -2328,9 +2328,15 @@ static int __init bcache_init(void)
 		return bcache_major;
 	}
 
-	if (!(bcache_wq = alloc_workqueue("bcache", WQ_MEM_RECLAIM, 0)) ||
-	    !(bcache_kobj = kobject_create_and_add("bcache", fs_kobj)) ||
-	    bch_request_init() ||
+	bcache_wq = alloc_workqueue("bcache", WQ_MEM_RECLAIM, 0);
+	if (!bcache_wq)
+		goto err;
+
+	bcache_kobj = kobject_create_and_add("bcache", fs_kobj);
+	if (!bcache_kobj)
+		goto err;
+
+	if (bch_request_init() ||
 	    bch_debug_init(bcache_kobj) || closure_debug_init() ||
 	    sysfs_create_files(bcache_kobj, files))
 		goto err;
-- 
2.16.4

[PATCH 3/3] bcache: do not assign in if condition in bcache_device_init()

[Florian Schmaus]

Fixes an error condition reported by checkpatch.pl which is caused by
assigning a variable in an if condition.

Signed-off-by: Florian Schmaus <flo@geekplace.eu>
---
 drivers/md/bcache/super.c | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c
index f09f4f046315..4a2a028c8754 100644
--- a/drivers/md/bcache/super.c
+++ b/drivers/md/bcache/super.c
@@ -796,11 +796,12 @@ static int bcache_device_init(struct bcache_device *d, unsigned block_size,
 		return idx;
 
 	if (bioset_init(&d->bio_split, 4, offsetof(struct bbio, bio),
-			BIOSET_NEED_BVECS|BIOSET_NEED_RESCUER) ||
-	    !(d->disk = alloc_disk(BCACHE_MINORS))) {
-		ida_simple_remove(&bcache_device_idx, idx);
-		return -ENOMEM;
-	}
+				BIOSET_NEED_BVECS|BIOSET_NEED_RESCUER))
+		goto err;
+
+	d->disk = alloc_disk(BCACHE_MINORS);
+	if (!d->disk)
+		goto err;
 
 	set_capacity(d->disk, sectors);
 	snprintf(d->disk->disk_name, DISK_NAME_LEN, "bcache%i", idx);
@@ -834,6 +835,11 @@ static int bcache_device_init(struct bcache_device *d, unsigned block_size,
 	blk_queue_write_cache(q, true, true);
 
 	return 0;
+
+err:
+	ida_simple_remove(&bcache_device_idx, idx);
+	return -ENOMEM;
+
 }
 
 /* Cached device */
-- 
2.16.4

Re: [PATCH 1/3] bcache: do not assign in if condition register_bcache()

[Coly Li]

On 2018/6/18 6:09 PM, Florian Schmaus wrote:
> Fixes an error condition reported by checkpatch.pl which is caused by
> assigning a variable in an if condition.
> 
> Signed-off-by: Florian Schmaus <flo@geekplace.eu>

Signed-off-by: Coly Li <colyli@suse.de>

Added into for-next patch set.

Thanks.

Coly Li

> ---
>  drivers/md/bcache/super.c | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c
> index fa4058e43202..db7177d422e5 100644
> --- a/drivers/md/bcache/super.c
> +++ b/drivers/md/bcache/super.c
> @@ -2163,8 +2163,12 @@ static ssize_t register_bcache(struct kobject *k, struct kobj_attribute *attr,
>  	if (!try_module_get(THIS_MODULE))
>  		return -EBUSY;
>  
> -	if (!(path = kstrndup(buffer, size, GFP_KERNEL)) ||
> -	    !(sb = kmalloc(sizeof(struct cache_sb), GFP_KERNEL)))
> +	path = kstrndup(buffer, size, GFP_KERNEL);
> +	if (!path)
> +		goto err;
> +
> +	sb = kmalloc(sizeof(struct cache_sb), GFP_KERNEL);
> +	if (!sb)
>  		goto err;
>  
>  	err = "failed to open device";
> 

Re: [PATCH 2/3] bcache: do not assign in if condition in bcache_init()

[Coly Li]

On 2018/6/18 6:09 PM, Florian Schmaus wrote:
> Fixes an error condition reported by checkpatch.pl which is caused by
> assigning a variable in an if condition.
> 
> Signed-off-by: Florian Schmaus <flo@geekplace.eu>

Signed-off-by: Coly Li <colyli@suse.de>

Added into for-next patch set.

Thanks.

Coly Li

> ---
>  drivers/md/bcache/super.c | 12 +++++++++---
>  1 file changed, 9 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c
> index db7177d422e5..f09f4f046315 100644
> --- a/drivers/md/bcache/super.c
> +++ b/drivers/md/bcache/super.c
> @@ -2328,9 +2328,15 @@ static int __init bcache_init(void)
>  		return bcache_major;
>  	}
>  
> -	if (!(bcache_wq = alloc_workqueue("bcache", WQ_MEM_RECLAIM, 0)) ||
> -	    !(bcache_kobj = kobject_create_and_add("bcache", fs_kobj)) ||
> -	    bch_request_init() ||
> +	bcache_wq = alloc_workqueue("bcache", WQ_MEM_RECLAIM, 0);
> +	if (!bcache_wq)
> +		goto err;
> +
> +	bcache_kobj = kobject_create_and_add("bcache", fs_kobj);
> +	if (!bcache_kobj)
> +		goto err;
> +
> +	if (bch_request_init() ||
>  	    bch_debug_init(bcache_kobj) || closure_debug_init() ||
>  	    sysfs_create_files(bcache_kobj, files))
>  		goto err;
> 

Re: [PATCH 3/3] bcache: do not assign in if condition in bcache_device_init()

[Coly Li]

On 2018/6/18 6:09 PM, Florian Schmaus wrote:
> Fixes an error condition reported by checkpatch.pl which is caused by
> assigning a variable in an if condition.
> 
> Signed-off-by: Florian Schmaus <flo@geekplace.eu>
> ---
>  drivers/md/bcache/super.c | 16 +++++++++++-----
>  1 file changed, 11 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c
> index f09f4f046315..4a2a028c8754 100644
> --- a/drivers/md/bcache/super.c
> +++ b/drivers/md/bcache/super.c
> @@ -796,11 +796,12 @@ static int bcache_device_init(struct bcache_device *d, unsigned block_size,
>  		return idx;
>  
>  	if (bioset_init(&d->bio_split, 4, offsetof(struct bbio, bio),
> -			BIOSET_NEED_BVECS|BIOSET_NEED_RESCUER) ||
> -	    !(d->disk = alloc_disk(BCACHE_MINORS))) {
> -		ida_simple_remove(&bcache_device_idx, idx);
> -		return -ENOMEM;
> -	}
> +				BIOSET_NEED_BVECS|BIOSET_NEED_RESCUER))

Signed-off-by: Coly Li <colyli@suse.de>
I fix the above indent and added the patch into for-next patch set. Thanks.

Coly Li

> +		goto err;
> +
> +	d->disk = alloc_disk(BCACHE_MINORS);
> +	if (!d->disk)
> +		goto err;
>  
>  	set_capacity(d->disk, sectors);
>  	snprintf(d->disk->disk_name, DISK_NAME_LEN, "bcache%i", idx);
> @@ -834,6 +835,11 @@ static int bcache_device_init(struct bcache_device *d, unsigned block_size,
>  	blk_queue_write_cache(q, true, true);
>  
>  	return 0;
> +
> +err:
> +	ida_simple_remove(&bcache_device_idx, idx);
> +	return -ENOMEM;
> +
>  }
>  
>  /* Cached device */
>