Remove tmp loopdev created by 'kpartx -l' if no partitions were found
authorBenjamin Marzinski <bmarzins@sourceware.org>
Sat, 9 Apr 2011 08:03:22 +0000 (10:03 +0200)
committerChristophe Varoqui <christophe.varoqui@opensvc.com>
Sat, 9 Apr 2011 08:03:22 +0000 (10:03 +0200)
kpartx/kpartx.c

index f518aa0..2052b1a 100644 (file)
@@ -186,7 +186,8 @@ get_hotplug_device(void)
 
 int
 main(int argc, char **argv){
 
 int
 main(int argc, char **argv){
-       int fd, i, j, m, n, op, off, arg, c, d, ro=0;
+       int i, j, m, n, op, off, arg, c, d, ro=0;
+        int fd = -1;
        struct slice all;
        struct pt *ptp;
        enum action what = LIST;
        struct slice all;
        struct pt *ptp;
        enum action what = LIST;
@@ -354,8 +355,10 @@ main(int argc, char **argv){
                        printf("%s: %d slices\n", ptp->type, n);
 #endif
 
                        printf("%s: %d slices\n", ptp->type, n);
 #endif
 
-               if (n > 0)
+               if (n > 0) {
                        close(fd);
                        close(fd);
+                       fd = -1;
+               }
                else
                        continue;
 
                else
                        continue;
 
@@ -403,15 +406,6 @@ main(int argc, char **argv){
                                        break;
                        }
 
                                        break;
                        }
 
-                       if (loopcreated && S_ISREG (buf.st_mode)) {
-                               if (del_loop(device)) {
-                                       if (verbose)
-                                               printf("can't del loop : %s\n",
-                                                       device);
-                                       exit(1);
-                               }
-                               printf("loop deleted : %s\n", device);
-                       }
                        break;
 
                case DELETE:
                        break;
 
                case DELETE:
@@ -572,6 +566,17 @@ main(int argc, char **argv){
                if (n > 0)
                        break;
        }
                if (n > 0)
                        break;
        }
+       if (what == LIST && loopcreated && S_ISREG (buf.st_mode)) {
+               if (fd != -1)
+                       close(fd);
+               if (del_loop(device)) {
+                       if (verbose)
+                               printf("can't del loop : %s\n",
+                                       device);
+                       exit(1);
+               }
+               printf("loop deleted : %s\n", device);
+       }
        dm_udev_wait(cookie);
        dm_lib_release();
        dm_lib_exit();
        dm_udev_wait(cookie);
        dm_lib_release();
        dm_lib_exit();