linux-ext4.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jan Kara <jack@suse.com>
To: linux-ext4@vger.kernel.org
Cc: Ted Tso <tytso@mit.edu>,
	"Darrick J. Wong" <darrick.wong@oracle.com>,
	Jan Kara <jack@suse.com>
Subject: [PATCH 13/19] tune2fs: Add support for changing number of reserved inodes
Date: Fri,  7 Aug 2015 12:51:23 +0200	[thread overview]
Message-ID: <1438944689-24562-14-git-send-email-jack@suse.com> (raw)
In-Reply-To: <1438944689-24562-1-git-send-email-jack@suse.com>

Signed-off-by: Jan Kara <jack@suse.com>
---
 misc/tune2fs.8.in |   5 +++
 misc/tune2fs.c    | 102 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 107 insertions(+)

diff --git a/misc/tune2fs.8.in b/misc/tune2fs.8.in
index 4373fc49b255..922705329112 100644
--- a/misc/tune2fs.8.in
+++ b/misc/tune2fs.8.in
@@ -236,6 +236,11 @@ program.
 This superblock setting is only honored in 2.6.35+ kernels;
 and not at all by the ext2 and ext3 file system drivers.
 .TP
+.BI reserved_inodes= number_of_reserved_inodes
+Set 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 requires full file system scan so it
+can take a long time.
 .B test_fs
 Set a flag in the filesystem superblock indicating that it may be
 mounted using experimental kernel code, such as the ext4dev filesystem.
diff --git a/misc/tune2fs.c b/misc/tune2fs.c
index d6bfad3374d1..d6e75fe00814 100644
--- a/misc/tune2fs.c
+++ b/misc/tune2fs.c
@@ -92,6 +92,7 @@ static char *features_cmd;
 static char *mntopts_cmd;
 static int stride, stripe_width;
 static int stride_set, stripe_width_set;
+static unsigned long new_first_ino;
 static char *extended_cmd;
 static unsigned long new_inode_size;
 static char *ext_mount_opts;
@@ -2298,6 +2299,34 @@ static int parse_extended_opts(ext2_filsys fs, const char *opts)
 				continue;
 			}
 			ext_mount_opts = strdup(arg);
+		} else if (!strcmp(token, "reserved_inodes")) {
+			if (!arg) {
+				r_usage++;
+				continue;
+			}
+			new_first_ino = 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... */
+			new_first_ino++;
+			if (new_first_ino < 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;
+			}
+			/*
+			 * Here should go further feature tests to disallow
+			 * admin to free used system inode
+			 */
 		} else
 			r_usage++;
 	}
@@ -2312,6 +2341,7 @@ static int parse_extended_opts(ext2_filsys fs, const char *opts)
 			"\tmount_opts=<extended default mount options>\n"
 			"\tstride=<RAID per-disk chunk size in blocks>\n"
 			"\tstripe_width=<RAID stride*data disks in blocks>\n"
+			"\treserved_inodes=<number of reserved inodes>\n"
 			"\ttest_fs\n"
 			"\t^test_fs\n"));
 		free(buf);
@@ -2986,6 +3016,75 @@ fs_update_journal_user(struct ext2_super_block *sb, __u8 old_uuid[UUID_SIZE])
 	return 0;
 }
 
