| Message ID | 6b296396c512a2dd7cb024575a35a6e0c1132a14.1686202417.git.anand.jain@oracle.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | btrfs-progs: cleanup and preparatory around device scan | expand |
On 2023/6/8 14:01, Anand Jain wrote: > Drop the devid argument; instead, it can be fetched from the disk_super > argument. > > Signed-off-by: Anand Jain <anand.jain@oracle.com> Reviewed-by: Qu Wenruo <wqu@suse.com> Thanks, Qu > --- > kernel-shared/volumes.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/kernel-shared/volumes.c b/kernel-shared/volumes.c > index 95d5930b95d8..81abda3f7d1c 100644 > --- a/kernel-shared/volumes.c > +++ b/kernel-shared/volumes.c > @@ -334,11 +334,12 @@ static struct btrfs_fs_devices *find_fsid(u8 *fsid, u8 *metadata_uuid) > > static int device_list_add(const char *path, > struct btrfs_super_block *disk_super, > - u64 devid, struct btrfs_fs_devices **fs_devices_ret) > + struct btrfs_fs_devices **fs_devices_ret) > { > struct btrfs_device *device; > struct btrfs_fs_devices *fs_devices; > u64 found_transid = btrfs_super_generation(disk_super); > + u64 devid = btrfs_stack_device_id(&disk_super->dev_item); > bool metadata_uuid = (btrfs_super_incompat_flags(disk_super) & > BTRFS_FEATURE_INCOMPAT_METADATA_UUID); > > @@ -545,18 +546,17 @@ int btrfs_scan_one_device(int fd, const char *path, > { > struct btrfs_super_block disk_super; > int ret; > - u64 devid; > > ret = btrfs_read_dev_super(fd, &disk_super, super_offset, sbflags); > if (ret < 0) > return -EIO; > - devid = btrfs_stack_device_id(&disk_super.dev_item); > + > if (btrfs_super_flags(&disk_super) & BTRFS_SUPER_FLAG_METADUMP) > *total_devs = 1; > else > *total_devs = btrfs_super_num_devices(&disk_super); > > - ret = device_list_add(path, &disk_super, devid, fs_devices_ret); > + ret = device_list_add(path, &disk_super, fs_devices_ret); > > return ret; > }
diff --git a/kernel-shared/volumes.c b/kernel-shared/volumes.c index 95d5930b95d8..81abda3f7d1c 100644 --- a/kernel-shared/volumes.c +++ b/kernel-shared/volumes.c @@ -334,11 +334,12 @@ static struct btrfs_fs_devices *find_fsid(u8 *fsid, u8 *metadata_uuid) static int device_list_add(const char *path, struct btrfs_super_block *disk_super, - u64 devid, struct btrfs_fs_devices **fs_devices_ret) + struct btrfs_fs_devices **fs_devices_ret) { struct btrfs_device *device; struct btrfs_fs_devices *fs_devices; u64 found_transid = btrfs_super_generation(disk_super); + u64 devid = btrfs_stack_device_id(&disk_super->dev_item); bool metadata_uuid = (btrfs_super_incompat_flags(disk_super) & BTRFS_FEATURE_INCOMPAT_METADATA_UUID); @@ -545,18 +546,17 @@ int btrfs_scan_one_device(int fd, const char *path, { struct btrfs_super_block disk_super; int ret; - u64 devid; ret = btrfs_read_dev_super(fd, &disk_super, super_offset, sbflags); if (ret < 0) return -EIO; - devid = btrfs_stack_device_id(&disk_super.dev_item); + if (btrfs_super_flags(&disk_super) & BTRFS_SUPER_FLAG_METADUMP) *total_devs = 1; else *total_devs = btrfs_super_num_devices(&disk_super); - ret = device_list_add(path, &disk_super, devid, fs_devices_ret); + ret = device_list_add(path, &disk_super, fs_devices_ret); return ret; }
Drop the devid argument; instead, it can be fetched from the disk_super argument. Signed-off-by: Anand Jain <anand.jain@oracle.com> --- kernel-shared/volumes.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)