From: Anand Jain <anand.jain@oracle.com>
To: linux-btrfs@vger.kernel.org
Subject: [PATCH 1/2] btrfs: code reorder in btrfs_prepare_sprout
Date: Mon, 9 Jul 2018 16:33:52 +0800 [thread overview]
Message-ID: <20180709083353.14517-1-anand.jain@oracle.com> (raw)
No functional change, bring the clone of fs_devices and its
operations closer, so that it indicates its purpose.
Also add a comment to indicate why we clone the fs_devices.
Signed-off-by: Anand Jain <anand.jain@oracle.com>
---
fs/btrfs/volumes.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index b63aae267ebe..0e92969b1adc 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -2276,18 +2276,21 @@ static int btrfs_prepare_sprout(struct btrfs_fs_info *fs_info)
if (!fs_devices->seeding)
return -EINVAL;
- seed_devices = alloc_fs_devices(NULL);
- if (IS_ERR(seed_devices))
- return PTR_ERR(seed_devices);
-
+ /*
+ * This step ensures the scanned seed device remains scanned,
+ * its not a must for the sprout operation though.
+ */
old_devices = clone_fs_devices(fs_devices);
if (IS_ERR(old_devices)) {
kfree(seed_devices);
return PTR_ERR(old_devices);
}
-
list_add(&old_devices->fs_list, &fs_uuids);
+ seed_devices = alloc_fs_devices(NULL);
+ if (IS_ERR(seed_devices))
+ return PTR_ERR(seed_devices);
+
memcpy(seed_devices, fs_devices, sizeof(*seed_devices));
seed_devices->opened = 1;
INIT_LIST_HEAD(&seed_devices->devices);
--
2.7.0
next reply other threads:[~2018-07-09 8:30 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-09 8:33 Anand Jain [this message]
2018-07-09 8:33 ` [PATCH 2/2] btrfs: use fs_devices instead of the dereference Anand Jain
2018-07-10 10:41 ` [PATCH 1/2] btrfs: code reorder in btrfs_prepare_sprout David Sterba
2018-07-10 13:45 ` Anand Jain
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=20180709083353.14517-1-anand.jain@oracle.com \
--to=anand.jain@oracle.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).