Btrfs: Don't error on resizing FS to same size

It seems overly harsh to fail a resize of a btrfs file system to the
same size when a shrink or grow would succeed.  User app GParted trips
over this error.  Allow it by bypassing the shrink or grow operation.

Signed-off-by: Mike Fleetwood <mike.fleetwood@googlemail.com>
(cherry picked from commit ece7d20e8be6730fbb29f4550de6b19b1a3a9387)

diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index 077d2b60043316a4b8951805b90c3a0667ed44c2..b6da562354ea6109b4dc4af80872540f44cd4023 100644 (file)
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -1286,7 +1286,7 @@ static noinline int btrfs_ioctl_resize(struct btrfs_root *root,
                }
                ret = btrfs_grow_device(trans, device, new_size);
                btrfs_commit_transaction(trans, root);
-       } else {
+       } else if (new_size < old_size) {
                ret = btrfs_shrink_device(device, new_size);
        }