iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

btrfs: cleanup fs_devices pointer usage in btrfs_trim_fs

Browse Source 
Drop variable 'devices' (used only once) and add new variable for
the fs_devices, so it is used at two locations within btrfs_trim_fs()
function and also helps to access fs_devices->devices.

Signed-off-by: Anand Jain <anand.jain@oracle.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Anand Jain 2021-07-04 20:04:57 +08:00 committed by David Sterba
parent 67d5e289a1
commit 23608d51a3
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fs/btrfs/extent-tree.c
View File

@ -5950,9 +5950,9 @@ static int btrfs_trim_free_extents(struct btrfs_device *device, u64 *trimmed)
*/ */
int btrfs_trim_fs(struct btrfs_fs_info *fs_info, struct fstrim_range *range) int btrfs_trim_fs(struct btrfs_fs_info *fs_info, struct fstrim_range *range)
{ {
struct btrfs_fs_devices *fs_devices = fs_info->fs_devices;
struct btrfs_block_group *cache = NULL; struct btrfs_block_group *cache = NULL;
struct btrfs_device *device; struct btrfs_device *device;
struct list_head *devices;
u64 group_trimmed; u64 group_trimmed;
u64 range_end = U64_MAX; u64 range_end = U64_MAX;
u64 start; u64 start;
@ -6016,9 +6016,9 @@ int btrfs_trim_fs(struct btrfs_fs_info *fs_info, struct fstrim_range *range)
btrfs_warn(fs_info, btrfs_warn(fs_info,
"failed to trim %llu block group(s), last error %d", "failed to trim %llu block group(s), last error %d",
bg_failed, bg_ret); bg_failed, bg_ret);
mutex_lock(&fs_info->fs_devices->device_list_mutex);
devices = &fs_info->fs_devices->devices; mutex_lock(&fs_devices->device_list_mutex);
list_for_each_entry(device, devices, dev_list) { list_for_each_entry(device, &fs_devices->devices, dev_list) {
if (test_bit(BTRFS_DEV_STATE_MISSING, &device->dev_state)) if (test_bit(BTRFS_DEV_STATE_MISSING, &device->dev_state))
continue; continue;
@ -6031,7 +6031,7 @@ int btrfs_trim_fs(struct btrfs_fs_info *fs_info, struct fstrim_range *range)
trimmed += group_trimmed; trimmed += group_trimmed;
} }
mutex_unlock(&fs_info->fs_devices->device_list_mutex); mutex_unlock(&fs_devices->device_list_mutex);
if (dev_failed) if (dev_failed)
btrfs_warn(fs_info, btrfs_warn(fs_info,