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;