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

diff --git a/daemon/mount.c b/daemon/mount.c
index 250656a..ccace75 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, "/");
 
@@ -121,7 +121,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 +324,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;
 
@@ -380,7 +377,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 +402,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);