aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/inotify.c8
-rw-r--r--include/linux/inotify.h1
2 files changed, 9 insertions, 0 deletions
diff --git a/fs/inotify.c b/fs/inotify.c
index 4b2469bb6554..2c5b92152876 100644
--- a/fs/inotify.c
+++ b/fs/inotify.c
@@ -701,6 +701,14 @@ out:
701 return ret; 701 return ret;
702} 702}
703 703
704void inotify_evict_watch(struct inotify_watch *watch)
705{
706 get_inotify_watch(watch);
707 mutex_lock(&watch->ih->mutex);
708 inotify_remove_watch_locked(watch->ih, watch);
709 mutex_unlock(&watch->ih->mutex);
710}
711
704/** 712/**
705 * inotify_rm_wd - remove a watch from an inotify instance 713 * inotify_rm_wd - remove a watch from an inotify instance
706 * @ih: inotify handle 714 * @ih: inotify handle
diff --git a/include/linux/inotify.h b/include/linux/inotify.h
index e76e2272e2ab..742b917e7d1b 100644
--- 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 *,
121extern __s32 inotify_add_watch(struct inotify_handle *, struct inotify_watch *, 121extern __s32 inotify_add_watch(struct inotify_handle *, struct inotify_watch *,
122 struct inode *, __u32); 122 struct inode *, __u32);
123extern __s32 inotify_clone_watch(struct inotify_watch *, struct inotify_watch *); 123extern __s32 inotify_clone_watch(struct inotify_watch *, struct inotify_watch *);
124extern void inotify_evict_watch(struct inotify_watch *);
124extern int inotify_rm_watch(struct inotify_handle *, struct inotify_watch *); 125extern int inotify_rm_watch(struct inotify_handle *, struct inotify_watch *);
125extern int inotify_rm_wd(struct inotify_handle *, __u32); 126extern int inotify_rm_wd(struct inotify_handle *, __u32);
126extern void inotify_remove_watch_locked(struct inotify_handle *, 127extern void inotify_remove_watch_locked(struct inotify_handle *,