inotify: fix inotify oneshot support

commit ff311008ab8d2f2cfdbbefd407d1b05acc8164b2 upstream.

During the large inotify rewrite to fsnotify I completely dropped support
for IN_ONESHOT.  Reimplement that support.

Signed-off-by: Eric Paris <eparis@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/fs/notify/inotify/inotify_fsnotify.c b/fs/notify/inotify/inotify_fsnotify.c
index e27960cd76ab9046257826783d907bdb6f3ca2a8..5d3d2a782abcf00438f82e6c1cff75c44cc059ca 100644 (file)
--- a/fs/notify/inotify/inotify_fsnotify.c
+++ b/fs/notify/inotify/inotify_fsnotify.c
@@ -72,6 +72,9 @@ static int inotify_handle_event(struct fsnotify_group *group, struct fsnotify_ev
                        ret = 0;
        }
 
+       if (entry->mask & IN_ONESHOT)
+               fsnotify_destroy_mark_by_entry(entry);
+
        /*
         * If we hold the entry until after the event is on the queue
         * IN_IGNORED won't be able to pass this event in the queue