X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Futils%2Fmkfs_lustre.c;h=49eb00a76b9fd686999d17e43a39488ad57d8719;hp=ec85e08293297b614b8ae7adab94c10bbb1aef62;hb=98ac0fe3a45dde62759ecaa4c84e6250ac2067f8;hpb=9761d5c52aeef31a8c3112c3fb3ec9e24b37c800

diff --git a/lustre/utils/mkfs_lustre.c b/lustre/utils/mkfs_lustre.c
index ec85e08..49eb00a 100644
--- a/lustre/utils/mkfs_lustre.c
+++ b/lustre/utils/mkfs_lustre.c
@@ -540,13 +540,14 @@ int parse_opts(int argc, char *const argv[], struct mkfs_opts *mop,
 
 int main(int argc, char *const argv[])
 {
-        struct mkfs_opts mop;
-        struct lustre_disk_data *ldd;
-        char *mountopts = NULL;
-        char always_mountopts[512] = "";
-        char default_mountopts[512] = "";
+	struct mkfs_opts mop;
+	struct lustre_disk_data *ldd;
+	char *mountopts = NULL;
+	char always_mountopts[512] = "";
+	char default_mountopts[512] = "";
 	unsigned mount_type;
-        int ret = 0;
+	int ret = 0;
+	int ret2 = 0;
 
         if ((progname = strrchr(argv[0], '/')) != NULL)
                 progname++;
@@ -802,8 +803,10 @@ int main(int argc, char *const argv[])
         }
 
 out:
-        loop_cleanup(&mop);
 	osd_fini();
+	ret2 = loop_cleanup(&mop);
+	if (ret == 0)
+		ret = ret2;
 
         /* Fix any crazy return values from system() */
         if (ret && ((ret & 255) == 0))