diff options
| author | David Sterba <dsterba@suse.com> | 2019-08-01 18:50:16 +0200 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2019-09-09 14:59:07 +0200 |
| commit | f93c39970b1da007b3110fd7c9dd361614922457 (patch) | |
| tree | 0ecf1296e31965a90e8654ec75d5f3a123c56b46 /fs/btrfs/volumes.c | |
| parent | b5865babb7b44308f0d0ece39756d55ef7628742 (diff) | |
| download | linux-stable-f93c39970b1da007b3110fd7c9dd361614922457.tar.gz linux-stable-f93c39970b1da007b3110fd7c9dd361614922457.tar.bz2 linux-stable-f93c39970b1da007b3110fd7c9dd361614922457.zip | |
btrfs: factor out sysfs code for updating sprout fsid
Wrap the fsid renaming code and move it to sysfs.c.
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/volumes.c')
| -rw-r--r-- | fs/btrfs/volumes.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index 830e4b0b5957..fa6eb9e0ba89 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -2680,22 +2680,14 @@ int btrfs_init_new_device(struct btrfs_fs_info *fs_info, const char *device_path } if (seeding_dev) { - char fsid_buf[BTRFS_UUID_UNPARSED_SIZE]; - ret = btrfs_finish_sprout(trans); if (ret) { btrfs_abort_transaction(trans, ret); goto error_sysfs; } - /* Sprouting would change fsid of the mounted root, - * so rename the fsid on the sysfs - */ - snprintf(fsid_buf, BTRFS_UUID_UNPARSED_SIZE, "%pU", - fs_info->fs_devices->fsid); - if (kobject_rename(&fs_devices->fsid_kobj, fsid_buf)) - btrfs_warn(fs_info, - "sysfs: failed to create fsid for sprout"); + btrfs_sysfs_update_sprout_fsid(fs_devices, + fs_info->fs_devices->fsid); } ret = btrfs_commit_transaction(trans); |