[PATCH] new helper - inotify_evict_watch()

Kicks the watch out without dropping it.  Called under ->inotify_mutex

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/fs/inotify.c b/fs/inotify.c
index 4b2469bb65544ee6c244b96dbc2a4f9d62d77b3c..2c5b921528760b9da6d8abcc3f90668a8e9381d7 100644 (file)
--- a/fs/inotify.c
+++ b/fs/inotify.c
@@ -701,6 +701,14 @@ out:
        return ret;
 }
 
+void inotify_evict_watch(struct inotify_watch *watch)
+{
+       get_inotify_watch(watch);
+       mutex_lock(&watch->ih->mutex);
+       inotify_remove_watch_locked(watch->ih, watch);
+       mutex_unlock(&watch->ih->mutex);
+}
+
 /**
  * inotify_rm_wd - remove a watch from an inotify instance
  * @ih: inotify handle

diff --git a/include/linux/inotify.h b/include/linux/inotify.h
index e76e2272e2ab6dc740e8b011c491acdccb190cb9..742b917e7d1b274e5582ec30d387b4d881fe5915 100644 (file)
--- a/include/linux/inotify.h
+++ b/include/linux/inotify.h
@@ -121,6 +121,7 @@ extern __s32 inotify_find_update_watch(struct inotify_handle *, struct inode *,
 extern __s32 inotify_add_watch(struct inotify_handle *, struct inotify_watch *,
                               struct inode *, __u32);
 extern __s32 inotify_clone_watch(struct inotify_watch *, struct inotify_watch *);
+extern void inotify_evict_watch(struct inotify_watch *);
 extern int inotify_rm_watch(struct inotify_handle *, struct inotify_watch *);
 extern int inotify_rm_wd(struct inotify_handle *, __u32);
 extern void inotify_remove_watch_locked(struct inotify_handle *,