Commit 7f551d96 authored May 05, 2020 by Anand Jain Committed by David Sterba May 25, 2020

btrfs: free alien device after device add



When an 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 lists.

By having an alien device in fs_devices, we have two issues so far

1. missing device does not not show as missing in the userland

2. degraded mount will fail

Both issues are caused by the fact that there's an alien device in the
fs_devices list. (Alien means that it does not belong to the filesystem,
identified by fsid, or does not contain btrfs filesystem at all, eg. due
to overwrite).

A device can be scanned/added through the control device ioctls
SCAN_DEV, DEVICES_READY or by ADD_DEV.

And device coming through the control device is checked against the all
other devices in the lists, but this was not the case for ADD_DEV.

This patch fixes both issues above by removing the alien device.

CC: stable@vger.kernel.org # 5.4+
Signed-off-by: Anand Jain <anand.jain@oracle.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

parent 998a0671

fs/btrfs/volumes.c

+11 −1

Original line number	Diff line number	Diff line
		@@ -2662,8 +2662,18 @@ int btrfs_init_new_device(struct btrfs_fs_info fs_info, const char device_path
		ret = btrfs_commit_transaction(trans);
		}

		/* Update ctime/mtime for libblkid */
		/*
		* Now that we have written a new super block to this device, check all
		* other fs_devices list if device_path alienates any other scanned
		* device.
		* We can ignore the return value as it typically returns -EINVAL and
		* only succeeds if the device was an alien.
		*/
		btrfs_forget_devices(device_path);

		/* Update ctime/mtime for blkid or udev */
		update_dev_time(device_path);

		return ret;

		error_sysfs:

Admin message