No need to use complex logic for iter devs in mkfs.c,
as backup optind, increase/decrease optind and reset dev_cnt.
A simple for() loop is enough for above request.
Signed-off-by: Zhao Lei <zhaolei@xxxxxxxxxxxxxx>
---
mkfs.c | 25 +++++++------------------
1 file changed, 7 insertions(+), 18 deletions(-)
diff --git a/mkfs.c b/mkfs.c
index 7fa7cfc..cdae94d 100644
--- a/mkfs.c
+++ b/mkfs.c
@@ -1354,7 +1354,6 @@ int main(int ac, char **av)
u64 size_of_data = 0;
u64 source_dir_size = 0;
int dev_cnt = 0;
- int saved_optind;
char fs_uuid[BTRFS_UUID_UNPARSED_SIZE] = { 0 };
u64 features = BTRFS_MKFS_DEFAULT_FEATURES;
struct mkfs_allocation allocation = { 0 };
@@ -1467,7 +1466,6 @@ int main(int ac, char **av)
}
sectorsize = max(sectorsize, (u32)sysconf(_SC_PAGESIZE));
- saved_optind = optind;
dev_cnt = ac - optind;
if (dev_cnt == 0)
print_usage(1);
@@ -1490,18 +1488,15 @@ int main(int ac, char **av)
exit(1);
}
}
-
- while (dev_cnt-- > 0) {
- file = av[optind++];
+
+ for (i = optind; i < optind + dev_cnt; i++) {
+ file = av[i];
if (is_block_device(file) == 1)
if (test_dev_for_mkfs(file, force_overwrite))
exit(1);
}
- optind = saved_optind;
- dev_cnt = ac - optind;
-
- file = av[optind++];
+ file = av[optind];
ssd = is_ssd(file);
if (is_vol_small(file) || mixed) {
@@ -1557,7 +1552,7 @@ int main(int ac, char **av)
btrfs_min_dev_size(nodesize));
exit(1);
}
- for (i = saved_optind; i < saved_optind + dev_cnt; i++) {
+ for (i = optind; i < optind + dev_cnt; i++) {
char *path;
path = av[i];
@@ -1588,8 +1583,6 @@ int main(int ac, char **av)
printf("See %s for more information.\n\n", PACKAGE_URL);
}
- dev_cnt--;
-
if (!source_dir_set) {
/*
* open without O_EXCL so that the problem should not
@@ -1720,13 +1713,10 @@ int main(int ac, char **av)
if (is_block_device(file) == 1)
btrfs_register_one_device(file);
- if (dev_cnt == 0)
- goto raid_groups;
-
- while (dev_cnt-- > 0) {
+ for (i = optind + 1; i < optind + dev_cnt; i++) {
int old_mixed = mixed;
- file = av[optind++];
+ file = av[i];
/*
* open without O_EXCL so that the problem should not
@@ -1771,7 +1761,6 @@ int main(int ac, char **av)
btrfs_register_one_device(file);
}
-raid_groups:
if (!source_dir_set) {
ret = create_raid_groups(trans, root, data_profile,
metadata_profile, mixed, &allocation);
--
1.8.5.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
