From: Robert Love <rml@novell.com>
Date: Tue, 7 Feb 2006 20:58:45 +0000 (-0800)
Subject: [PATCH] inotify: fix one-shot support
X-Git-Tag: v2.6.16-rc3~118
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=b5173119ff10c5538e92a7957a50887ae170b8da;p=linux-2.6-omap-h63xx.git

[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>
---

diff --git a/fs/inotify.c b/fs/inotify.c
index 878ccca6121..3041503bde0 100644
--- a/fs/inotify.c
+++ b/fs/inotify.c
@@ -967,7 +967,7 @@ asmlinkage long sys_inotify_add_watch(int fd, const char __user *path, u32 mask)
 		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;