diff options
| author | David Sterba | 2017-10-30 18:10:25 +0100 |
|---|---|---|
| committer | David Sterba | 2018-01-22 16:08:11 +0100 |
| commit | 48dae9cf3f95acc4bd51b2324e10f8fd5c302be8 (patch) | |
| tree | 596093a7320811cf173b6eb417c3c8c482ad8a04 /fs/btrfs/volumes.c | |
| parent | btrfs: rename device free rcu helper to free_device_rcu (diff) | |
| download | kernel-qcow2-linux-48dae9cf3f95acc4bd51b2324e10f8fd5c302be8.tar.gz kernel-qcow2-linux-48dae9cf3f95acc4bd51b2324e10f8fd5c302be8.tar.xz kernel-qcow2-linux-48dae9cf3f95acc4bd51b2324e10f8fd5c302be8.zip | |
btrfs: introduce free_device helper
A helper to free a device and all it's dynamically allocated members,
like the rcu_string name or flush_bio. This is going to replace all
open coded places.
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/volumes.c')
| -rw-r--r-- | fs/btrfs/volumes.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index 869048830df9..6a1186e4ea57 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -180,6 +180,13 @@ static struct btrfs_fs_devices *alloc_fs_devices(const u8 *fsid) return fs_devs; } +static void free_device(struct btrfs_device *device) +{ + rcu_string_free(device->name); + bio_put(device->flush_bio); + kfree(device); +} + static void free_fs_devices(struct btrfs_fs_devices *fs_devices) { struct btrfs_device *device; @@ -220,6 +227,11 @@ void btrfs_cleanup_fs_uuids(void) } } +/* + * Returns a pointer to a new btrfs_device on success; ERR_PTR() on error. + * Returned struct is not linked onto any lists and must be destroyed using + * free_device. + */ static struct btrfs_device *__alloc_device(void) { struct btrfs_device *dev; @@ -6257,8 +6269,8 @@ static struct btrfs_device *add_missing_dev(struct btrfs_fs_devices *fs_devices, * is generated. * * Return: a pointer to a new &struct btrfs_device on success; ERR_PTR() - * on error. Returned struct is not linked onto any lists and can be - * destroyed with kfree() right away. + * on error. Returned struct is not linked onto any lists and must be + * destroyed with free_device. */ struct btrfs_device *btrfs_alloc_device(struct btrfs_fs_info *fs_info, const u64 *devid, |