+/* Zero range of inodes and mark them as free / used */
+static errcode_t zero_inodes_range(ext2_filsys fs, ext2_ino_t start,
+				   ext2_ino_t end, int inuse)
+{
+	char *inode;
+	int length = EXT2_INODE_SIZE(fs->super);
+	ext2_ino_t ino;
+	errcode_t retval;
+
+	retval = ext2fs_get_memzero(length, &inode);
+	if (retval)
+		return retval;
+
+	for (ino = start; ino <= end; ino++) {
+		ext2fs_inode_alloc_stats(fs, ino, inuse);
+		retval = ext2fs_write_inode_full(fs, ino,
+						 (struct ext2_inode *)inode,
+						 length);
+		if (retval)
+			break;
+	}
+	ext2fs_free_mem(inode);
+
+	return retval;
+}
+
+static errcode_t update_reserved_inodes(ext2_filsys fs)
+{
+	errcode_t retval = 0;
+	ext2fs_inode_bitmap imap;
+	ext2_ino_t ino, first_ino = fs->super->s_first_ino;
+
+	if (new_first_ino == first_ino)
+		return 0;
+
+	/* Group descriptors will need writing as well */
+	fs->flags &= ~EXT2_FLAG_SUPER_ONLY;
+
+	/* Freeing reserved inodes is easy */
+	if (new_first_ino < first_ino) {
+		retval = zero_inodes_range(fs, new_first_ino, first_ino - 1,
+					   -1);
+		if (retval)
+			return retval;
+		goto out;
+	}
+
+	retval = ext2fs_allocate_inode_bitmap(fs, "inodes to move", &imap);
+	if (retval)
+		return retval;
+
+	for (ino = fs->super->s_first_ino; ino < new_first_ino; ino++)
+		ext2fs_mark_inode_bitmap2(imap, ino);
+
+	retval = ext2fs_move_inodes(fs, imap);
+	ext2fs_free_inode_bitmap(imap);
+	if (retval)
+		return retval;
+
+	retval = zero_inodes_range(fs, first_ino, new_first_ino - 1, +1);
+	if (retval)
+		return retval;
+out:
+	fs->super->s_first_ino = new_first_ino;
+	ext2fs_mark_super_dirty(fs);
+
+	return 0;
+}
+
 int main(int argc, char **argv)
 {
 	errcode_t retval;
@@ -3404,6 +3503,9 @@ retry_open:
 	if (feature_64bit)
 		convert_64bit(&fs, feature_64bit);
 
+	if (new_first_ino)
+		update_reserved_inodes(fs);
+
 	if (rewrite_checksums)
 		rewrite_metadata_checksums(fs);
 
-- 
2.1.4


  parent reply	other threads:[~2015-08-07 10:51 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-08-07 10:51 [PATCH 00/19] e2fsprogs: Resizing rewrite Jan Kara
2015-08-07 10:51 ` [PATCH 01/19] ext2fs: Move function to initialize uninitialized bitmaps to libext2fs Jan Kara
2015-08-07 10:51 ` [PATCH 02/19] ext2fs: Use range marking function to mark all inode table blocks as used Jan Kara
2015-08-07 10:51 ` [PATCH 03/19] ext2fs: Add pointer to allocator private data into ext2_filsys Jan Kara
2015-08-07 10:51 ` [PATCH 04/19] ext2fs: Implement ext2fs_allocate_group_table2() Jan Kara
2015-08-07 10:51 ` [PATCH 05/19] resize2fs: Use ext2fs_allocate_group_table2() Jan Kara
2015-08-07 10:51 ` [PATCH 06/19] ext2fs: Make ext2fs_reserve_super_and_bgd() clear block_uninit flag Jan Kara
2015-08-07 10:51 ` [PATCH 07/19] ext2fs: Provide helper for wiping resize inode Jan Kara
2015-08-07 10:51 ` [PATCH 08/19] ext2fs: Implement block moving in libext2fs Jan Kara
2015-08-07 15:55   ` Darrick J. Wong
2015-08-26 15:55     ` Jan Kara
2015-08-07 10:51 ` [PATCH 09/19] ext2fs: Implement inode " Jan Kara
2015-08-07 10:51 ` [PATCH 10/19] tune2fs: Implement setting and disabling of 64-bit feature Jan Kara
2015-08-07 15:32   ` Darrick J. Wong
2015-08-07 15:42     ` Darrick J. Wong
2015-08-26 15:51       ` Jan Kara
2015-08-07 10:51 ` [PATCH 11/19] mke2fs: Allow specifying number of reserved inodes Jan Kara
2015-08-07 15:37   ` Darrick J. Wong
2015-08-26 15:49     ` Jan Kara
2015-08-07 10:51 ` [PATCH 12/19] libext2fs: Bump default number of reserved inodes to 64 Jan Kara
2015-08-07 10:58   ` Alexey Lyashkov
2015-08-07 11:03     ` Jan Kara
2015-08-07 18:11       ` Alexey Lyashkov
2015-08-07 19:11   ` Andreas Dilger
2015-08-26 15:58     ` Jan Kara
2015-08-07 10:51 ` Jan Kara [this message]
2015-08-07 18:58   ` [PATCH 13/19] tune2fs: Add support for changing number of reserved inodes Andreas Dilger
2015-08-26 16:11     ` Jan Kara
2015-08-08  7:45   ` Alexey Lyashkov
2015-08-26 16:07     ` Jan Kara
2015-08-07 10:51 ` [PATCH 14/19] resize2fs: Rip out 64-bit feature handling from resize2fs Jan Kara
2015-08-07 10:51 ` [PATCH 15/19] resize2fs: Remove duplicit condition Jan Kara
2015-08-07 19:01   ` Andreas Dilger
2015-08-26 16:12     ` Jan Kara
2015-08-07 10:51 ` [PATCH 16/19] ext2fs: Add extent dumping function to extent mapping code Jan Kara
2015-08-07 10:51 ` [PATCH 17/19] resize2fs: Remove " Jan Kara
2015-08-07 10:51 ` [PATCH 18/19] ext2fs: Move extent mapping test Jan Kara
2015-08-07 10:51 ` [PATCH 19/19] resize2fs: Use libextfs2 helpers for resizing Jan Kara

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1438944689-24562-14-git-send-email-jack@suse.com \
    --to=jack@suse.com \
    --cc=darrick.wong@oracle.com \
    --cc=linux-ext4@vger.kernel.org \
    --cc=tytso@mit.edu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).