From: Anand Jain <anand.jain@oracle.com>
To: linux-btrfs@vger.kernel.org
Subject: [PATCH v3 4/4] btrfs: add helper btrfs_num_devices() to deduce num_devices
Date: Thu, 2 Aug 2018 18:09:34 +0800 [thread overview]
Message-ID: <20180802100934.12468-1-anand.jain@oracle.com> (raw)
In-Reply-To: <20180726065334.30594-5-anand.jain@oracle.com>
When the replace is running the fs_devices::num_devices also includes
the replace device, however in some operations like device delete and
balance it needs the actual num_devices without the repalce devices, so
now the function btrfs_num_devices() just provides that.
And here is a scenario how balance and repalce items could co-exist.
Consider balance is started and paused, now start the replace
followed by a power-recycle of the system. During following mount,
the open_ctree() first restarts the balance so it must check for the
replace device otherwise our num_devices calculation will be wrong.
Signed-off-by: Anand Jain <anand.jain@oracle.com>
---
v2->v3: update changelog with not so obvious balance and repalce
co-existance secnario
v1->v2: add comments
fs/btrfs/volumes.c | 32 ++++++++++++++++++--------------
1 file changed, 18 insertions(+), 14 deletions(-)
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index fe74fefc75f7..8844904f9009 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -1854,6 +1854,21 @@ void btrfs_assign_next_active_device(struct btrfs_device *device,
fs_info->fs_devices->latest_bdev = next_device->bdev;
}
+/* Returns btrfs_fs_devices::num_devices excluding replace device if any */
+static inline u64 btrfs_num_devices(struct btrfs_fs_info *fs_info)
+{
+ u64 num_devices = fs_info->fs_devices->num_devices;
+
+ btrfs_dev_replace_read_lock(&fs_info->dev_replace);
+ if (btrfs_dev_replace_is_ongoing(&fs_info->dev_replace)) {
+ BUG_ON(num_devices < 1);
+ num_devices--;
+ }
+ btrfs_dev_replace_read_unlock(&fs_info->dev_replace);
+
+ return num_devices;
+}
+
int btrfs_rm_device(struct btrfs_fs_info *fs_info, const char *device_path,
u64 devid)
{
@@ -1865,13 +1880,7 @@ int btrfs_rm_device(struct btrfs_fs_info *fs_info, const char *device_path,
mutex_lock(&uuid_mutex);
- num_devices = fs_devices->num_devices;
- btrfs_dev_replace_read_lock(&fs_info->dev_replace);
- if (btrfs_dev_replace_is_ongoing(&fs_info->dev_replace)) {
- BUG_ON(num_devices < 1);
- num_devices--;
- }
- btrfs_dev_replace_read_unlock(&fs_info->dev_replace);
+ num_devices = btrfs_num_devices(fs_info);
ret = btrfs_check_raid_min_devices(fs_info, num_devices - 1);
if (ret)
@@ -3721,13 +3730,8 @@ int btrfs_balance(struct btrfs_fs_info *fs_info,
}
}
- num_devices = fs_info->fs_devices->num_devices;
- btrfs_dev_replace_read_lock(&fs_info->dev_replace);
- if (btrfs_dev_replace_is_ongoing(&fs_info->dev_replace)) {
- BUG_ON(num_devices < 1);
- num_devices--;
- }
- btrfs_dev_replace_read_unlock(&fs_info->dev_replace);
+ num_devices = btrfs_num_devices(fs_info);
+
allowed = BTRFS_AVAIL_ALLOC_BIT_SINGLE | BTRFS_BLOCK_GROUP_DUP;
if (num_devices > 1)
allowed |= (BTRFS_BLOCK_GROUP_RAID0 | BTRFS_BLOCK_GROUP_RAID1);
--
2.7.0
next prev parent reply other threads:[~2018-08-02 11:56 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-26 6:53 [PATCH v2 0/4] Misc volume patch set part2 Anand Jain
2018-07-26 6:53 ` [PATCH v4 1/4] btrfs: drop uuid_mutex in btrfs_free_extra_devids() Anand Jain
2018-07-26 6:53 ` [PATCH v2 2/4] btrfs: fix race between free_stale_devices and close_fs_devices Anand Jain
2018-08-01 14:29 ` David Sterba
2018-08-02 9:29 ` Anand Jain
2018-08-07 14:59 ` David Sterba
2018-08-08 9:51 ` Anand Jain
2018-07-26 6:53 ` [PATCH 3/4] btrfs: bug_on for num_devices below 0 Anand Jain
2018-07-26 6:53 ` [PATCH v2 4/4] btrfs: add helper btrfs_num_devices() to deduce num_devices Anand Jain
2018-08-01 14:41 ` David Sterba
2018-08-02 10:09 ` Anand Jain
2018-08-02 10:09 ` Anand Jain [this message]
2018-08-02 10:11 ` [PATCH v3 " Nikolay Borisov
2018-08-02 12:21 ` David Sterba
2018-08-02 13:07 ` Anand Jain
2018-08-07 15:02 ` David Sterba
2018-08-07 22:43 ` Anand Jain
2018-08-03 12:45 ` [PATCH v4 " Anand Jain
2018-08-03 12:45 ` [PATCH] btrfs: handle the BUG_ON in btrfs_num_devices() Anand Jain
2018-08-03 13:33 ` Nikolay Borisov
2018-08-06 8:57 ` Anand Jain
2018-08-07 17:09 ` David Sterba
2018-08-07 22:51 ` 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=20180802100934.12468-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).