summaryrefslogtreecommitdiffstats
path: root/daemon/inotify.c
diff options
context:
space:
mode:
authorRichard Jones <rjones@redhat.com>2010-04-17 14:25:55 +0100
committerRichard Jones <rjones@redhat.com>2010-04-17 15:22:29 +0100
commit5922d7084d6b43f0a1a15b664c7082dfeaf584d0 (patch)
tree465894bcdc5286627c25df62adcbd75a10125e96 /daemon/inotify.c
parent68467cb1c2f8b1cc7844ed6512b7f76ef2aba1d1 (diff)
downloadlibguestfs-5922d7084d6b43f0a1a15b664c7082dfeaf584d0.tar.gz
libguestfs-5922d7084d6b43f0a1a15b664c7082dfeaf584d0.tar.xz
libguestfs-5922d7084d6b43f0a1a15b664c7082dfeaf584d0.zip
Fix upload losing synchronization if root not mounted (RHBZ#576879).
Modify the generator so that it can correctly handle early cancellation for Pathname|Device|.. parameters. This fixes the upload command, but consequently we need to fix the parameters for tar_in and t?z_in commands. This should also mean that 'win:' can now be used as the second argument of tar_in and t?z_in commands in guestfish, whereas previously this wouldn't have worked. Adds a regression test for the original problem.
Diffstat (limited to 'daemon/inotify.c')
-rw-r--r--daemon/inotify.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/daemon/inotify.c b/daemon/inotify.c
index ec3aa64f..104fa60b 100644
--- a/daemon/inotify.c
+++ b/daemon/inotify.c
@@ -70,7 +70,7 @@ do_inotify_init (int max_events)
#ifdef HAVE_SYS_INOTIFY_H
FILE *fp;
- NEED_ROOT (return -1);
+ NEED_ROOT (, return -1);
if (max_events < 0) {
reply_with_error ("max_events < 0");