projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-next' of git://git.infradead.org/users/eparis/notify
[linux-2.6-block.git]
/
fs
/
notify
/
fanotify
/
fanotify.c
diff --git
a/fs/notify/fanotify/fanotify.c
b/fs/notify/fanotify/fanotify.c
index aeb5b5abbd4fcb9036b1b9e7391541c20d8b8d3c..0c2f9122b262da54392c8ed90a5a9d94ea22719c 100644
(file)
--- a/
fs/notify/fanotify/fanotify.c
+++ b/
fs/notify/fanotify/fanotify.c
@@
-27,6
+27,7
@@
static bool should_merge(struct fsnotify_event *old, struct fsnotify_event *new)
if ((old->path.mnt == new->path.mnt) &&
(old->path.dentry == new->path.dentry))
return true;
+ break;
case (FSNOTIFY_EVENT_NONE):
return true;
default: