From 9d946c50bd402676c203147f896d45d94416a87e Mon Sep 17 00:00:00 2001
From: Robert Love <rml@novell.com>
Date: Tue, 7 Feb 2006 12:58:45 -0800
Subject: [PATCH] --- yaml --- r: 19983 b: refs/heads/master c:
 b5173119ff10c5538e92a7957a50887ae170b8da h: refs/heads/master i:   19981:
 f1d83290867239e549c656dfd0632562ff7e827a   19979:
 ddecac7a10015248ee483492d3027fc422394994   19975:
 61042b2c6438caa3f0002455b969557ae1cb6503   19967:
 2ae24708c9a70301c6f6e424c2f144f4ee911f14 v: v3

---
 [refs]             | 2 +-
 trunk/fs/inotify.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9ad90cb9128a..f12d2208e615 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8e08b756869eeb08ace17ad64c2a8cb97b18e856
+refs/heads/master: b5173119ff10c5538e92a7957a50887ae170b8da
diff --git a/trunk/fs/inotify.c b/trunk/fs/inotify.c
index 878ccca61213..3041503bde02 100644
--- a/trunk/fs/inotify.c
+++ b/trunk/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;