linux-ext4.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] resize2fs: clear uninit BG if allocating from new group
@ 2015-09-17 22:42 Eric Sandeen
  2015-09-17 23:55 ` Darrick J. Wong
                   ` (2 more replies)
  0 siblings, 3 replies; 15+ messages in thread
From: Eric Sandeen @ 2015-09-17 22:42 UTC (permalink / raw)
  To: linux-ext4

If resize2fs_get_alloc_block() allocates from a BLOCK_UNINIT
group, nothing clears the UNINIT flag, so it is skipped when we
go to write out modified bitmaps.  This leads to post-resize2fs
e2fsck errors; used blocks in UNINIT groups, not marked in the
block bitmap.

This shamelessly cuts & pastes clear_block_uninit() into
resize2fs.c, and my problem goes away.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
---

I've kind of lost the thread on resize2fs lately, so maybe this is
a hack job?  At least it highlights the issue, even if it's not
quite right.  Passes "make check" here and seems ok to me...

Thanks,
-Eric

diff --git a/resize/resize2fs.c b/resize/resize2fs.c
index 07c6a0c..0f202bd 100644
--- a/resize/resize2fs.c
+++ b/resize/resize2fs.c
@@ -1614,12 +1614,27 @@ static blk64_t get_new_block(ext2_resize_t rfs)
 	}
 }
 
+static void clear_block_uninit(ext2_filsys fs, dgrp_t group)
+{
+	if (!ext2fs_has_group_desc_csum(fs) ||
+	    !(ext2fs_bg_flags_test(fs, group, EXT2_BG_BLOCK_UNINIT)))
+		return;
+
+	/* uninit block bitmaps are now initialized in read_bitmaps() */
+
+	ext2fs_bg_flags_clear(fs, group, EXT2_BG_BLOCK_UNINIT);
+	ext2fs_group_desc_csum_set(fs, group);
+	ext2fs_mark_super_dirty(fs);
+	ext2fs_mark_bb_dirty(fs);
+}
+
 static errcode_t resize2fs_get_alloc_block(ext2_filsys fs,
 					   blk64_t goal EXT2FS_ATTR((unused)),
 					   blk64_t *ret)
 {
 	ext2_resize_t rfs = (ext2_resize_t) fs->priv_data;
 	blk64_t blk;
+	int group;
 
 	blk = get_new_block(rfs);
 	if (!blk)
@@ -1632,6 +1647,12 @@ static errcode_t resize2fs_get_alloc_block(ext2_filsys fs,
 
 	ext2fs_mark_block_bitmap2(rfs->old_fs->block_map, blk);
 	ext2fs_mark_block_bitmap2(rfs->new_fs->block_map, blk);
+
+	group = ext2fs_group_of_blk2(rfs->old_fs, blk);
+	clear_block_uninit(rfs->old_fs, group);
+	group = ext2fs_group_of_blk2(rfs->new_fs, blk);
+	clear_block_uninit(rfs->new_fs, group);
+
 	*ret = (blk64_t) blk;
 	return 0;
 }


^ permalink raw reply related	[flat|nested] 15+ messages in thread

end of thread, other threads:[~2016-03-07  2:51 UTC | newest]

Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-17 22:42 [PATCH] resize2fs: clear uninit BG if allocating from new group Eric Sandeen
2015-09-17 23:55 ` Darrick J. Wong
2015-09-18  0:54   ` Eric Sandeen
2015-09-18  3:19     ` Eric Sandeen
2016-01-14 14:09 ` Eric Sandeen
2016-01-14 17:20   ` Andreas Dilger
2016-01-14 18:46 ` [PATCH V2] " Eric Sandeen
2016-01-14 18:50   ` Darrick J. Wong
2016-01-14 19:26     ` Eric Sandeen
2016-01-14 19:27   ` [PATCH V3] " Eric Sandeen
2016-01-14 19:38     ` Darrick J. Wong
2016-01-14 19:39     ` Andreas Dilger
2016-01-14 19:57     ` Eric Sandeen
2016-02-19 22:21     ` Eric Sandeen
2016-03-07  2:51     ` Theodore Ts'o

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).