Pino Toscano
2016-Jan-28 17:29 UTC
[Libguestfs] [PATCH] inotify_add_watch: pass IN_ALL_EVENTS as mask for test
Instead of pass 0x3fffffff as mask value, pass a simplier 0xfff, which
is the value of the IN_ALL_EVENTS define. This will still catch all
the inotify events, and avoid a EINVAL error with Linux 4.4.
---
generator/actions.ml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/generator/actions.ml b/generator/actions.ml
index 0d227cf..24c6eb7 100644
--- a/generator/actions.ml
+++ b/generator/actions.ml
@@ -7274,7 +7274,7 @@ per libguestfs instance." };
InitScratchFS, Always, TestResult (
[["mkdir"; "/inotify_add_watch"];
["inotify_init"; "0"];
- ["inotify_add_watch"; "/inotify_add_watch";
"1073741823"];
+ ["inotify_add_watch"; "/inotify_add_watch";
"4095"];
["touch"; "/inotify_add_watch/a"];
["touch"; "/inotify_add_watch/b"];
["inotify_files"]],
--
2.5.0
Richard W.M. Jones
2016-Jan-28 19:21 UTC
Re: [Libguestfs] [PATCH] inotify_add_watch: pass IN_ALL_EVENTS as mask for test
On Thu, Jan 28, 2016 at 06:29:18PM +0100, Pino Toscano wrote:> Instead of pass 0x3fffffff as mask value, pass a simplier 0xfff, which > is the value of the IN_ALL_EVENTS define. This will still catch all > the inotify events, and avoid a EINVAL error with Linux 4.4. > --- > generator/actions.ml | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/generator/actions.ml b/generator/actions.ml > index 0d227cf..24c6eb7 100644 > --- a/generator/actions.ml > +++ b/generator/actions.ml > @@ -7274,7 +7274,7 @@ per libguestfs instance." }; > InitScratchFS, Always, TestResult ( > [["mkdir"; "/inotify_add_watch"]; > ["inotify_init"; "0"]; > - ["inotify_add_watch"; "/inotify_add_watch"; "1073741823"]; > + ["inotify_add_watch"; "/inotify_add_watch"; "4095"]; > ["touch"; "/inotify_add_watch/a"]; > ["touch"; "/inotify_add_watch/b"]; > ["inotify_files"]], > -- > 2.5.0ACK. Perhaps we should have all these inotify_* calls return -ENOTSUP since they are broken by design and can never have worked. Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com virt-df lists disk usage of guests without needing to install any software inside the virtual machine. Supports Linux and Windows. http://people.redhat.com/~rjones/virt-df/