Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 63a212ab authored by Stefan Behrens's avatar Stefan Behrens Committed by Josef Bacik
Browse files

Btrfs: disallow some operations on the device replace target device 



This patch adds some code to disallow operations on the device that
is used as the target for the device replace operation.

Signed-off-by: default avatarStefan Behrens <sbehrens@giantdisaster.de>
Signed-off-by: default avatarChris Mason <chris.mason@fusionio.com>
parent 5ac00add

fs/btrfs/ctree.h

+1 −1
Original line number Diff line number Diff line
@@ -3649,7 +3649,7 @@ int btrfs_reloc_post_snapshot(struct btrfs_trans_handle *trans, 
/* scrub.c */

int btrfs_scrub_dev(struct btrfs_fs_info *fs_info, u64 devid, u64 start,

		    u64 end, struct btrfs_scrub_progress *progress,

		    int readonly);

		    int readonly, int is_dev_replace);

void btrfs_scrub_pause(struct btrfs_root *root);

void btrfs_scrub_pause_super(struct btrfs_root *root);

void btrfs_scrub_continue(struct btrfs_root *root);

fs/btrfs/extent-tree.c

+2 −1
Original line number Diff line number Diff line
@@ -7468,7 +7468,8 @@ int btrfs_can_relocate(struct btrfs_root *root, u64 bytenr) 
		 * check to make sure we can actually find a chunk with enough

		 * space to fit our block group in.

		 */

		if (device->total_bytes > device->bytes_used + min_free) {

		if (device->total_bytes > device->bytes_used + min_free &&

		    !device->is_tgtdev_for_dev_replace) {

			ret = find_free_dev_extent(device, min_free,

						   &dev_offset, NULL);

			if (!ret)

fs/btrfs/ioctl.c

+7 −1
Original line number Diff line number Diff line
@@ -1375,6 +1375,11 @@ static noinline int btrfs_ioctl_resize(struct btrfs_root *root, 
		}

	}



	if (device->is_tgtdev_for_dev_replace) {

		ret = -EINVAL;

		goto out_free;

	}



	old_size = device->total_bytes;



	if (mod < 0) {
@@ -3102,7 +3107,8 @@ static long btrfs_ioctl_scrub(struct btrfs_root *root, void __user *arg) 
		return PTR_ERR(sa);



	ret = btrfs_scrub_dev(root->fs_info, sa->devid, sa->start, sa->end,

			      &sa->progress, sa->flags & BTRFS_SCRUB_READONLY);

			      &sa->progress, sa->flags & BTRFS_SCRUB_READONLY,

			      0);



	if (copy_to_user(arg, sa, sizeof(*sa)))

		ret = -EFAULT;

fs/btrfs/scrub.c

+9 −5
Original line number Diff line number Diff line
@@ -116,6 +116,9 @@ struct scrub_ctx { 
	u32			sectorsize;

	u32			nodesize;

	u32			leafsize;



	int			is_dev_replace;



	/*

	 * statistics

	 */
@@ -284,7 +287,7 @@ static noinline_for_stack void scrub_free_ctx(struct scrub_ctx *sctx) 
}



static noinline_for_stack

struct scrub_ctx *scrub_setup_ctx(struct btrfs_device *dev)

struct scrub_ctx *scrub_setup_ctx(struct btrfs_device *dev, int is_dev_replace)

{

	struct scrub_ctx *sctx;

	int		i;
@@ -296,6 +299,7 @@ struct scrub_ctx *scrub_setup_ctx(struct btrfs_device *dev) 
	sctx = kzalloc(sizeof(*sctx), GFP_NOFS);

	if (!sctx)

		goto nomem;

	sctx->is_dev_replace = is_dev_replace;

	sctx->pages_per_bio = pages_per_bio;

	sctx->curr = -1;

	sctx->dev_root = dev->dev_root;
@@ -2293,7 +2297,7 @@ static noinline_for_stack void scrub_workers_put(struct btrfs_fs_info *fs_info) 


int btrfs_scrub_dev(struct btrfs_fs_info *fs_info, u64 devid, u64 start,

		    u64 end, struct btrfs_scrub_progress *progress,

		    int readonly)

		    int readonly, int is_dev_replace)

{

	struct scrub_ctx *sctx;

	int ret;
@@ -2356,14 +2360,14 @@ int btrfs_scrub_dev(struct btrfs_fs_info *fs_info, u64 devid, u64 start, 


	mutex_lock(&fs_info->fs_devices->device_list_mutex);

	dev = btrfs_find_device(fs_info, devid, NULL, NULL);

	if (!dev || dev->missing) {

	if (!dev || (dev->missing && !is_dev_replace)) {

		mutex_unlock(&fs_info->fs_devices->device_list_mutex);

		scrub_workers_put(fs_info);

		return -ENODEV;

	}

	mutex_lock(&fs_info->scrub_lock);



	if (!dev->in_fs_metadata) {

	if (!dev->in_fs_metadata || dev->is_tgtdev_for_dev_replace) {

		mutex_unlock(&fs_info->scrub_lock);

		mutex_unlock(&fs_info->fs_devices->device_list_mutex);

		scrub_workers_put(fs_info);
@@ -2376,7 +2380,7 @@ int btrfs_scrub_dev(struct btrfs_fs_info *fs_info, u64 devid, u64 start, 
		scrub_workers_put(fs_info);

		return -EINPROGRESS;

	}

	sctx = scrub_setup_ctx(dev);

	sctx = scrub_setup_ctx(dev, is_dev_replace);

	if (IS_ERR(sctx)) {

		mutex_unlock(&fs_info->scrub_lock);

		mutex_unlock(&fs_info->fs_devices->device_list_mutex);

fs/btrfs/super.c

+2 −1
Original line number Diff line number Diff line
@@ -1354,7 +1354,8 @@ static int btrfs_calc_avail_data_space(struct btrfs_root *root, u64 *free_bytes) 
		min_stripe_size = BTRFS_STRIPE_LEN;



	list_for_each_entry(device, &fs_devices->devices, dev_list) {

		if (!device->in_fs_metadata || !device->bdev)

		if (!device->in_fs_metadata || !device->bdev ||

		    device->is_tgtdev_for_dev_replace)

			continue;



		avail_space = device->total_bytes - device->bytes_used;