| Message ID | 20170918072139.6300-14-quwenruo.btrfs@gmx.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
diff --git a/mkfs/main.c b/mkfs/main.c index f78c24ce..caa5c2e2 100644 --- a/mkfs/main.c +++ b/mkfs/main.c @@ -1339,6 +1339,7 @@ int main(int argc, char **argv) int zero_end = 1; int fd = -1; int ret; + int close_ret; int i; int mixed = 0; int nodesize_forced = 0; @@ -1814,9 +1815,9 @@ raid_groups: */ fs_info->finalize_on_close = 1; out: - ret = close_ctree(root); + close_ret = close_ctree(root); - if (!ret) { + if (!close_ret) { optind = saved_optind; dev_cnt = argc - optind; while (dev_cnt-- > 0) {
For mkfs failure, especially --rootdir errors like EPERM/ENOSPC, the out branch will overwrite return value, causing wrong status code. Fix it so it can pass incoming test cases. Signed-off-by: Qu Wenruo <quwenruo.btrfs@gmx.com> --- mkfs/main.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)