43 lines
1.4 KiB
Diff
43 lines
1.4 KiB
Diff
From 59cf967983f6aaff4ce33a50135ae57032ebd8f2 Mon Sep 17 00:00:00 2001
|
|
From: Allison Collins <allison.henderson@oracle.com>
|
|
Date: Wed, 10 Jul 2019 11:38:04 -0400
|
|
Subject: [PATCH] xfsprogs: Fix uninitialized cfg->lsunit
|
|
|
|
While investigating another mkfs bug, noticed that cfg->lsunit is sometimes
|
|
left uninitialized when it should not. This is because calc_stripe_factors
|
|
in some cases needs cfg->loginternal to be set first. This is done in
|
|
validate_logdev. So move calc_stripe_factors below validate_logdev while
|
|
parsing configs.
|
|
|
|
Signed-off-by: Allison Collins <allison.henderson@oracle.com>
|
|
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
|
|
Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com>
|
|
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
|
|
---
|
|
mkfs/xfs_mkfs.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/mkfs/xfs_mkfs.c b/mkfs/xfs_mkfs.c
|
|
index 79377b12..65cf1e0f 100644
|
|
--- a/mkfs/xfs_mkfs.c
|
|
+++ b/mkfs/xfs_mkfs.c
|
|
@@ -4007,7 +4007,6 @@ main(
|
|
cfg.rtblocks = calc_dev_size(cli.rtsize, &cfg, &ropts, R_SIZE, "rt");
|
|
|
|
validate_rtextsize(&cfg, &cli, &ft);
|
|
- calc_stripe_factors(&cfg, &cli, &ft);
|
|
|
|
/*
|
|
* Open and validate the device configurations
|
|
@@ -4017,6 +4016,7 @@ main(
|
|
validate_datadev(&cfg, &cli);
|
|
validate_logdev(&cfg, &cli, &logfile);
|
|
validate_rtdev(&cfg, &cli, &rtfile);
|
|
+ calc_stripe_factors(&cfg, &cli, &ft);
|
|
|
|
/*
|
|
* At this point when know exactly what size all the devices are,
|
|
--
|
|
2.17.0
|
|
|