From: Anand Jain <anand.jain@oracle.com>
To: linux-btrfs@vger.kernel.org
Subject: [PATCH v3 3/5] btrfs: remove identified alien btrfs device in open_fs_devices
Date: Mon, 7 Oct 2019 17:45:13 +0800 [thread overview]
Message-ID: <20191007094515.925-4-anand.jain@oracle.com> (raw)
In-Reply-To: <20191007094515.925-1-anand.jain@oracle.com>
In open_fs_devices() we identify alien device but we don't reset its
the device::name. So progs device list does not show the device missing
as shown in the script below.
mkfs.btrfs -fq /dev/sdd && mount /dev/sdd /btrfs
mkfs.btrfs -fq -draid1 -mraid1 /dev/sdc /dev/sdb
sleep 3 # avoid racing with udev's useless scans if needed
btrfs dev add -f /dev/sdb /btrfs
mount -o degraded /dev/sdc /btrfs1
No missing device:
btrfs fi show -m /btrfs1
Label: none uuid: 3eb7cd50-4594-458f-9d68-c243cc49954d
Total devices 2 FS bytes used 128.00KiB
devid 1 size 12.00GiB used 1.26GiB path /dev/sdc
devid 2 size 12.00GiB used 1.26GiB path /dev/sdb
Signed-off-by: Anand Jain <anand.jain@oracle.com>
---
v3: Fix nit, rearrange code to remove continue.
v2: Move free alien part to its parent function btrfs_open_one_device.
Thanks Nikolay.
fs/btrfs/volumes.c | 30 +++++++++++++++++++++---------
1 file changed, 21 insertions(+), 9 deletions(-)
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 0cc8d40b8bb9..81097c80ac4a 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -591,13 +591,18 @@ static int btrfs_open_one_device(struct btrfs_fs_devices *fs_devices,
if (ret)
return ret;
+ ret = -EINVAL;
disk_super = (struct btrfs_super_block *)bh->b_data;
devid = btrfs_stack_device_id(&disk_super->dev_item);
- if (devid != device->devid)
+ if (devid != device->devid) {
+ ret = -EUCLEAN;
goto error_brelse;
+ }
- if (memcmp(device->uuid, disk_super->dev_item.uuid, BTRFS_UUID_SIZE))
+ if (memcmp(device->uuid, disk_super->dev_item.uuid, BTRFS_UUID_SIZE)) {
+ ret = -EUCLEAN;
goto error_brelse;
+ }
device->generation = btrfs_super_generation(disk_super);
@@ -640,7 +645,7 @@ static int btrfs_open_one_device(struct btrfs_fs_devices *fs_devices,
brelse(bh);
blkdev_put(bdev, flags);
- return -EINVAL;
+ return ret;
}
/*
@@ -1123,18 +1128,25 @@ int btrfs_close_devices(struct btrfs_fs_devices *fs_devices)
static int open_fs_devices(struct btrfs_fs_devices *fs_devices,
fmode_t flags, void *holder)
{
+ int ret;
struct btrfs_device *device;
+ struct btrfs_device *tmp_device;
struct btrfs_device *latest_dev = NULL;
flags |= FMODE_EXCL;
- list_for_each_entry(device, &fs_devices->devices, dev_list) {
+ list_for_each_entry_safe(device, tmp_device, &fs_devices->devices,
+ dev_list) {
/* Just open everything we can; ignore failures here */
- if (btrfs_open_one_device(fs_devices, device, flags, holder))
- continue;
-
- if (!latest_dev ||
- device->generation > latest_dev->generation)
+ ret = btrfs_open_one_device(fs_devices, device, flags, holder);
+ if (ret == -EUCLEAN) {
+ /* Its an alien device, remove it from the list */
+ fs_devices->num_devices--;
+ list_del(&device->dev_list);
+ btrfs_free_device(device);
+ }
+ if (ret == 0 && (!latest_dev ||
+ device->generation > latest_dev->generation))
latest_dev = device;
}
if (fs_devices->open_devices == 0)
--
1.8.3.1
next prev parent reply other threads:[~2019-10-07 9:45 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-07 9:45 [PATCH v3 0/5] btrfs: fix issues due to alien device Anand Jain
2019-10-07 9:45 ` [PATCH 1/5] btrfs: drop useless goto in open_fs_devices Anand Jain
2020-01-16 15:52 ` Josef Bacik
2019-10-07 9:45 ` [PATCH 2/5] btrfs: include non-missing as a qualifier for the latest_bdev Anand Jain
2020-01-16 15:52 ` Josef Bacik
2020-01-17 3:01 ` Anand Jain
2019-10-07 9:45 ` Anand Jain [this message]
2020-01-16 15:56 ` [PATCH v3 3/5] btrfs: remove identified alien btrfs device in open_fs_devices Josef Bacik
2020-01-17 9:10 ` Anand Jain
2020-01-17 14:23 ` Josef Bacik
2019-10-07 9:45 ` [PATCH 4/5] btrfs: remove identified alien " Anand Jain
2019-10-07 13:30 ` Nikolay Borisov
2019-10-07 13:37 ` Qu Wenruo
2019-10-07 17:03 ` David Sterba
2019-10-08 3:26 ` Anand Jain
2020-01-15 8:56 ` Anand Jain
2019-10-07 9:45 ` [PATCH 5/5] btrfs: free alien device due to device add Anand Jain
2020-01-16 16:00 ` Josef Bacik
2019-10-07 17:36 ` [PATCH v3 0/5] btrfs: fix issues due to alien device David Sterba
2019-10-08 6:11 ` 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=20191007094515.925-4-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).