commit b5173119ff10c5538e92a7957a50887ae170b8da
author Robert Love <rml@novell.com> Tue Feb 07 12:58:45 2006 -0800
committer Linus Torvalds <torvalds@g5.osdl.org> Tue Feb 07 16:12:33 2006 -0800
tree 5b5af4e03e627b66a9f37d25dd370a145ec72438
parent 8e08b756869eeb08ace17ad64c2a8cb97b18e856

[PATCH] inotify: fix one-shot support

Fix one-shot support in inotify.  We currently drop the IN_ONESHOT flag
during watch addition.  Fix is to not do that.

Signed-off-by: Robert Love <rml@novell.com>
Cc: John McCutchan <ttb@tentacle.dhs.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

fs/inotify.c

diff --git a/fs/inotify.c b/fs/inotify.c
index 878ccca..3041503 100644
--- a/fs/inotify.c
+++ b/fs/inotify.c
@@ -967,7 +967,7 @@
 		mask_add = 1;
 
 	/* don't let user-space set invalid bits: we don't want flags set */
-	mask &= IN_ALL_EVENTS;
+	mask &= IN_ALL_EVENTS | IN_ONESHOT;
 	if (unlikely(!mask)) {
 		ret = -EINVAL;
 		goto out;