|
 |
f605a3 |
commit ae565c82568a8b8068c225d8534c68c9989ccbe3
|
|
|
87834d |
Author: Andrew Price <anprice@redhat.com>
|
|
|
87834d |
Date: Tue Mar 28 21:32:42 2017 +0100
|
|
|
87834d |
|
|
|
87834d |
gfs2_grow: Disable rgrp alignment when dev topology is unsuitable
|
|
|
87834d |
|
|
|
87834d |
If optimal_io_size is not a multiple of minimum_io_size then the values
|
|
|
87834d |
are not reliable swidth and sunit values, so disable rgrp stripe
|
|
|
87834d |
alignment in that case.
|
|
|
87834d |
|
|
|
f605a3 |
Resolves: rhbz#1436772
|
|
|
87834d |
|
|
|
87834d |
Signed-off-by: Andrew Price <anprice@redhat.com>
|
|
|
87834d |
|
|
|
87834d |
diff --git a/gfs2/mkfs/main_grow.c b/gfs2/mkfs/main_grow.c
|
|
|
87834d |
index 173466c..66ba057 100644
|
|
|
87834d |
--- a/gfs2/mkfs/main_grow.c
|
|
|
87834d |
+++ b/gfs2/mkfs/main_grow.c
|
|
|
87834d |
@@ -169,8 +169,12 @@ static lgfs2_rgrps_t rgrps_init(struct gfs2_sbd *sdp)
|
|
|
87834d |
unsigned long min_io_sz = blkid_topology_get_minimum_io_size(tp);
|
|
|
87834d |
unsigned long opt_io_sz = blkid_topology_get_optimal_io_size(tp);
|
|
|
87834d |
unsigned long phy_sector_sz = blkid_topology_get_physical_sector_size(tp);
|
|
|
87834d |
+ /* If optimal_io_size is not a multiple of minimum_io_size then
|
|
|
87834d |
+ the values are not reliable swidth and sunit values, so don't
|
|
|
87834d |
+ attempt rgrp alignment */
|
|
|
87834d |
if ((min_io_sz > phy_sector_sz) &&
|
|
|
87834d |
- (opt_io_sz > phy_sector_sz)) {
|
|
|
87834d |
+ (opt_io_sz > phy_sector_sz) &&
|
|
|
87834d |
+ (opt_io_sz % min_io_sz == 0)) {
|
|
|
87834d |
al_base = opt_io_sz / sdp->bsize;
|
|
|
87834d |
al_off = min_io_sz / sdp->bsize;
|
|
|
87834d |
}
|