From patchwork Thu Aug 11 07:10:01 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yongqiang Yang X-Patchwork-Id: 109555 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id A6CC1B6F7E for ; Thu, 11 Aug 2011 17:17:28 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754416Ab1HKHR0 (ORCPT ); Thu, 11 Aug 2011 03:17:26 -0400 Received: from mail-pz0-f42.google.com ([209.85.210.42]:32794 "EHLO mail-pz0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753841Ab1HKHRZ (ORCPT ); Thu, 11 Aug 2011 03:17:25 -0400 Received: by pzk37 with SMTP id 37so3199891pzk.1 for ; Thu, 11 Aug 2011 00:17:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; bh=fXViWBT5XIw6F+0nix+zHg0uYQfmTJEI28DUmuJxVxs=; b=COyRz0j3zUxNmvown1H1gDXMvHoNvt0h1JF42Nzu/c+rkB2peF3kA9uk70z3vKP7ym qaQfiFPbrliE1Y8h56QIGqMD6ndeL+X6Hr3WNRR0twbaNCX/YuHCTHi/xeMd/pqtqK9Y IJ4ywcuE6VEkT1uzI74x7vWOgSkClPhBgKHOE= Received: by 10.142.118.25 with SMTP id q25mr7648156wfc.274.1313047045230; Thu, 11 Aug 2011 00:17:25 -0700 (PDT) Received: from localhost.localdomain ([159.226.43.42]) by mx.google.com with ESMTPS id b4sm1513615pba.27.2011.08.11.00.17.23 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 11 Aug 2011 00:17:24 -0700 (PDT) From: Yongqiang Yang To: linux-ext4@vger.kernel.org Cc: tytso@mit.edu, adilger@dilger.ca, Yongqiang Yang Subject: [PATCH] e2fsprogs: add 64bit-online-resize support Date: Thu, 11 Aug 2011 15:10:01 +0800 Message-Id: <1313046601-2795-1-git-send-email-xiaoqiangnk@gmail.com> X-Mailer: git-send-email 1.7.5.1 Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org This patch adds 64bit-resize support to e2fsprogs. Signed-off-by: Yongqiang Yang --- lib/ext2fs/ext2_fs.h | 1 + resize/online.c | 22 +++++++++++++++++++++- 2 files changed, 22 insertions(+), 1 deletions(-) diff --git a/lib/ext2fs/ext2_fs.h b/lib/ext2fs/ext2_fs.h index 54cb3d4..4fec5db 100644 --- a/lib/ext2fs/ext2_fs.h +++ b/lib/ext2fs/ext2_fs.h @@ -327,6 +327,7 @@ struct ext4_new_group_input { #define EXT2_IOC_GROUP_EXTEND _IOW('f', 7, unsigned long) #define EXT2_IOC_GROUP_ADD _IOW('f', 8,struct ext2_new_group_input) #define EXT4_IOC_GROUP_ADD _IOW('f', 8,struct ext4_new_group_input) +#define EXT4_IOC_RESIZE_FS _IOW('f', 16, __u64) /* * Structure of an inode on the disk diff --git a/resize/online.c b/resize/online.c index 1d8d4ec..53ad852 100644 --- a/resize/online.c +++ b/resize/online.c @@ -51,7 +51,7 @@ errcode_t online_resize_fs(ext2_filsys fs, const char *mtpt, fs->super->s_first_data_block, EXT2_BLOCKS_PER_GROUP(fs->super)), EXT2_DESC_PER_BLOCK(fs->super)); - printf("old desc_blocks = %lu, new_desc_blocks = %lu\n", + printf("old_desc_blocks = %lu, new_desc_blocks = %lu\n", fs->desc_blocks, new_desc_blocks); if (!(fs->super->s_feature_compat & EXT2_FEATURE_COMPAT_RESIZE_INODE) && @@ -69,6 +69,26 @@ errcode_t online_resize_fs(ext2_filsys fs, const char *mtpt, } size=ext2fs_blocks_count(sb); + + if (ioctl(fd, EXT4_IOC_RESIZE_FS, new_size)) { + if (errno == ENOTTY) { + printf("Kernel does not support 64bit-online resizing, " + "tring the old style online resizing\n"); + } else { + if (errno == EPERM) + com_err(program_name, 0, + _("Permission denied to resize filesystem")); + else + com_err(program_name, errno, + _("While checking for on-line resizing " + "support")); + exit(1); + } + } else { + close(fd); + return 0; + } + if (ioctl(fd, EXT2_IOC_GROUP_EXTEND, &size)) { if (errno == EPERM) com_err(program_name, 0,