btrfs-progs: Refactor btrfs_add_device() to use btrfs_fs_info
BTW, there is a duplicated definition of btrfs_add_device() in volumes.h, also remove it. Signed-off-by: Qu Wenruo <quwenruo@cn.fujitsu.com> Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
parent
7a36a1216b
commit
9b3959d72a
11
utils.c
11
utils.c
|
@ -179,7 +179,8 @@ int btrfs_add_to_fsid(struct btrfs_trans_handle *trans,
|
|||
u32 sectorsize)
|
||||
{
|
||||
struct btrfs_super_block *disk_super;
|
||||
struct btrfs_super_block *super = root->fs_info->super_copy;
|
||||
struct btrfs_fs_info *fs_info = root->fs_info;
|
||||
struct btrfs_super_block *super = fs_info->super_copy;
|
||||
struct btrfs_device *device;
|
||||
struct btrfs_dev_item *dev_item;
|
||||
char *buf = NULL;
|
||||
|
@ -214,7 +215,7 @@ int btrfs_add_to_fsid(struct btrfs_trans_handle *trans,
|
|||
device->total_bytes = device_total_bytes;
|
||||
device->bytes_used = 0;
|
||||
device->total_ios = 0;
|
||||
device->dev_root = root->fs_info->dev_root;
|
||||
device->dev_root = fs_info->dev_root;
|
||||
device->name = strdup(path);
|
||||
if (!device->name) {
|
||||
ret = -ENOMEM;
|
||||
|
@ -222,7 +223,7 @@ int btrfs_add_to_fsid(struct btrfs_trans_handle *trans,
|
|||
}
|
||||
|
||||
INIT_LIST_HEAD(&device->dev_list);
|
||||
ret = btrfs_add_device(trans, root, device);
|
||||
ret = btrfs_add_device(trans, fs_info, device);
|
||||
if (ret)
|
||||
goto out;
|
||||
|
||||
|
@ -248,8 +249,8 @@ int btrfs_add_to_fsid(struct btrfs_trans_handle *trans,
|
|||
BUG_ON(ret != sectorsize);
|
||||
|
||||
free(buf);
|
||||
list_add(&device->dev_list, &root->fs_info->fs_devices->devices);
|
||||
device->fs_devices = root->fs_info->fs_devices;
|
||||
list_add(&device->dev_list, &fs_info->fs_devices->devices);
|
||||
device->fs_devices = fs_info->fs_devices;
|
||||
return 0;
|
||||
|
||||
out:
|
||||
|
|
|
@ -585,7 +585,7 @@ error:
|
|||
* the btrfs_device struct should be fully filled in
|
||||
*/
|
||||
int btrfs_add_device(struct btrfs_trans_handle *trans,
|
||||
struct btrfs_root *root,
|
||||
struct btrfs_fs_info *fs_info,
|
||||
struct btrfs_device *device)
|
||||
{
|
||||
int ret;
|
||||
|
@ -593,11 +593,10 @@ int btrfs_add_device(struct btrfs_trans_handle *trans,
|
|||
struct btrfs_dev_item *dev_item;
|
||||
struct extent_buffer *leaf;
|
||||
struct btrfs_key key;
|
||||
struct btrfs_root *root = fs_info->chunk_root;
|
||||
unsigned long ptr;
|
||||
u64 free_devid = 0;
|
||||
|
||||
root = root->fs_info->chunk_root;
|
||||
|
||||
path = btrfs_alloc_path();
|
||||
if (!path)
|
||||
return -ENOMEM;
|
||||
|
@ -635,7 +634,7 @@ int btrfs_add_device(struct btrfs_trans_handle *trans,
|
|||
ptr = (unsigned long)btrfs_device_uuid(dev_item);
|
||||
write_extent_buffer(leaf, device->uuid, ptr, BTRFS_UUID_SIZE);
|
||||
ptr = (unsigned long)btrfs_device_fsid(dev_item);
|
||||
write_extent_buffer(leaf, root->fs_info->fsid, ptr, BTRFS_UUID_SIZE);
|
||||
write_extent_buffer(leaf, fs_info->fsid, ptr, BTRFS_UUID_SIZE);
|
||||
btrfs_mark_buffer_dirty(leaf);
|
||||
ret = 0;
|
||||
|
||||
|
|
|
@ -213,15 +213,12 @@ int btrfs_alloc_data_chunk(struct btrfs_trans_handle *trans,
|
|||
struct btrfs_root *extent_root, u64 *start,
|
||||
u64 num_bytes, u64 type, int convert);
|
||||
int btrfs_read_super_device(struct btrfs_root *root, struct extent_buffer *buf);
|
||||
int btrfs_add_device(struct btrfs_trans_handle *trans,
|
||||
struct btrfs_root *root,
|
||||
struct btrfs_device *device);
|
||||
int btrfs_open_devices(struct btrfs_fs_devices *fs_devices,
|
||||
int flags);
|
||||
int btrfs_close_devices(struct btrfs_fs_devices *fs_devices);
|
||||
void btrfs_close_all_devices(void);
|
||||
int btrfs_add_device(struct btrfs_trans_handle *trans,
|
||||
struct btrfs_root *root,
|
||||
struct btrfs_fs_info *fs_info,
|
||||
struct btrfs_device *device);
|
||||
int btrfs_update_device(struct btrfs_trans_handle *trans,
|
||||
struct btrfs_device *device);
|
||||
|
|
Loading…
Reference in a new issue