Commit b5173119 authored by Robert Love's avatar Robert Love Committed by Linus Torvalds

[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: default avatarRobert Love <rml@novell.com>
Cc: John McCutchan <ttb@tentacle.dhs.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 8e08b756
...@@ -967,7 +967,7 @@ asmlinkage long sys_inotify_add_watch(int fd, const char __user *path, u32 mask) ...@@ -967,7 +967,7 @@ asmlinkage long sys_inotify_add_watch(int fd, const char __user *path, u32 mask)
mask_add = 1; mask_add = 1;
/* don't let user-space set invalid bits: we don't want flags set */ /* 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)) { if (unlikely(!mask)) {
ret = -EINVAL; ret = -EINVAL;
goto out; goto out;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment