From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lukas Czerner Subject: [PATCH] resize: Do not fail if EXT4_IOC_RESIZE_FS ioctl doesn't exist Date: Fri, 14 Oct 2011 17:49:34 +0200 Message-ID: <1318607374-17246-1-git-send-email-lczerner@redhat.com> Cc: tytso@mit.edu, xiaoqiangnk@gmail.com, Lukas Czerner To: linux-ext4@vger.kernel.org Return-path: Received: from mx1.redhat.com ([209.132.183.28]:4437 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751900Ab1JNPtm (ORCPT ); Fri, 14 Oct 2011 11:49:42 -0400 Sender: linux-ext4-owner@vger.kernel.org List-ID: Commit 9f6ba888f027ba4daf57ac61a11a6dce98e42347 added support for new online resize ioctl EXT4_IOC_RESIZE_FS. It is also trying to avoid failure when this ioctl() is not supported by the kernel however it is checking wrong error code (EINVAL). When the ioctl does not exist, errno is set to ENOTTY, so we should check for that, rather than EINVAL which means that ioctl arguments are not valid. So change the code to check for ENOTTY and allow resize2fs to try to use the old approach. Also add some comments. Signed-off-by: Lukas Czerner --- Btw I can not find the new kernel code anywhere. It is not in Linus tree, it also is not in the github ext4 master, nor dev tree. Where it is then ? The problem is that the recent released e2fsprogs are broken for all kernels. To be more specific, resize2fs is broken for all kernels. resize/online.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/resize/online.c b/resize/online.c index 77290c2..1a77839 100644 --- a/resize/online.c +++ b/resize/online.c @@ -72,7 +72,12 @@ errcode_t online_resize_fs(ext2_filsys fs, const char *mtpt, } if (ioctl(fd, EXT4_IOC_RESIZE_FS, new_size)) { - if (errno != EINVAL) { + /* + * If kernel does not support EXT4_IOC_RESIZE_FS, use the + * old online resize. Note that the old approach does not + * handle >32 bit file systems + */ + if (errno != ENOTTY) { if (errno == EPERM) com_err(program_name, 0, _("Permission denied to resize filesystem")); -- 1.7.4.4