Blame SOURCES/e2fsprogs-1.43.6-libext2fs-skip-start_blk-adjustment-when-stride-and-.patch

0ef434
From 086d0f865d08ec8f723ef6a7feeb8ec8d9f3e9b5 Mon Sep 17 00:00:00 2001
0ef434
From: Lukas Czerner <lczerner@redhat.com>
0ef434
Date: Sat, 14 Oct 2017 10:42:30 -0400
0ef434
Subject: [PATCH] libext2fs: skip start_blk adjustment when stride and flex_bg
0ef434
 is set
0ef434
0ef434
Currently some stride optimization is done in
0ef434
ext2fs_allocate_group_table() by adjusting start_blk block where we
0ef434
start allocating block, or inode bitmaps.
0ef434
0ef434
However in flex_bg case this is currently useless since the values are
0ef434
going to be overridden anyway. Moreover in flex_bg case the group might
0ef434
already be full and the stride optimization will fail. As a result file
0ef434
system resize might fail needlessly in some situations.
0ef434
0ef434
It can be shown by this example:
0ef434
0ef434
mke2fs -b 1024 -i 1024 -E stride=8192 -t ext4 /dev/loop0 1024000
0ef434
resize2fs /dev/loop0 102400000
0ef434
resize2fs 1.43.5 (04-Aug-2017)
0ef434
Resizing the filesystem on /dev/loop0 to 102400000 (1k) blocks.
0ef434
./resize/resize2fs: Could not allocate block in ext2 filesystem while trying to resize /dev/loop0
0ef434
Please run 'e2fsck -fy /dev/loop0' to fix the filesystem
0ef434
after the aborted resize operation.
0ef434
0ef434
Fix this by not doing the stride adjustment in case of flex_bg.
0ef434
0ef434
Signed-off-by: Lukas Czerner <lczerner@redhat.com>
0ef434
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
0ef434
---
0ef434
 lib/ext2fs/alloc_tables.c | 2 +-
0ef434
 1 file changed, 1 insertion(+), 1 deletion(-)
0ef434
0ef434
diff --git a/lib/ext2fs/alloc_tables.c b/lib/ext2fs/alloc_tables.c
0ef434
index 9f3d4e0..dd6015e 100644
0ef434
--- a/lib/ext2fs/alloc_tables.c
0ef434
+++ b/lib/ext2fs/alloc_tables.c
0ef434
@@ -108,7 +108,7 @@ errcode_t ext2fs_allocate_group_table(ext2_filsys fs, dgrp_t group,
0ef434
 	/*
0ef434
 	 * Allocate the block and inode bitmaps, if necessary
0ef434
 	 */
0ef434
-	if (fs->stride) {
0ef434
+	if (fs->stride && !flexbg_size) {
0ef434
 		retval = ext2fs_get_free_blocks2(fs, group_blk, last_blk,
0ef434
 						 1, bmap, &start_blk);
0ef434
 		if (retval)
0ef434
-- 
0ef434
2.7.5
0ef434