Mike Fleetwood
2011-Nov-17 21:04 UTC
[PATCH] 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>
---
Example failed resize:
# strace -e trace=ioctl btrfs filesystem resize max /mnt/0
Resize ''/mnt/0'' of ''max''
ioctl(3, 0x50009403, 0xbfa5029c) = -1 EINVAL (Invalid argument)
ERROR: unable to resize ''/mnt/0'' - Invalid argument
# echo $?
30
# dmesg | tail -1
[426094.235018] new size for /dev/loop1 is 1073741824
---
fs/btrfs/ioctl.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index dae5dfe..00b7024 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -1251,7 +1251,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);
}
--
1.7.4.4
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs"
in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Chris Samuel
2011-Nov-18 04:52 UTC
Re: [PATCH] Btrfs: Don''t error on resizing FS to same size
On 18/11/11 08:04, Mike Fleetwood wrote:> 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.OK - I''m a newbie with the code (and I''m looking at Linus''s current git rather than any dev tree of Chris''s), but...> Signed-off-by: Mike Fleetwood <mike.fleetwood@googlemail.com> > ---[...]> --- > fs/btrfs/ioctl.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c > index dae5dfe..00b7024 100644 > --- a/fs/btrfs/ioctl.c > +++ b/fs/btrfs/ioctl.c > @@ -1251,7 +1251,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) {shouldn''t that be: + } else if (new_size < old_size) { otherwise you''ll never try and shrink if new_size is < old_size..> ret = btrfs_shrink_device(device, new_size); > } >-- Chris Samuel : http://www.csamuel.org/ : Melbourne, VIC -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Mike Fleetwood
2011-Nov-18 08:14 UTC
Re: [PATCH] Btrfs: Don''t error on resizing FS to same size
On Fri, Nov 18, 2011 at 03:52:00PM +1100, Chris Samuel wrote:> On 18/11/11 08:04, Mike Fleetwood wrote: > > > 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. > > OK - I''m a newbie with the code (and I''m looking at Linus''s current git > rather than any dev tree of Chris''s), but... > > > Signed-off-by: Mike Fleetwood <mike.fleetwood@googlemail.com> > > --- > [...] > > --- > > fs/btrfs/ioctl.c | 2 +- > > 1 files changed, 1 insertions(+), 1 deletions(-) > > > > diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c > > index dae5dfe..00b7024 100644 > > --- a/fs/btrfs/ioctl.c > > +++ b/fs/btrfs/ioctl.c > > @@ -1251,7 +1251,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) { > > shouldn''t that be: > > + } else if (new_size < old_size) { > > otherwise you''ll never try and shrink if new_size is < old_size.. > > > ret = btrfs_shrink_device(device, new_size); > > } > >Chris, you''re correct. I have messed up a 1 line patch by rushing. Will send corrected patch after some more testing! Embarrassed, Mike -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html