LU-4223 utils: fixing loop leaking in utils

[fs/lustre-release.git] / lustre / utils / mkfs_lustre.c

diff --git a/lustre/utils/mkfs_lustre.c b/lustre/utils/mkfs_lustre.c
index ec85e08..49eb00a 100644 (file)
--- 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[])
 {
 
 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;
        unsigned mount_type;

-        int ret = 0;
+       int ret = 0;
+       int ret2 = 0;

 
         if ((progname = strrchr(argv[0], '/')) != NULL)
                 progname++;
 
         if ((progname = strrchr(argv[0], '/')) != NULL)
                 progname++;


@@ -802,8 +803,10 @@ int main(int argc, char *const argv[])
         }
 
 out:
         }
 
 out:

-        loop_cleanup(&mop);

        osd_fini();
        osd_fini();

+       ret2 = loop_cleanup(&mop);
+       if (ret == 0)
+               ret = ret2;

 
         /* Fix any crazy return values from system() */
         if (ret && ((ret & 255) == 0))
 
         /* Fix any crazy return values from system() */
         if (ret && ((ret & 255) == 0))