marko10_000
/
btrfs-progs
forked from Mirrors/btrfs-progs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

btrfs-progs: mkfs: fix overwritten return value for mkfs 

For mkfs failure, especially --rootdir errors like EPERM/ENOSPC, the out
branch will overwrite the return value, causing wrong status code.

Signed-off-by: Qu Wenruo <wqu@suse.com>
Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
master
Qu Wenruo 2017-10-19 13:41:35 +08:00 committed by David Sterba
parent a00bfc200c
commit 625223903e
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mkfs/main.c
View File

@ -1426,6 +1426,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;
@ -1941,9 +1942,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) {