mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-25 21:54:06 +08:00
btrfs: use free_device where opencoded
Reviewed-by: Anand Jain <anand.jain@oracle.com> Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
parent
48dae9cf3f
commit
55de480346
@ -195,9 +195,7 @@ static void free_fs_devices(struct btrfs_fs_devices *fs_devices)
|
||||
device = list_entry(fs_devices->devices.next,
|
||||
struct btrfs_device, dev_list);
|
||||
list_del(&device->dev_list);
|
||||
rcu_string_free(device->name);
|
||||
bio_put(device->flush_bio);
|
||||
kfree(device);
|
||||
free_device(device);
|
||||
}
|
||||
kfree(fs_devices);
|
||||
}
|
||||
@ -589,9 +587,7 @@ static void btrfs_free_stale_device(struct btrfs_device *cur_dev)
|
||||
} else {
|
||||
fs_devs->num_devices--;
|
||||
list_del(&dev->dev_list);
|
||||
rcu_string_free(dev->name);
|
||||
bio_put(dev->flush_bio);
|
||||
kfree(dev);
|
||||
free_device(dev);
|
||||
}
|
||||
break;
|
||||
}
|
||||
@ -643,8 +639,7 @@ static noinline int device_list_add(const char *path,
|
||||
|
||||
name = rcu_string_strdup(path, GFP_NOFS);
|
||||
if (!name) {
|
||||
bio_put(device->flush_bio);
|
||||
kfree(device);
|
||||
free_device(device);
|
||||
return -ENOMEM;
|
||||
}
|
||||
rcu_assign_pointer(device->name, name);
|
||||
@ -756,8 +751,7 @@ static struct btrfs_fs_devices *clone_fs_devices(struct btrfs_fs_devices *orig)
|
||||
name = rcu_string_strdup(orig_dev->name->str,
|
||||
GFP_KERNEL);
|
||||
if (!name) {
|
||||
bio_put(device->flush_bio);
|
||||
kfree(device);
|
||||
free_device(device);
|
||||
goto error;
|
||||
}
|
||||
rcu_assign_pointer(device->name, name);
|
||||
@ -821,9 +815,7 @@ again:
|
||||
}
|
||||
list_del_init(&device->dev_list);
|
||||
fs_devices->num_devices--;
|
||||
rcu_string_free(device->name);
|
||||
bio_put(device->flush_bio);
|
||||
kfree(device);
|
||||
free_device(device);
|
||||
}
|
||||
|
||||
if (fs_devices->seed) {
|
||||
@ -841,9 +833,7 @@ static void free_device_rcu(struct rcu_head *head)
|
||||
struct btrfs_device *device;
|
||||
|
||||
device = container_of(head, struct btrfs_device, rcu);
|
||||
rcu_string_free(device->name);
|
||||
bio_put(device->flush_bio);
|
||||
kfree(device);
|
||||
free_device(device);
|
||||
}
|
||||
|
||||
static void btrfs_close_bdev(struct btrfs_device *device)
|
||||
@ -2355,8 +2345,7 @@ int btrfs_init_new_device(struct btrfs_fs_info *fs_info, const char *device_path
|
||||
|
||||
name = rcu_string_strdup(device_path, GFP_KERNEL);
|
||||
if (!name) {
|
||||
bio_put(device->flush_bio);
|
||||
kfree(device);
|
||||
free_device(device);
|
||||
ret = -ENOMEM;
|
||||
goto error;
|
||||
}
|
||||
@ -2364,9 +2353,7 @@ int btrfs_init_new_device(struct btrfs_fs_info *fs_info, const char *device_path
|
||||
|
||||
trans = btrfs_start_transaction(root, 0);
|
||||
if (IS_ERR(trans)) {
|
||||
rcu_string_free(device->name);
|
||||
bio_put(device->flush_bio);
|
||||
kfree(device);
|
||||
free_device(device);
|
||||
ret = PTR_ERR(trans);
|
||||
goto error;
|
||||
}
|
||||
@ -2508,9 +2495,7 @@ error_trans:
|
||||
sb->s_flags |= SB_RDONLY;
|
||||
if (trans)
|
||||
btrfs_end_transaction(trans);
|
||||
rcu_string_free(device->name);
|
||||
bio_put(device->flush_bio);
|
||||
kfree(device);
|
||||
free_device(device);
|
||||
error:
|
||||
blkdev_put(bdev, FMODE_EXCL);
|
||||
if (seeding_dev && !unlocked) {
|
||||
@ -2576,8 +2561,7 @@ int btrfs_init_dev_replace_tgtdev(struct btrfs_fs_info *fs_info,
|
||||
|
||||
name = rcu_string_strdup(device_path, GFP_KERNEL);
|
||||
if (!name) {
|
||||
bio_put(device->flush_bio);
|
||||
kfree(device);
|
||||
free_device(device);
|
||||
ret = -ENOMEM;
|
||||
goto error;
|
||||
}
|
||||
@ -6293,8 +6277,7 @@ struct btrfs_device *btrfs_alloc_device(struct btrfs_fs_info *fs_info,
|
||||
|
||||
ret = find_next_devid(fs_info, &tmp);
|
||||
if (ret) {
|
||||
bio_put(dev->flush_bio);
|
||||
kfree(dev);
|
||||
free_device(dev);
|
||||
return ERR_PTR(ret);
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user