summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Paris <eparis@redhat.com>2012-11-08 15:53:37 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-11-26 11:37:41 -0800
commita6a19e36b35fcb17d6c2bf9a49014e9461dfcef2 (patch)
treefb746b89493ebc1f32e248d4bb076ccae92b1360
parentbb1d6871282e191752d4d8396808ed25ac3500fb (diff)
downloadlinux-3.10-a6a19e36b35fcb17d6c2bf9a49014e9461dfcef2.tar.gz
linux-3.10-a6a19e36b35fcb17d6c2bf9a49014e9461dfcef2.tar.bz2
linux-3.10-a6a19e36b35fcb17d6c2bf9a49014e9461dfcef2.zip
fanotify: fix missing break
commit 848561d368751a1c0f679b9f045a02944506a801 upstream. Anders Blomdell noted in 2010 that Fanotify lost events and provided a test case. Eric Paris confirmed it was a bug and posted a fix to the list https://groups.google.com/forum/?fromgroups=#!topic/linux.kernel/RrJfTfyW2BE but never applied it. Repeated attempts over time to actually get him to apply it have never had a reply from anyone who has raised it So apply it anyway Signed-off-by: Alan Cox <alan@linux.intel.com> Reported-by: Anders Blomdell <anders.blomdell@control.lth.se> Cc: Eric Paris <eparis@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--fs/notify/fanotify/fanotify.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/notify/fanotify/fanotify.c b/fs/notify/fanotify/fanotify.c
index f35794b97e8..a5063602536 100644
--- a/fs/notify/fanotify/fanotify.c
+++ b/fs/notify/fanotify/fanotify.c
@@ -21,6 +21,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: