diff options
| author | Robert Love | 2006-02-07 21:58:45 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2006-02-08 01:12:33 +0100 |
| commit | b5173119ff10c5538e92a7957a50887ae170b8da (patch) | |
| tree | 5b5af4e03e627b66a9f37d25dd370a145ec72438 /fs | |
| parent | [PATCH] module: strlen_user() race fix (diff) | |
| download | kernel-qcow2-linux-b5173119ff10c5538e92a7957a50887ae170b8da.tar.gz kernel-qcow2-linux-b5173119ff10c5538e92a7957a50887ae170b8da.tar.xz kernel-qcow2-linux-b5173119ff10c5538e92a7957a50887ae170b8da.zip | |
[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>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/inotify.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/inotify.c b/fs/inotify.c index 878ccca61213..3041503bde02 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; |