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 26f46dad3b0e..e54b5e50c927 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, | |||
1375 | } | 1375 | } |
1376 | } | 1376 | } |
1377 | 1377 | ||
1378 | if (device->is_tgtdev_for_dev_replace) { | ||
1379 | ret = -EINVAL; | ||
1380 | goto out_free; | ||
1381 | } | ||
1382 | |||
1378 | old_size = device->total_bytes; | 1383 | old_size = device->total_bytes; |
1379 | 1384 | ||
1380 | if (mod < 0) { | 1385 | if (mod < 0) { |
@@ -3102,7 +3107,8 @@ static long btrfs_ioctl_scrub(struct btrfs_root *root, void __user *arg) | |||
3102 | return PTR_ERR(sa); | 3107 | return PTR_ERR(sa); |
3103 | 3108 | ||
3104 | ret = btrfs_scrub_dev(root->fs_info, sa->devid, sa->start, sa->end, | 3109 | ret = btrfs_scrub_dev(root->fs_info, sa->devid, sa->start, sa->end, |
3105 | &sa->progress, sa->flags & BTRFS_SCRUB_READONLY); | 3110 | &sa->progress, sa->flags & BTRFS_SCRUB_READONLY, |
3111 | 0); | ||
3106 | 3112 | ||
3107 | if (copy_to_user(arg, sa, sizeof(*sa))) | 3113 | if (copy_to_user(arg, sa, sizeof(*sa))) |
3108 | ret = -EFAULT; | 3114 | ret = -EFAULT; |