Message ID | 61f2ef2654e87658d69024d34c2415a24448f67e.1598792561.git.anand.jain@oracle.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | btrfs: seed fix null ptr, use only main device_list_mutex, and cleanups | expand |
On 30.08.20 г. 17:41 ч., Anand Jain wrote: > Cleanup btrfs_assign_next_active_device(), drop %this_dev. > > Signed-off-by: Anand Jain <anand.jain@oracle.com> Reviewed-by: Nikolay Borisov <nborisov@suse.com>
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index 3e7a7d94a211..c8b0d9eb4468 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -1961,16 +1961,13 @@ static struct btrfs_device * btrfs_find_next_active_device( * this_dev) which is active. */ void __cold btrfs_assign_next_active_device(struct btrfs_device *device, - struct btrfs_device *this_dev) + struct btrfs_device *next_device) { struct btrfs_fs_info *fs_info = device->fs_info; - struct btrfs_device *next_device; - if (this_dev) - next_device = this_dev; - else + if (!next_device) next_device = btrfs_find_next_active_device(fs_info->fs_devices, - device); + device); ASSERT(next_device); if (fs_info->sb->s_bdev &&
Cleanup btrfs_assign_next_active_device(), drop %this_dev. Signed-off-by: Anand Jain <anand.jain@oracle.com> --- fs/btrfs/volumes.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)