|
 |
feb2d6 |
commit b33f8871a821b7f0461dec89f0066a9cb6aa1c71
|
|
|
feb2d6 |
Author: Andrew Price <anprice@redhat.com>
|
|
|
feb2d6 |
Date: Wed May 27 12:31:58 2020 +0100
|
|
|
feb2d6 |
|
|
|
feb2d6 |
mkfs.gfs2: Don't use i/o limits hints <4K for block size
|
|
|
feb2d6 |
|
|
|
feb2d6 |
Some devices report an optimal_io_size less than 4K. Currently mkfs.gfs2
|
|
|
feb2d6 |
uses the non-zero value to choose the block size, which is almost
|
|
|
feb2d6 |
certainly a bad choice when it's less than 4K. Update choose_blocksize()
|
|
|
feb2d6 |
to avoid using device topology hints for the block size choice when
|
|
|
feb2d6 |
they're less than the default block size (4K). Test case included.
|
|
|
feb2d6 |
|
|
|
feb2d6 |
Resolves: rhbz#1839219
|
|
|
feb2d6 |
Signed-off-by: Andrew Price <anprice@redhat.com>
|
|
|
feb2d6 |
|
|
|
feb2d6 |
diff --git a/gfs2/mkfs/main_mkfs.c b/gfs2/mkfs/main_mkfs.c
|
|
|
feb2d6 |
index 846b341f..412d4701 100644
|
|
|
feb2d6 |
--- a/gfs2/mkfs/main_mkfs.c
|
|
|
feb2d6 |
+++ b/gfs2/mkfs/main_mkfs.c
|
|
|
feb2d6 |
@@ -505,7 +505,7 @@ static unsigned choose_blocksize(struct mkfs_opts *opts)
|
|
|
feb2d6 |
}
|
|
|
feb2d6 |
if (!opts->got_bsize && got_topol) {
|
|
|
feb2d6 |
if (dev->optimal_io_size <= getpagesize() &&
|
|
|
feb2d6 |
- dev->optimal_io_size >= dev->minimum_io_size)
|
|
|
feb2d6 |
+ dev->optimal_io_size >= GFS2_DEFAULT_BSIZE)
|
|
|
feb2d6 |
bsize = dev->optimal_io_size;
|
|
|
feb2d6 |
else if (dev->physical_sector_size <= getpagesize() &&
|
|
|
feb2d6 |
dev->physical_sector_size >= GFS2_DEFAULT_BSIZE)
|
|
|
feb2d6 |
diff --git a/tests/mkfs.at b/tests/mkfs.at
|
|
|
feb2d6 |
index 57785a0d..4c8b2249 100644
|
|
|
feb2d6 |
--- a/tests/mkfs.at
|
|
|
feb2d6 |
+++ b/tests/mkfs.at
|
|
|
feb2d6 |
@@ -112,6 +112,8 @@ AT_CLEANUP
|
|
|
feb2d6 |
AT_SETUP([Device i/o limits handling])
|
|
|
feb2d6 |
AT_KEYWORDS(mkfs.gfs2 mkfs)
|
|
|
feb2d6 |
AT_CHECK([$GFS_MKFS -p lock_nolock -o test_topology=0:0:0:0:0 $GFS_TGT], 0, [ignore], [ignore])
|
|
|
feb2d6 |
+AT_CHECK([$GFS_MKFS -p lock_nolock -o test_topology=0:512:512:512:512 $GFS_TGT], 0, [ignore], [ignore])
|
|
|
feb2d6 |
+AT_CHECK([gfs2_edit -p sb field sb_bsize $GFS_TGT | tr -d '\n' ], 0, [4096], [ignore])
|
|
|
feb2d6 |
AT_CHECK([$GFS_MKFS -p lock_nolock -o test_topology=7168:512:0:33553920:512 $GFS_TGT], 0, [ignore], [ignore])
|
|
|
feb2d6 |
AT_CHECK([$GFS_MKFS -p lock_nolock -o test_topology=7168:512:8192:33553920:512 $GFS_TGT], 0, [ignore], [Warning: device is not properly aligned. This may harm performance.
|
|
|
feb2d6 |
])
|