@@ -2212,6 +2212,10 @@ static long btrfs_control_ioctl(struct file *file, unsigned int cmd,
ret = btrfs_scan_one_device(vol->name, FMODE_READ,
&btrfs_fs_type, &fs_devices);
break;
+ case BTRFS_IOC_PURGE_DEV:
+ ret = btrfs_purge_one_device(vol->name, FMODE_READ,
+ &btrfs_fs_type, &fs_devices);
+ break;
case BTRFS_IOC_DEVICES_READY:
ret = btrfs_scan_one_device(vol->name, FMODE_READ,
&btrfs_fs_type, &fs_devices);
@@ -1260,6 +1260,82 @@ static int btrfs_read_disk_super(struct block_device *bdev, u64 bytenr,
return 0;
}
+static int device_list_remove(struct btrfs_super_block *disk_super, u64 devid)
+{
+ struct btrfs_fs_devices *fs_devices;
+ struct btrfs_device *device;
+ int ret;
+
+ mutex_lock(&uuid_mutex);
+ fs_devices = find_fsid(disk_super->fsid);
+ if (!fs_devices) {
+ ret = -ENOENT;
+ goto out;
+ }
+
+ if (fs_devices->opened) {
+ ret = -EBUSY;
+ goto out;
+ }
+
+ device = find_device(fs_devices, devid, disk_super->dev_item.uuid);
+ if (!device) {
+ ret = -ENOENT;
+ goto out;
+ }
+
+ delete_device_from_list(device);
+ ret = 0;
+out:
+ mutex_unlock(&uuid_mutex);
+
+ return ret;
+}
+
+int btrfs_purge_one_device(const char *path, fmode_t flags, void *holder,
+ struct btrfs_fs_devices **fs_devices_ret)
+{
+ struct btrfs_super_block *disk_super;
+ struct block_device *bdev;
+ struct page *page;
+ u64 bytenr;
+ u64 devid;
+ int ret;
+
+ bytenr = btrfs_sb_offset(0);
+ flags |= FMODE_EXCL;
+
+ bdev = blkdev_get_by_path(path, flags, holder);
+ if (IS_ERR(bdev))
+ return PTR_ERR(bdev);
+
+ if (btrfs_read_disk_super(bdev, bytenr, &page, &disk_super)) {
+ ret = -EINVAL;
+ goto error_bdev_put;
+ }
+
+ devid = btrfs_stack_device_id(&disk_super->dev_item);
+
+ ret = device_list_remove(disk_super, devid);
+ /* User error */
+ if (ret == -ENOENT)
+ goto error;
+
+ if (ret)
+ pr_err("BTRFS: %pU device %s devid %llu failed to deregister: %d\n",
+ disk_super->fsid, path, devid, ret);
+ else
+ pr_info("BTRFS: %pU device %s devid %llu deregistered\n",
+ disk_super->fsid, path, devid);
+
+error:
+ btrfs_release_disk_super(page);
+
+error_bdev_put:
+ blkdev_put(bdev, flags);
+ return ret;
+}
+
/*
* Look for a btrfs signature on a device. This may be called out of the mount path
* and we are not allowed to call set_blocksize during the scan. The superblock
@@ -422,6 +422,8 @@ int btrfs_open_devices(struct btrfs_fs_devices *fs_devices,
fmode_t flags, void *holder);
int btrfs_scan_one_device(const char *path, fmode_t flags, void *holder,
struct btrfs_fs_devices **fs_devices_ret);
+int btrfs_purge_one_device(const char *path, fmode_t flags, void *holder,
+ struct btrfs_fs_devices **fs_devices_ret);
int btrfs_close_devices(struct btrfs_fs_devices *fs_devices);
void btrfs_close_extra_devices(struct btrfs_fs_devices *fs_devices, int step);
void btrfs_assign_next_active_device(struct btrfs_fs_info *fs_info,
@@ -105,7 +105,6 @@ struct btrfs_ioctl_qgroup_limit_args {
* - BTRFS_IOC_SUBVOL_GETFLAGS
* - BTRFS_IOC_SUBVOL_SETFLAGS
*/
-
struct btrfs_ioctl_vol_args_v2 {
__s64 fd;
__u64 transid;
@@ -744,6 +743,8 @@ enum btrfs_err_code {
struct btrfs_ioctl_vol_args)
#define BTRFS_IOC_SCAN_DEV _IOW(BTRFS_IOCTL_MAGIC, 4, \
struct btrfs_ioctl_vol_args)
+#define BTRFS_IOC_PURGE_DEV _IOW(BTRFS_IOCTL_MAGIC, 5, \
+ struct btrfs_ioctl_vol_args)
/* trans start and trans end are dangerous, and only for
* use by applications that know how to avoid the
* resulting deadlocks
Support for a new command is being added here: btrfs dev deregister <dev> Which shall undo the effects of the command btrfs dev scan <dev> This cli/ioctl is needed as there is no way to continue to mount in degraded mode if the device is already scanned, which is required to recover from the split brain raid conditions. This patch proposes to use ioctl #5 as it was empty. IOW(BTRFS_IOCTL_MAGIC, 5, ..) Signed-off-by: Anand Jain <anand.jain@oracle.com> --- v2: Use -EBUSY instead of -ENOENT Since now delete_device_from_list() holds device_list_mutex so dont hold device_list_mutex in its parent. Reword and indent pr_err/info. v3: Send to correct ML v4: no change. v5: Make sure uuid_mutex in device_list_remove(), set ret value to near to the event. fs/btrfs/super.c | 4 +++ fs/btrfs/volumes.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++ fs/btrfs/volumes.h | 2 ++ include/uapi/linux/btrfs.h | 3 +- 4 files changed, 84 insertions(+), 1 deletion(-)