1 files changed, 10 insertions, 0 deletions

diff --git a/fs/notify/fanotify/fanotify.c b/fs/notify/fanotify/fanotify.c
index 8e574d6f6a80..5b0b6b485a9c 100644
--- a/fs/notify/fanotify/fanotify.c
+++ b/fs/notify/fanotify/fanotify.c
@@ -46,6 +46,16 @@ static int fanotify_merge(struct list_head *list, struct fsnotify_event *event)
                         if (test_event->mask == event->mask)
                                 goto out;
 
+                        /*
+                         * if the refcnt == 1 this is the only queue
+                         * for this event and so we can update the mask
+                         * in place.
+                         */
+                        if (atomic_read(&test_event->refcnt) == 1) {
+                                test_event->mask |= event->mask;
+                                goto out;
+                        }
+
                         /* can't allocate memory, merge was no possible */
                         new_event = fsnotify_clone_event(test_event);
                         if (unlikely(!new_event)) {