X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2Fmount.c;h=4f6068232b093ba6aa438ab1cba81f4520a989fa;hb=6bda071b5cd8393b37653687027c4ae6c6cf3804;hp=6c30304e537669bba7df9a54b5c12803608967a9;hpb=1997858e90da728287ef26a6d01a5766ac914312;p=libguestfs.git

diff --git a/daemon/mount.c b/daemon/mount.c
index 6c30304..4f60682 100644
--- a/daemon/mount.c
+++ b/daemon/mount.c
@@ -48,8 +48,6 @@ do_mount_vfs (char *options, char *vfstype,
   char *mp;
   char *error;
 
-  RESOLVE_DEVICE (device, return -1);
-
   is_root = strcmp (mountpoint, "/") == 0;
 
   if (!root_mounted && !is_root) {
@@ -319,8 +317,8 @@ do_mount_loop (char *file, char *mountpoint)
   char *buf, *mp;
   char *error;
 
-  NEED_ROOT (-1);
-  ABS_PATH (file, -1);
+  NEED_ROOT (return -1);
+  ABS_PATH (file, return -1);
 
   /* We have to prefix /sysroot on both the filename and the mountpoint. */
   mp = sysroot_path (mountpoint);
@@ -357,8 +355,8 @@ do_mkmountpoint (char *path)
 {
   int r;
 
-  /* NEED_ROOT (-1); - we don't want this test for this call. */
-  ABS_PATH (path, -1);
+  /* NEED_ROOT (return -1); - we don't want this test for this call. */
+  ABS_PATH (path, return -1);
 
   CHROOT_IN;
   r = mkdir (path, 0777);
@@ -382,8 +380,8 @@ do_rmmountpoint (char *path)
 {
   int r;
 
-  NEED_ROOT (-1);
-  ABS_PATH (path, -1);
+  NEED_ROOT (return -1);
+  ABS_PATH (path, return -1);
 
   CHROOT_IN;
   r = rmdir (path);