diff options
Diffstat (limited to 'fs/btrfs/ioctl.c')
| -rw-r--r-- | fs/btrfs/ioctl.c | 8 | 
1 files changed, 7 insertions, 1 deletions
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index 26f46dad3b0..e54b5e50c92 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -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;  |