This fixes the regression introduced with the patch
btrfs-progs: avoid write to the disk before sure to create fs
what happened with this patch is it missed the check to see if the
user has the option set before pushing the defaults.
Signed-off-by: Anand Jain <anand.jain@xxxxxxxxxx>
---
mkfs.c | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/mkfs.c b/mkfs.c
index ec717be..2156150 100644
--- a/mkfs.c
+++ b/mkfs.c
@@ -1359,17 +1359,13 @@ int main(int ac, char **av)
if (is_vol_small(file)) {
printf("SMALL VOLUME: forcing mixed metadata/data groups\n");
mixed = 1;
- if (metadata_profile != data_profile) {
- if (metadata_profile_opt || data_profile_opt) {
- fprintf(stderr,
- "With mixed block groups data and metadata profiles must be the same\n");
- exit(1);
- }
- }
}
+
/*
* Set default profiles according to number of added devices.
- * For mixed groups defaults are single/single.
+ * For mixed groups defaults are single/single
+ * however if metadata_profile_opt || data_profile_opt is set
+ * metadata_profile and data_profile must be same
*/
if (!mixed) {
if (!metadata_profile_opt) {
@@ -1387,8 +1383,13 @@ int main(int ac, char **av)
BTRFS_BLOCK_GROUP_RAID0 : 0; /* raid0 or single */
}
} else {
- metadata_profile = 0;
- data_profile = 0;
+ if (metadata_profile_opt || data_profile_opt) {
+ if (metadata_profile != data_profile) {
+ fprintf(stderr,
+ "With mixed block groups data and metadata profiles must be the same\n");
+ exit(1);
+ }
+ }
}
ret = test_num_disk_vs_raid(metadata_profile, data_profile,
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
