X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2Fmount.c;h=128b05b066330e2b4441be26a5f663ff03a3812f;hb=913d5cd3a950a35f19581262250f58a871689d8c;hp=250656a5e1d1e1803bd6c22b2f65aa9758773a30;hpb=ad2abf89c364d5ec73fb12af63b053637d99d757;p=libguestfs.git

diff --git a/daemon/mount.c b/daemon/mount.c
index 250656a..128b05b 100644
--- a/daemon/mount.c
+++ b/daemon/mount.c
@@ -48,7 +48,7 @@ do_mount_vfs (const char *options, const char *vfstype,
   char *mp;
   char *error;
 
-  ABS_PATH (mountpoint, 0, return -1);
+  ABS_PATH (mountpoint, , return -1);
 
   is_root = STREQ (mountpoint, "/");
 
@@ -79,6 +79,7 @@ do_mount_vfs (const char *options, const char *vfstype,
   if (is_root)
     root_mounted = 1;
 
+  free (error);
   return 0;
 }
 
@@ -121,7 +122,7 @@ do_umount (const char *pathordevice)
   }
 
   if (is_dev)
-    RESOLVE_DEVICE (buf, 0, { free (buf); return -1; });
+    RESOLVE_DEVICE (buf, , { free (buf); return -1; });
 
   r = command (NULL, &err, "umount", buf, NULL);
   free (buf);
@@ -324,9 +325,6 @@ do_umount_all (void)
 
   free_stringslen (mounts, size);
 
-  /* Without this, lvm_remove_all was failing on Ubuntu. */
-  udev_settle ();
-
   /* We've unmounted root now, so ... */
   root_mounted = 0;
 
@@ -352,7 +350,7 @@ do_mount_loop (const char *file, const char *mountpoint)
   }
 
   buf = sysroot_path (file);
-  if (!file) {
+  if (!buf) {
     reply_with_perror ("malloc");
     free (mp);
     return -1;
@@ -367,6 +365,7 @@ do_mount_loop (const char *file, const char *mountpoint)
     return -1;
   }
 
+  free (error);
   return 0;
 }
 
@@ -380,7 +379,7 @@ do_mkmountpoint (const char *path)
   int r;
 
   /* NEED_ROOT (return -1); - we don't want this test for this call. */
-  ABS_PATH (path, 0, return -1);
+  ABS_PATH (path, , return -1);
 
   CHROOT_IN;
   r = mkdir (path, 0777);
@@ -405,7 +404,7 @@ do_rmmountpoint (const char *path)
   int r;
 
   /* NEED_ROOT (return -1); - we don't want this test for this call. */
-  ABS_PATH (path, 0, return -1);
+  ABS_PATH (path, , return -1);
 
   CHROOT_IN;
   r = rmdir (path);