From patchwork Wed Aug 26 16:22:24 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kara X-Patchwork-Id: 510935 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 D30551402A3 for ; Thu, 27 Aug 2015 02:32:21 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753065AbbHZQak (ORCPT ); Wed, 26 Aug 2015 12:30:40 -0400 Received: from mx2.suse.de ([195.135.220.15]:33542 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756941AbbHZQWy (ORCPT ); Wed, 26 Aug 2015 12:22:54 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id A998DAD9E; Wed, 26 Aug 2015 16:22:53 +0000 (UTC) Received: by quack.suse.cz (Postfix, from userid 1000) id B91FF8282F; Wed, 26 Aug 2015 18:22:46 +0200 (CEST) From: Jan Kara To: linux-ext4@vger.kernel.org Cc: Ted Tso , "Darrick J. Wong" , Jan Kara Subject: [PATCH 09/21] mke2fs: Allow specifying number of reserved inodes Date: Wed, 26 Aug 2015 18:22:24 +0200 Message-Id: <1440606156-5754-10-git-send-email-jack@suse.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1440606156-5754-1-git-send-email-jack@suse.com> References: <1440606156-5754-1-git-send-email-jack@suse.com> Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org From: Jan Kara Add option to specify number of reserved inodes in the created filesystem. Signed-off-by: Jan Kara --- misc/mke2fs.8.in | 6 ++++++ misc/mke2fs.c | 40 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 45 insertions(+), 1 deletion(-) diff --git a/misc/mke2fs.8.in b/misc/mke2fs.8.in index 40c40d3ed065..4165c0a9d051 100644 --- a/misc/mke2fs.8.in +++ b/misc/mke2fs.8.in @@ -384,6 +384,12 @@ Do not attempt to discard blocks at mkfs time. @QUOTA_MAN_COMMENT@.B quota @QUOTA_MAN_COMMENT@feature is set. Without this extended option, the default @QUOTA_MAN_COMMENT@behavior is to initialize both user and group quotas. +.TP +.BI reserved_inodes= number +Specify the number of inodes reserved for system files. This number must be +at least 10. Currently 10 is enough but future features may require additional +reserved inodes. Reserving more inodes after the file system is created +requires full file system scan which can take a long time. .RE .TP .BI \-f " fragment-size" diff --git a/misc/mke2fs.c b/misc/mke2fs.c index 78b1252d8519..d61d1a332e67 100644 --- a/misc/mke2fs.c +++ b/misc/mke2fs.c @@ -1024,6 +1024,34 @@ static void parse_extended_opts(struct ext2_super_block *param, r_usage++; continue; } + } else if (!strcmp(token, "reserved_inodes")) { + unsigned int reserved_inodes; + + if (!arg) { + r_usage++; + badopt = token; + continue; + } + reserved_inodes = strtoul(arg, &p, 0); + if (*p) { + fprintf(stderr, + _("Invalid number of reserved inodes " + "%s\n"), + arg); + r_usage++; + continue; + } + /* Ino 0 is invalid so bump by 1... */ + reserved_inodes++; + if (reserved_inodes < EXT2_GOOD_OLD_FIRST_INO) { + fprintf(stderr, + _("Too few reserved inodes " + "%s (must be at least %u)\n"), + arg, EXT2_GOOD_OLD_FIRST_INO - 1); + r_usage++; + continue; + } + param->s_first_ino = reserved_inodes; } else { r_usage++; badopt = token; @@ -1049,7 +1077,8 @@ static void parse_extended_opts(struct ext2_super_block *param, "\ttest_fs\n" "\tdiscard\n" "\tnodiscard\n" - "\tquotatype=\n\n"), + "\tquotatype=\n" + "\treserved_inodes=\n\n"), badopt ? badopt : ""); free(buf); exit(1); @@ -2422,6 +2451,15 @@ profile_error: exit(1); } + /* Count with one more inode for lost+found */ + if (fs_param.s_first_ino >= fs_param.s_inodes_count + 1) { + com_err(program_name, 0, _("asked for more reserved inodes than filesystem has " + "available (%u >= %u)\n"), + (unsigned int)fs_param.s_first_ino, + (unsigned int)fs_param.s_inodes_count + 1); + exit(1); + } + /* * Calculate number of blocks to reserve */