| Message ID | 20200812131851.9129-1-nborisov@suse.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | btrfs: remove fsid argument from btrfs_sysfs_update_sprout_fsid | expand |
On 8/12/20 9:18 AM, Nikolay Borisov wrote: > It can be accessed from 'fs_devices' as it's identical to > fs_info->fs_devices. Also add a comment about why we are calling the > function. No semantic changes. > > Signed-off-by: Nikolay Borisov <nborisov@suse.com> Reviewed-by: Josef Bacik <josef@toxicpanda.com> Thanks, Josef
On 12/08/2020 15:19, Nikolay Borisov wrote: > +void btrfs_sysfs_update_sprout_fsid(struct btrfs_fs_devices *fs_devices) > + > { Stray newline, Otherwise Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
On Wed, Aug 12, 2020 at 04:18:51PM +0300, Nikolay Borisov wrote: > It can be accessed from 'fs_devices' as it's identical to > fs_info->fs_devices. Also add a comment about why we are calling the > function. No semantic changes. > > Signed-off-by: Nikolay Borisov <nborisov@suse.com> Added to misc-next, thanks.
On 12/8/20 9:18 pm, Nikolay Borisov wrote: > It can be accessed from 'fs_devices' as it's identical to > fs_info->fs_devices. Also add a comment about why we are calling the > function. No semantic changes. > > Signed-off-by: Nikolay Borisov <nborisov@suse.com> > --- > fs/btrfs/sysfs.c | 6 +++--- > fs/btrfs/sysfs.h | 3 +-- > fs/btrfs/volumes.c | 8 ++++++-- > 3 files changed, 10 insertions(+), 7 deletions(-) > > diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c > index 784a0f8a4cab..2d987b770a20 100644 > --- a/fs/btrfs/sysfs.c > +++ b/fs/btrfs/sysfs.c > @@ -1322,8 +1322,8 @@ void btrfs_kobject_uevent(struct block_device *bdev, enum kobject_action action) > &disk_to_dev(bdev->bd_disk)->kobj); > } > > -void btrfs_sysfs_update_sprout_fsid(struct btrfs_fs_devices *fs_devices, > - const u8 *fsid) > +void btrfs_sysfs_update_sprout_fsid(struct btrfs_fs_devices *fs_devices) > + > { > char fsid_buf[BTRFS_UUID_UNPARSED_SIZE]; > > @@ -1331,7 +1331,7 @@ void btrfs_sysfs_update_sprout_fsid(struct btrfs_fs_devices *fs_devices, > * Sprouting changes fsid of the mounted filesystem, rename the fsid > * directory > */ > - snprintf(fsid_buf, BTRFS_UUID_UNPARSED_SIZE, "%pU", fsid); > + snprintf(fsid_buf, BTRFS_UUID_UNPARSED_SIZE, "%pU", fs_devices->fsid); > if (kobject_rename(&fs_devices->fsid_kobj, fsid_buf)) > btrfs_warn(fs_devices->fs_info, > "sysfs: failed to create fsid for sprout"); > diff --git a/fs/btrfs/sysfs.h b/fs/btrfs/sysfs.h > index cf839c46a131..c9efa15f96e0 100644 > --- a/fs/btrfs/sysfs.h > +++ b/fs/btrfs/sysfs.h > @@ -20,8 +20,7 @@ int btrfs_sysfs_remove_devices_dir(struct btrfs_fs_devices *fs_devices, > struct btrfs_device *one_device); > int btrfs_sysfs_add_fsid(struct btrfs_fs_devices *fs_devs); > void btrfs_sysfs_remove_fsid(struct btrfs_fs_devices *fs_devs); > -void btrfs_sysfs_update_sprout_fsid(struct btrfs_fs_devices *fs_devices, > - const u8 *fsid); > +void btrfs_sysfs_update_sprout_fsid(struct btrfs_fs_devices *fs_devices); > void btrfs_sysfs_feature_update(struct btrfs_fs_info *fs_info, > u64 bit, enum btrfs_feature_set set); > void btrfs_kobject_uevent(struct block_device *bdev, enum kobject_action action); > diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c > index 4bae30b9c944..631cb03b3513 100644 > --- a/fs/btrfs/volumes.c > +++ b/fs/btrfs/volumes.c > @@ -2630,8 +2630,12 @@ int btrfs_init_new_device(struct btrfs_fs_info *fs_info, const char *device_path > goto error_sysfs; > } > > - btrfs_sysfs_update_sprout_fsid(fs_devices, > - fs_info->fs_devices->fsid); > + /* > + * fs_devices now represents the newly sprouted filesystem and > + * its fsid has been changed by btrfs_prepare_sprout > + */ > + btrfs_sysfs_update_sprout_fsid(fs_devices); > + > } > > ret = btrfs_commit_transaction(trans); > Reviewed-by: Anand Jain <anand.jain@oracle.com>
diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c index 784a0f8a4cab..2d987b770a20 100644 --- a/fs/btrfs/sysfs.c +++ b/fs/btrfs/sysfs.c @@ -1322,8 +1322,8 @@ void btrfs_kobject_uevent(struct block_device *bdev, enum kobject_action action) &disk_to_dev(bdev->bd_disk)->kobj); } -void btrfs_sysfs_update_sprout_fsid(struct btrfs_fs_devices *fs_devices, - const u8 *fsid) +void btrfs_sysfs_update_sprout_fsid(struct btrfs_fs_devices *fs_devices) + { char fsid_buf[BTRFS_UUID_UNPARSED_SIZE]; @@ -1331,7 +1331,7 @@ void btrfs_sysfs_update_sprout_fsid(struct btrfs_fs_devices *fs_devices, * Sprouting changes fsid of the mounted filesystem, rename the fsid * directory */ - snprintf(fsid_buf, BTRFS_UUID_UNPARSED_SIZE, "%pU", fsid); + snprintf(fsid_buf, BTRFS_UUID_UNPARSED_SIZE, "%pU", fs_devices->fsid); if (kobject_rename(&fs_devices->fsid_kobj, fsid_buf)) btrfs_warn(fs_devices->fs_info, "sysfs: failed to create fsid for sprout"); diff --git a/fs/btrfs/sysfs.h b/fs/btrfs/sysfs.h index cf839c46a131..c9efa15f96e0 100644 --- a/fs/btrfs/sysfs.h +++ b/fs/btrfs/sysfs.h @@ -20,8 +20,7 @@ int btrfs_sysfs_remove_devices_dir(struct btrfs_fs_devices *fs_devices, struct btrfs_device *one_device); int btrfs_sysfs_add_fsid(struct btrfs_fs_devices *fs_devs); void btrfs_sysfs_remove_fsid(struct btrfs_fs_devices *fs_devs); -void btrfs_sysfs_update_sprout_fsid(struct btrfs_fs_devices *fs_devices, - const u8 *fsid); +void btrfs_sysfs_update_sprout_fsid(struct btrfs_fs_devices *fs_devices); void btrfs_sysfs_feature_update(struct btrfs_fs_info *fs_info, u64 bit, enum btrfs_feature_set set); void btrfs_kobject_uevent(struct block_device *bdev, enum kobject_action action); diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index 4bae30b9c944..631cb03b3513 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -2630,8 +2630,12 @@ int btrfs_init_new_device(struct btrfs_fs_info *fs_info, const char *device_path goto error_sysfs; } - btrfs_sysfs_update_sprout_fsid(fs_devices, - fs_info->fs_devices->fsid); + /* + * fs_devices now represents the newly sprouted filesystem and + * its fsid has been changed by btrfs_prepare_sprout + */ + btrfs_sysfs_update_sprout_fsid(fs_devices); + } ret = btrfs_commit_transaction(trans);
It can be accessed from 'fs_devices' as it's identical to fs_info->fs_devices. Also add a comment about why we are calling the function. No semantic changes. Signed-off-by: Nikolay Borisov <nborisov@suse.com> --- fs/btrfs/sysfs.c | 6 +++--- fs/btrfs/sysfs.h | 3 +-- fs/btrfs/volumes.c | 8 ++++++-- 3 files changed, 10 insertions(+), 7 deletions(-)