Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-microblaze.git] / fs / notify / fanotify / fanotify.c

diff --git a/fs/notify/fanotify/fanotify.c b/fs/notify/fanotify/fanotify.c
index 928f2a5..d51e1bb 100644 (file)
--- a/fs/notify/fanotify/fanotify.c
+++ b/fs/notify/fanotify/fanotify.c
@@ -221,8 +221,15 @@ static int fanotify_handle_event(struct fsnotify_group *group,
 
        event = fanotify_alloc_event(group, inode, mask, data);
        ret = -ENOMEM;
-       if (unlikely(!event))
+       if (unlikely(!event)) {
+               /*
+                * We don't queue overflow events for permission events as
+                * there the access is denied and so no event is in fact lost.
+                */
+               if (!fanotify_is_perm_event(mask))
+                       fsnotify_queue_overflow(group);
                goto finish;
+       }
 
        fsn_event = &event->fse;
        ret = fsnotify_add_event(group, fsn_event, fanotify_merge);