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

btrfs: use free_device where opencoded

Browse Source 
Reviewed-by: Anand Jain <anand.jain@oracle.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
David Sterba 2017-10-30 18:55:47 +01:00
parent 48dae9cf3f
commit 55de480346
1 changed files with 11 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
fs/btrfs/volumes.c
View File

@ -195,9 +195,7 @@ static void free_fs_devices(struct btrfs_fs_devices *fs_devices)
device = list_entry(fs_devices->devices.next, device = list_entry(fs_devices->devices.next,
struct btrfs_device, dev_list); struct btrfs_device, dev_list);
list_del(&device->dev_list); list_del(&device->dev_list);
rcu_string_free(device->name); free_device(device);
bio_put(device->flush_bio);
kfree(device);
} }
kfree(fs_devices); kfree(fs_devices);
} }
@ -589,9 +587,7 @@ static void btrfs_free_stale_device(struct btrfs_device *cur_dev)
} else { } else {
fs_devs->num_devices--; fs_devs->num_devices--;
list_del(&dev->dev_list); list_del(&dev->dev_list);
rcu_string_free(dev->name); free_device(dev);
bio_put(dev->flush_bio);
kfree(dev);
} }
break; break;
} }
@ -643,8 +639,7 @@ static noinline int device_list_add(const char *path,
name = rcu_string_strdup(path, GFP_NOFS); name = rcu_string_strdup(path, GFP_NOFS);
if (!name) { if (!name) {
bio_put(device->flush_bio); free_device(device);
kfree(device);
return -ENOMEM; return -ENOMEM;
} }
rcu_assign_pointer(device->name, name); 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, name = rcu_string_strdup(orig_dev->name->str,
GFP_KERNEL); GFP_KERNEL);
if (!name) { if (!name) {
bio_put(device->flush_bio); free_device(device);
kfree(device);
goto error; goto error;
} }
rcu_assign_pointer(device->name, name); rcu_assign_pointer(device->name, name);
@ -821,9 +815,7 @@ again:
} }
list_del_init(&device->dev_list); list_del_init(&device->dev_list);
fs_devices->num_devices--; fs_devices->num_devices--;
rcu_string_free(device->name); free_device(device);
bio_put(device->flush_bio);
kfree(device);
} }
if (fs_devices->seed) { if (fs_devices->seed) {
@ -841,9 +833,7 @@ static void free_device_rcu(struct rcu_head *head)
struct btrfs_device *device; struct btrfs_device *device;
device = container_of(head, struct btrfs_device, rcu); device = container_of(head, struct btrfs_device, rcu);
rcu_string_free(device->name); free_device(device);
bio_put(device->flush_bio);
kfree(device);
} }
static void btrfs_close_bdev(struct btrfs_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); name = rcu_string_strdup(device_path, GFP_KERNEL);
if (!name) { if (!name) {
bio_put(device->flush_bio); free_device(device);
kfree(device);
ret = -ENOMEM; ret = -ENOMEM;
goto error; 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); trans = btrfs_start_transaction(root, 0);
if (IS_ERR(trans)) { if (IS_ERR(trans)) {
rcu_string_free(device->name); free_device(device);
bio_put(device->flush_bio);
kfree(device);
ret = PTR_ERR(trans); ret = PTR_ERR(trans);
goto error; goto error;
} }
@ -2508,9 +2495,7 @@ error_trans:
sb->s_flags |= SB_RDONLY; sb->s_flags |= SB_RDONLY;
if (trans) if (trans)
btrfs_end_transaction(trans); btrfs_end_transaction(trans);
rcu_string_free(device->name); free_device(device);
bio_put(device->flush_bio);
kfree(device);
error: error:
blkdev_put(bdev, FMODE_EXCL); blkdev_put(bdev, FMODE_EXCL);
if (seeding_dev && !unlocked) { 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); name = rcu_string_strdup(device_path, GFP_KERNEL);
if (!name) { if (!name) {
bio_put(device->flush_bio); free_device(device);
kfree(device);
ret = -ENOMEM; ret = -ENOMEM;
goto error; 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); ret = find_next_devid(fs_info, &tmp);
if (ret) { if (ret) {
bio_put(dev->flush_bio); free_device(dev);
kfree(dev);
return ERR_PTR(ret); return ERR_PTR(ret);
} }
} }