Loading fs/btrfs/volumes.c +6 −6 Original line number Diff line number Diff line Loading @@ -1040,7 +1040,7 @@ static void btrfs_prepare_close_one_device(struct btrfs_device *device) new_device->fs_devices = device->fs_devices; } static int __btrfs_close_devices(struct btrfs_fs_devices *fs_devices) static int close_fs_devices(struct btrfs_fs_devices *fs_devices) { struct btrfs_device *device, *tmp; struct list_head pending_put; Loading Loading @@ -1085,7 +1085,7 @@ int btrfs_close_devices(struct btrfs_fs_devices *fs_devices) int ret; mutex_lock(&uuid_mutex); ret = __btrfs_close_devices(fs_devices); ret = close_fs_devices(fs_devices); if (!fs_devices->opened) { seed_devices = fs_devices->seed; fs_devices->seed = NULL; Loading @@ -1095,7 +1095,7 @@ int btrfs_close_devices(struct btrfs_fs_devices *fs_devices) while (seed_devices) { fs_devices = seed_devices; seed_devices = fs_devices->seed; __btrfs_close_devices(fs_devices); close_fs_devices(fs_devices); free_fs_devices(fs_devices); } return ret; Loading Loading @@ -2064,7 +2064,7 @@ int btrfs_rm_device(struct btrfs_fs_info *fs_info, const char *device_path, fs_devices = fs_devices->seed; } cur_devices->seed = NULL; __btrfs_close_devices(cur_devices); close_fs_devices(cur_devices); free_fs_devices(cur_devices); } Loading Loading @@ -2146,7 +2146,7 @@ void btrfs_rm_dev_replace_free_srcdev(struct btrfs_fs_info *fs_info, tmp_fs_devices = tmp_fs_devices->seed; } fs_devices->seed = NULL; __btrfs_close_devices(fs_devices); close_fs_devices(fs_devices); free_fs_devices(fs_devices); } } Loading Loading @@ -6727,7 +6727,7 @@ static struct btrfs_fs_devices *open_seed_devices(struct btrfs_fs_info *fs_info, } if (!fs_devices->seeding) { __btrfs_close_devices(fs_devices); close_fs_devices(fs_devices); free_fs_devices(fs_devices); fs_devices = ERR_PTR(-EINVAL); goto out; Loading Loading
fs/btrfs/volumes.c +6 −6 Original line number Diff line number Diff line Loading @@ -1040,7 +1040,7 @@ static void btrfs_prepare_close_one_device(struct btrfs_device *device) new_device->fs_devices = device->fs_devices; } static int __btrfs_close_devices(struct btrfs_fs_devices *fs_devices) static int close_fs_devices(struct btrfs_fs_devices *fs_devices) { struct btrfs_device *device, *tmp; struct list_head pending_put; Loading Loading @@ -1085,7 +1085,7 @@ int btrfs_close_devices(struct btrfs_fs_devices *fs_devices) int ret; mutex_lock(&uuid_mutex); ret = __btrfs_close_devices(fs_devices); ret = close_fs_devices(fs_devices); if (!fs_devices->opened) { seed_devices = fs_devices->seed; fs_devices->seed = NULL; Loading @@ -1095,7 +1095,7 @@ int btrfs_close_devices(struct btrfs_fs_devices *fs_devices) while (seed_devices) { fs_devices = seed_devices; seed_devices = fs_devices->seed; __btrfs_close_devices(fs_devices); close_fs_devices(fs_devices); free_fs_devices(fs_devices); } return ret; Loading Loading @@ -2064,7 +2064,7 @@ int btrfs_rm_device(struct btrfs_fs_info *fs_info, const char *device_path, fs_devices = fs_devices->seed; } cur_devices->seed = NULL; __btrfs_close_devices(cur_devices); close_fs_devices(cur_devices); free_fs_devices(cur_devices); } Loading Loading @@ -2146,7 +2146,7 @@ void btrfs_rm_dev_replace_free_srcdev(struct btrfs_fs_info *fs_info, tmp_fs_devices = tmp_fs_devices->seed; } fs_devices->seed = NULL; __btrfs_close_devices(fs_devices); close_fs_devices(fs_devices); free_fs_devices(fs_devices); } } Loading Loading @@ -6727,7 +6727,7 @@ static struct btrfs_fs_devices *open_seed_devices(struct btrfs_fs_info *fs_info, } if (!fs_devices->seeding) { __btrfs_close_devices(fs_devices); close_fs_devices(fs_devices); free_fs_devices(fs_devices); fs_devices = ERR_PTR(-EINVAL); goto out; Loading