| Message ID | 1540554201-11305-4-git-send-email-nborisov@suse.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Misc cleanups in balance code | expand |
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 <nborisov@suse.com> Reviewed-by: Qu Wenruo <wqu@suse.com> 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(&fs_info->chunk_mutex); > } > > - if (map->stripes[i].dev) { > - ret = btrfs_update_device(trans, map->stripes[i].dev); > - if (ret) { > - mutex_unlock(&fs_devices->device_list_mutex); > - btrfs_abort_transaction(trans, ret); > - goto out; > - } > + ret = btrfs_update_device(trans, device); > + if (ret) { > + mutex_unlock(&fs_devices->device_list_mutex); > + btrfs_abort_transaction(trans, ret); > + goto out; > } > } > mutex_unlock(&fs_devices->device_list_mutex); >
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 <nborisov@suse.com> Reviewed-by: Anand Jain <anand.jain@oracle.com> 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(&fs_info->chunk_mutex); > } > > - if (map->stripes[i].dev) { > - ret = btrfs_update_device(trans, map->stripes[i].dev); > - if (ret) { > - mutex_unlock(&fs_devices->device_list_mutex); > - btrfs_abort_transaction(trans, ret); > - goto out; > - } > + ret = btrfs_update_device(trans, device); > + if (ret) { > + mutex_unlock(&fs_devices->device_list_mutex); > + btrfs_abort_transaction(trans, ret); > + goto out; > } > } > mutex_unlock(&fs_devices->device_list_mutex); >
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(&fs_info->chunk_mutex); } - if (map->stripes[i].dev) { - ret = btrfs_update_device(trans, map->stripes[i].dev); - if (ret) { - mutex_unlock(&fs_devices->device_list_mutex); - btrfs_abort_transaction(trans, ret); - goto out; - } + ret = btrfs_update_device(trans, device); + if (ret) { + mutex_unlock(&fs_devices->device_list_mutex); + btrfs_abort_transaction(trans, ret); + goto out; } } mutex_unlock(&fs_devices->device_list_mutex);
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 <nborisov@suse.com> --- fs/btrfs/volumes.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)