From fb4a6ed596f6a9f6b1c6d3d9307ef8259d988c04 Mon Sep 17 00:00:00 2001

From: Jan Kara <jack@suse.cz>

Date: Thu, 13 Feb 2020 11:16:02 +0100

Subject: [PATCH 06/46] tune2fs: update dir checksums when clearing dir_index

 feature

Content-Type: text/plain

When clearing dir_index feature while metadata_csum is enabled, we have

to rewrite checksums of all indexed directories to update checksums of

internal tree nodes.

Signed-off-by: Jan Kara <jack@suse.cz>

Signed-off-by: Theodore Ts'o <tytso@mit.edu>

Signed-off-by: Lukas Czerner <lczerner@redhat.com>

---

 misc/tune2fs.c | 143 ++++++++++++++++++++++++++++++++-----------------

 1 file changed, 95 insertions(+), 48 deletions(-)

diff --git a/misc/tune2fs.c b/misc/tune2fs.c

index 39cf8587..a7a779b8 100644

--- a/misc/tune2fs.c

+++ b/misc/tune2fs.c

@@ -504,7 +504,8 @@ struct rewrite_dir_context {

 	char *buf;

 	errcode_t errcode;

 	ext2_ino_t dir;

-	int is_htree;

+	int is_htree:1;

+	int clear_htree:1;

 };

 static int rewrite_dir_block(ext2_filsys fs,

@@ -523,8 +524,13 @@ static int rewrite_dir_block(ext2_filsys fs,

 	if (ctx->errcode)

 		return BLOCK_ABORT;

-	/* if htree node... */

-	if (ctx->is_htree)

+	/*

+	 * if htree node... Note that if we are clearing htree structures from

+	 * the directory, we treat the htree internal block as an ordinary leaf.

+	 * The code below will do the right thing and make space for checksum

+	 * there.

+	 */

+	if (ctx->is_htree && !ctx->clear_htree)

 		ext2fs_get_dx_countlimit(fs, (struct ext2_dir_entry *)ctx->buf,

 					 &dcl, &dcl_offset);

 	if (dcl) {

@@ -653,7 +659,8 @@ static errcode_t rewrite_directory(ext2_filsys fs, ext2_ino_t dir,

 	if (retval)

 		return retval;

-	ctx.is_htree = (inode->i_flags & EXT2_INDEX_FL);

+	ctx.is_htree = !!(inode->i_flags & EXT2_INDEX_FL);

+	ctx.clear_htree = !ext2fs_has_feature_dir_index(fs->super);

 	ctx.dir = dir;

 	ctx.errcode = 0;

 	retval = ext2fs_block_iterate3(fs, dir, BLOCK_FLAG_READ_ONLY |

@@ -664,6 +671,13 @@ static errcode_t rewrite_directory(ext2_filsys fs, ext2_ino_t dir,

 	if (retval)

 		return retval;

+	if (ctx.is_htree && ctx.clear_htree) {

+		inode->i_flags &= ~EXT2_INDEX_FL;

+		retval = ext2fs_write_inode(fs, dir, inode);

+		if (retval)

+			return retval;

+	}

+

 	return ctx.errcode;

 }

@@ -818,28 +832,67 @@ static void rewrite_one_inode(struct rewrite_context *ctx, ext2_ino_t ino,

 		fatal_err(retval, "while rewriting extended attribute");

 }

-/*

- * Forcibly set checksums in all inodes.

- */

-static void rewrite_inodes(ext2_filsys fs)

+#define REWRITE_EA_FL		0x01	/* Rewrite EA inodes */

+#define REWRITE_DIR_FL		0x02	/* Rewrite directories */

+#define REWRITE_NONDIR_FL	0x04	/* Rewrite other inodes */

+#define REWRITE_ALL (REWRITE_EA_FL | REWRITE_DIR_FL | REWRITE_NONDIR_FL)

+

+static void rewrite_inodes_pass(struct rewrite_context *ctx, unsigned int flags)

 {

 	ext2_inode_scan	scan;

 	errcode_t	retval;

 	ext2_ino_t	ino;

 	struct ext2_inode *inode;

-	int pass;

+	int rewrite;

+

+	retval = ext2fs_get_mem(ctx->inode_size, &inode;;

+	if (retval)

+		fatal_err(retval, "while allocating memory");

+

+	retval = ext2fs_open_inode_scan(ctx->fs, 0, &scan;;

+	if (retval)

+		fatal_err(retval, "while opening inode scan");

+

+	do {

+		retval = ext2fs_get_next_inode_full(scan, &ino, inode,

+						    ctx->inode_size);

+		if (retval)

+			fatal_err(retval, "while getting next inode");

+		if (!ino)

+			break;

+

+		rewrite = 0;

+		if (inode->i_flags & EXT4_EA_INODE_FL) {

+			if (flags & REWRITE_EA_FL)

+				rewrite = 1;

+		} else if (LINUX_S_ISDIR(inode->i_mode)) {

+			if (flags & REWRITE_DIR_FL)

+				rewrite = 1;

+		} else {

+			if (flags & REWRITE_NONDIR_FL)

+				rewrite = 1;

+		}

+		if (rewrite)

+			rewrite_one_inode(ctx, ino, inode);

+	} while (ino);

+	ext2fs_close_inode_scan(scan);

+	ext2fs_free_mem(&inode;;

+}

+

+/*

+ * Forcibly rewrite checksums in inodes specified by 'flags'

+ */

+static void rewrite_inodes(ext2_filsys fs, unsigned int flags)

+{

 	struct rewrite_context ctx = {

 		.fs = fs,

 		.inode_size = EXT2_INODE_SIZE(fs->super),

 	};

+	errcode_t retval;

 	if (fs->super->s_creator_os == EXT2_OS_HURD)

 		return;

-	retval = ext2fs_get_mem(ctx.inode_size, &inode;;

-	if (retval)

-		fatal_err(retval, "while allocating memory");

-

 	retval = ext2fs_get_memzero(ctx.inode_size, &ctx.zero_inode);

 	if (retval)

 		fatal_err(retval, "while allocating memory");

@@ -858,39 +911,16 @@ static void rewrite_inodes(ext2_filsys fs)

 	 *

 	 * pass 2: go over other inodes to update their checksums.

 	 */

-	if (ext2fs_has_feature_ea_inode(fs->super))

-		pass = 1;

-	else

-		pass = 2;

-	for (;pass <= 2; pass++) {

-		retval = ext2fs_open_inode_scan(fs, 0, &scan;;

-		if (retval)

-			fatal_err(retval, "while opening inode scan");

-

-		do {

-			retval = ext2fs_get_next_inode_full(scan, &ino, inode,

-							    ctx.inode_size);

-			if (retval)

-				fatal_err(retval, "while getting next inode");

-			if (!ino)

-				break;

-

-			if (((pass == 1) &&

-			     (inode->i_flags & EXT4_EA_INODE_FL)) ||

-			    ((pass == 2) &&

-			     !(inode->i_flags & EXT4_EA_INODE_FL)))

-				rewrite_one_inode(&ctx, ino, inode);

-		} while (ino);

-

-		ext2fs_close_inode_scan(scan);

-	}

+	if (ext2fs_has_feature_ea_inode(fs->super) && (flags & REWRITE_EA_FL))

+		rewrite_inodes_pass(&ctx, REWRITE_EA_FL);

+	flags &= ~REWRITE_EA_FL;

+	rewrite_inodes_pass(&ctx, flags);

 	ext2fs_free_mem(&ctx.zero_inode);

 	ext2fs_free_mem(&ctx.ea_buf);

-	ext2fs_free_mem(&inode;;

 }

-static void rewrite_metadata_checksums(ext2_filsys fs)

+static void rewrite_metadata_checksums(ext2_filsys fs, unsigned int flags)

 {

 	errcode_t retval;

 	dgrp_t i;

@@ -902,7 +932,7 @@ static void rewrite_metadata_checksums(ext2_filsys fs)

 	retval = ext2fs_read_bitmaps(fs);

 	if (retval)

 		fatal_err(retval, "while reading bitmaps");

-	rewrite_inodes(fs);

+	rewrite_inodes(fs, flags);

 	ext2fs_mark_ib_dirty(fs);

 	ext2fs_mark_bb_dirty(fs);

 	ext2fs_mmp_update2(fs, 1);

@@ -1201,6 +1231,23 @@ mmp_error:

 			uuid_generate((unsigned char *) sb->s_hash_seed);

 	}

+	if (FEATURE_OFF(E2P_FEATURE_COMPAT, EXT2_FEATURE_COMPAT_DIR_INDEX) &&

+	    ext2fs_has_feature_metadata_csum(sb)) {

+		check_fsck_needed(fs,

+			_("Disabling directory index on filesystem with "

+			  "checksums could take some time."));

+		if (mount_flags & EXT2_MF_MOUNTED) {

+			fputs(_("Cannot disable dir_index on a mounted "

+				"filesystem!\n"), stderr);

+			exit(1);

+		}

+		/*

+		 * Clearing dir_index on checksummed filesystem requires

+		 * rewriting all directories to update checksums.

+		 */

+		rewrite_checksums |= REWRITE_DIR_FL;

+	}

+

 	if (FEATURE_OFF(E2P_FEATURE_INCOMPAT, EXT4_FEATURE_INCOMPAT_FLEX_BG)) {

 		if (ext2fs_check_desc(fs)) {

 			fputs(_("Clearing the flex_bg flag would "

@@ -1244,7 +1291,7 @@ mmp_error:

 				 "The larger fields afforded by this feature "

 				 "enable full-strength checksumming.  "

 				 "Run resize2fs -b to rectify.\n"));

-		rewrite_checksums = 1;

+		rewrite_checksums = REWRITE_ALL;

 		/* metadata_csum supersedes uninit_bg */

 		ext2fs_clear_feature_gdt_csum(fs->super);

@@ -1272,7 +1319,7 @@ mmp_error:

 				"filesystem!\n"), stderr);

 			exit(1);

 		}

-		rewrite_checksums = 1;

+		rewrite_checksums = REWRITE_ALL;

 		/* Enable uninit_bg unless the user expressly turned it off */

 		memcpy(test_features, old_features, sizeof(test_features));

@@ -1454,7 +1501,7 @@ mmp_error:

 			}

 			check_fsck_needed(fs, _("Recalculating checksums "

 						"could take some time."));

-			rewrite_checksums = 1;

+			rewrite_checksums = REWRITE_ALL;

 		}

 	}

@@ -3191,7 +3238,7 @@ _("Warning: The journal is dirty. You may wish to replay the journal like:\n\n"

 			check_fsck_needed(fs,

 				_("Setting the UUID on this "

 				  "filesystem could take some time."));

-			rewrite_checksums = 1;

+			rewrite_checksums = REWRITE_ALL;

 		}

 		if (ext2fs_has_group_desc_csum(fs)) {

@@ -3302,7 +3349,7 @@ _("Warning: The journal is dirty. You may wish to replay the journal like:\n\n"

 		if (retval == 0) {

 			printf(_("Setting inode size %lu\n"),

 							new_inode_size);

-			rewrite_checksums = 1;

+			rewrite_checksums = REWRITE_ALL;

 		} else {

 			printf("%s", _("Failed to change inode size\n"));

 			rc = 1;

@@ -3311,7 +3358,7 @@ _("Warning: The journal is dirty. You may wish to replay the journal like:\n\n"

 	}

 	if (rewrite_checksums)

-		rewrite_metadata_checksums(fs);

+		rewrite_metadata_checksums(fs, rewrite_checksums);

 	if (l_flag)

 		list_super(sb);

-- 

2.35.1