Re: [PATCH 3/5] btrfs: Remove superfluous check form btrfs_remove_chunk

[Anand Jain]

On 10/26/2018 07:43 PM, Nikolay Borisov wrote:

It's unnecessary to check map->stripes[i].dev for NULL given its value
is already set and dereferenced above the the check. No functional changes.

Signed-off-by: Nikolay Borisov 


Reviewed-by: Anand Jain 

Thanks, Anand


---
  fs/btrfs/volumes.c | 12 +---
  1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index dc53d94a62aa..f0db43d08456 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -2797,13 +2797,11 @@ int btrfs_remove_chunk(struct btrfs_trans_handle 
*trans, u64 chunk_offset)
mutex_unlock(_info->chunk_mutex);
}
  
-		if (map->stripes[i].dev) {

-   ret = btrfs_update_device(trans, map->stripes[i].dev);
-   if (ret) {
-   mutex_unlock(_devices->device_list_mutex);
-   btrfs_abort_transaction(trans, ret);
-   goto out;
-   }
+   ret = btrfs_update_device(trans, device);
+   if (ret) {
+   mutex_unlock(_devices->device_list_mutex);
+   btrfs_abort_transaction(trans, ret);
+   goto out;
}
}
mutex_unlock(_devices->device_list_mutex);

Re: [PATCH 3/5] btrfs: Remove superfluous check form btrfs_remove_chunk

[Qu Wenruo]

On 2018/10/26 下午7:43, Nikolay Borisov wrote:
> It's unnecessary to check map->stripes[i].dev for NULL given its value
> is already set and dereferenced above the the check. No functional changes.
> 
> Signed-off-by: Nikolay Borisov 

Reviewed-by: Qu Wenruo 

Thanks,
Qu

> ---
>  fs/btrfs/volumes.c | 12 +---
>  1 file changed, 5 insertions(+), 7 deletions(-)
> 
> diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
> index dc53d94a62aa..f0db43d08456 100644
> --- a/fs/btrfs/volumes.c
> +++ b/fs/btrfs/volumes.c
> @@ -2797,13 +2797,11 @@ int btrfs_remove_chunk(struct btrfs_trans_handle 
> *trans, u64 chunk_offset)
>   mutex_unlock(_info->chunk_mutex);
>   }
>  
> - if (map->stripes[i].dev) {
> - ret = btrfs_update_device(trans, map->stripes[i].dev);
> - if (ret) {
> - mutex_unlock(_devices->device_list_mutex);
> - btrfs_abort_transaction(trans, ret);
> - goto out;
> - }
> + ret = btrfs_update_device(trans, device);
> + if (ret) {
> + mutex_unlock(_devices->device_list_mutex);
> + btrfs_abort_transaction(trans, ret);
> + goto out;
>   }
>   }
>   mutex_unlock(_devices->device_list_mutex);
> 

[PATCH 3/5] btrfs: Remove superfluous check form btrfs_remove_chunk

[Nikolay Borisov]

It's unnecessary to check map->stripes[i].dev for NULL given its value
is already set and dereferenced above the the check. No functional changes.

Signed-off-by: Nikolay Borisov 
---
 fs/btrfs/volumes.c | 12 +---
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index dc53d94a62aa..f0db43d08456 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -2797,13 +2797,11 @@ int btrfs_remove_chunk(struct btrfs_trans_handle 
*trans, u64 chunk_offset)
mutex_unlock(_info->chunk_mutex);
}
 
-   if (map->stripes[i].dev) {
-   ret = btrfs_update_device(trans, map->stripes[i].dev);
-   if (ret) {
-   mutex_unlock(_devices->device_list_mutex);
-   btrfs_abort_transaction(trans, ret);
-   goto out;
-   }
+   ret = btrfs_update_device(trans, device);
+   if (ret) {
+   mutex_unlock(_devices->device_list_mutex);
+   btrfs_abort_transaction(trans, ret);
+   goto out;
}
}
mutex_unlock(_devices->device_list_mutex);
-- 
2.7.4