From: Anand Jain <Anand.Jain@oracle.com>
To: linux-btrfs@vger.kernel.org
Cc: jeffm@suse.com, dsterba@suse.cz, clm@fb.com
Subject: [PATCH 5/6 v2] btrfs: create sprout should rename fsid on the sysfs as well
Date: Tue, 3 Jun 2014 11:36:03 +0800 [thread overview]
Message-ID: <1401766564-7381-6-git-send-email-Anand.Jain@oracle.com> (raw)
In-Reply-To: <1401766564-7381-1-git-send-email-Anand.Jain@oracle.com>
Creating sprout will change the fsid of the mounted root.
do the same on the sysfs as well.
reproducer:
mount /dev/sdb /btrfs (seed disk)
btrfs dev add /dev/sdc /btrfs
mount -o rw,remount /btrfs
btrfs dev del /dev/sdb /btrfs
mount /dev/sdb /btrfs
Error:
kobject_add_internal failed for fe350492-dc28-4051-a601-e017b17e6145 with -EEXIST, don't try to register things with the same name in the same directory.
Signed-off-by: Anand Jain <anand.jain@oracle.com>
---
v2: function name change and defined BTRFS_UUID_UNPARSED_SIZE
in btrfs.h include file
fs/btrfs/volumes.c | 9 +++++++++
include/uapi/linux/btrfs.h | 1 +
2 files changed, 10 insertions(+)
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 4a66e6b..d169bd8 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -2108,6 +2108,7 @@ int btrfs_init_new_device(struct btrfs_root *root, char *device_path)
mutex_unlock(&root->fs_info->fs_devices->device_list_mutex);
if (seeding_dev) {
+ char fsid_buf[BTRFS_UUID_UNPARSED_SIZE];
ret = init_first_rw_device(trans, root, device);
if (ret) {
btrfs_abort_transaction(trans, root, ret);
@@ -2118,6 +2119,14 @@ int btrfs_init_new_device(struct btrfs_root *root, char *device_path)
btrfs_abort_transaction(trans, root, ret);
goto error_trans;
}
+
+ /* Sprouting would change fsid of the mounted root,
+ * so rename the fsid on the sysfs
+ */
+ snprintf(fsid_buf, BTRFS_UUID_UNPARSED_SIZE, "%pU",
+ root->fs_info->fsid);
+ if (kobject_rename(&root->fs_info->super_kobj, fsid_buf))
+ goto error_trans;
} else {
ret = btrfs_add_device(trans, root, device);
if (ret) {
diff --git a/include/uapi/linux/btrfs.h b/include/uapi/linux/btrfs.h
index 839d574c..8ff61c2 100644
--- a/include/uapi/linux/btrfs.h
+++ b/include/uapi/linux/btrfs.h
@@ -38,6 +38,7 @@ struct btrfs_ioctl_vol_args {
#define BTRFS_SUBVOL_QGROUP_INHERIT (1ULL << 2)
#define BTRFS_FSID_SIZE 16
#define BTRFS_UUID_SIZE 16
+#define BTRFS_UUID_UNPARSED_SIZE 37
#define BTRFS_QGROUP_INHERIT_SET_LIMITS (1ULL << 0)
--
1.8.5.3
next prev parent reply other threads:[~2014-06-03 3:36 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-03 3:35 [PATCH 0/6 v2] update sysfs per btrfs device operations Anand Jain
2014-06-03 3:35 ` [PATCH 1/6 v2] btrfs: rename add_device_membership to btrfs_kobj_add_device Anand Jain
2014-06-03 13:23 ` David Sterba
2014-06-03 3:36 ` [PATCH 2/6 v2] btrfs: dev delete should remove sysfs entry Anand Jain
2014-06-03 13:23 ` David Sterba
2014-06-03 3:36 ` [PATCH 3/6 v2] btrfs: dev add should add its " Anand Jain
2014-06-03 13:23 ` David Sterba
2014-06-03 3:36 ` [PATCH 4/6 v2] btrfs: dev replace should replace the " Anand Jain
2014-06-03 13:39 ` David Sterba
2014-06-03 3:36 ` Anand Jain [this message]
2014-06-03 13:41 ` [PATCH 5/6 v2] btrfs: create sprout should rename fsid on the sysfs as well David Sterba
2014-06-03 3:36 ` [PATCH 6/6 RFC v2] btrfs: revamp /sys/fs/btrfs/<fsid>/devices Anand Jain
2014-06-03 14:08 ` David Sterba
2014-06-04 4:03 ` Anand Jain
2014-06-20 9:53 ` [PATCH 0/6 v2] update sysfs per btrfs device operations David Sterba
2014-06-20 15:40 ` Chris Mason
2014-06-20 15:42 ` Chris Mason
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1401766564-7381-6-git-send-email-Anand.Jain@oracle.com \
--to=anand.jain@oracle.com \
--cc=clm@fb.com \
--cc=dsterba@suse.cz \
--cc=jeffm@suse.com \
--cc=linux-btrfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).