git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
[pandora-kernel.git]
/
fs
/
inotify.c
diff --git
a/fs/inotify.c
b/fs/inotify.c
index
878ccca
..
3041503
100644
(file)
--- 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;