diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 14:17:05 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 14:17:05 -0500 |
commit | 70c07e02625ec46d0ffbfce1acef42d660803528 (patch) | |
tree | f500f1a4f93e72747fb08b0eefabb167dcdc5db9 /fs/inotify.c | |
parent | 5d1769ac3d0ea5ff3a286b097c21faaf6a9e6859 (diff) | |
parent | 2746b8623abce815aaae7afc946b1b39f8436f5a (diff) |
Merge branch 'viro'
Diffstat (limited to 'fs/inotify.c')
-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) | |||
967 | mask_add = 1; | 967 | mask_add = 1; |
968 | 968 | ||
969 | /* don't let user-space set invalid bits: we don't want flags set */ | 969 | /* don't let user-space set invalid bits: we don't want flags set */ |
970 | mask &= IN_ALL_EVENTS; | 970 | mask &= IN_ALL_EVENTS | IN_ONESHOT; |
971 | if (unlikely(!mask)) { | 971 | if (unlikely(!mask)) { |
972 | ret = -EINVAL; | 972 | ret = -EINVAL; |
973 | goto out; | 973 | goto out; |