summaryrefslogtreecommitdiffstats
path: root/fs/notify/inotify
diff options
context:
space:
mode:
authorEric Paris <eparis@redhat.com>2010-07-28 16:18:37 +0200
committerEric Paris <eparis@redhat.com>2010-07-28 16:18:48 +0200
commitff311008ab8d2f2cfdbbefd407d1b05acc8164b2 (patch)
treef6d21c7c5834cd2f84b4ed1281bbaa057c46187c /fs/notify/inotify
parentfsnotify: update gfp/slab.h includes (diff)
downloadlinux-ff311008ab8d2f2cfdbbefd407d1b05acc8164b2.tar.xz
linux-ff311008ab8d2f2cfdbbefd407d1b05acc8164b2.zip
inotify: fix inotify oneshot support
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>
Diffstat (limited to 'fs/notify/inotify')
-rw-r--r--fs/notify/inotify/inotify_fsnotify.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/notify/inotify/inotify_fsnotify.c b/fs/notify/inotify/inotify_fsnotify.c
index daa666a6e6c9..388a150c3d4a 100644
--- a/fs/notify/inotify/inotify_fsnotify.c
+++ b/fs/notify/inotify/inotify_fsnotify.c
@@ -126,6 +126,9 @@ static int inotify_handle_event(struct fsnotify_group *group, struct fsnotify_ev
ret = 0;
}
+ if (fsn_mark->mask & IN_ONESHOT)
+ fsnotify_destroy_mark(fsn_mark);
+
/*
* If we hold the fsn_mark until after the event is on the queue
* IN_IGNORED won't be able to pass this event in the queue