From: Anand Jain <anand.jain@oracle.com>
To: linux-btrfs@vger.kernel.org
Subject: [PATCH 4/4] btrfs: free alien device due to device add
Date: Fri, 4 Oct 2019 15:50:03 +0800 [thread overview]
Message-ID: <1570175403-4073-5-git-send-email-anand.jain@oracle.com> (raw)
In-Reply-To: <1570175403-4073-1-git-send-email-anand.jain@oracle.com>
When the old device has new fsid through btrfs device add -f <dev> our
fs_devices list has an alien device in one of the fs_devices.
By having an alien device in fs_devices, we have two issues so far
1. missing device is not shows as missing in the userland
Which is due to cracks in the function btrfs_open_one_device() and
hardened by patch
btrfs: delete identified alien device in open_fs_devices
2. mount of a degraded fs_devices fails
Which is due to cracks in the function btrfs_free_extra_devids() and
hardened by patch
btrfs: include non-missing as a qualifier for the latest_bdev
Now the reason for both of this issue is that there is an alien (does not
contain the intended fsid) device in the fs_devices.
We know a device can be scanned/added through
btrfs-control::BTRFS_IOC_SCAN_DEV|BTRFS_IOC_DEVICES_READY
or by
ioctl::BTRFS_IOC_ADD_DEV
And device coming through btrfs-control is checked against the all other
devices in btrfs kernel but not coming through BTRFS_IOC_ADD_DEV.
This patch checks if the device add is alienating any other scanned
device and deletes it.
In fact, this patch fixes both the issues 1 and 2 (above) by eliminating
the source of the issue, but still they have their own patch as well
because its the right way to harden the functions and fill the cracks.
Signed-off-by: Anand Jain <anand.jain@oracle.com>
---
fs/btrfs/volumes.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 6c42048ec099..f8b21e82df2a 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -2736,6 +2736,19 @@ int btrfs_init_new_device(struct btrfs_fs_info *fs_info, const char *device_path
/* Update ctime/mtime for libblkid */
update_dev_time(device_path);
+
+ /*
+ * Now that we have written a new sb into this device, check all other
+ * fs_devices list if it alienates any scanned device.
+ */
+ mutex_lock(&uuid_mutex);
+ /*
+ * Ignore the return as we are successfull in the core task - to added
+ * the device
+ */
+ btrfs_free_stale_devices(device_path, NULL);
+ mutex_unlock(&uuid_mutex);
+
return ret;
error_sysfs:
--
1.8.3.1
next prev parent reply other threads:[~2019-10-04 7:50 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-04 7:49 [PATCH 0/4] btrfs: fix issues due to alien device Anand Jain
2019-10-04 7:50 ` [PATCH 1/4] btrfs: drop useless goto in open_fs_devices Anand Jain
2019-10-04 8:12 ` Nikolay Borisov
2019-10-04 7:50 ` [PATCH 2/4] btrfs: delete identified alien device " Anand Jain
2019-10-04 8:18 ` Nikolay Borisov
2019-10-06 2:47 ` [PATCH v2 " Anand Jain
2019-10-06 11:44 ` Nikolay Borisov
2019-10-06 2:51 ` [PATCH " Anand Jain
2019-10-04 7:50 ` [PATCH 3/4] btrfs: include non-missing as a qualifier for the latest_bdev Anand Jain
2019-10-04 8:11 ` Nikolay Borisov
2019-10-04 9:08 ` [Not TLS] " Graham Cobb
2019-10-04 9:20 ` Nikolay Borisov
2019-10-04 7:50 ` Anand Jain [this message]
2019-10-04 8:19 ` [PATCH 0/4] btrfs: fix issues due to alien device Nikolay Borisov
2019-10-07 9:42 ` 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=1570175403-4073-5-git-send-email-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).