From a69fa14142e4dbea3c212c36ce2029b7dc6b7967 Mon Sep 17 00:00:00 2001
From: Al Viro <viro@zeniv.linux.org.uk>
Date: Thu, 7 Jun 2007 12:22:59 -0400
Subject: [PATCH] --- yaml --- r: 71935 b: refs/heads/master c:
 455434d450a358ac5bcf3fc58f8913d13c544622 h: refs/heads/master i:   71933:
 f9c20cce339901b6a7b321b8e8058c5ada8dc015   71931:
 76e03f685f49dad996baa533e0359de46a2463b5   71927:
 41eb10a63659826948031691d06e6cd937157fa6   71919:
 d76324c6a816e8ef5960f7f7fa5d1c22a0c46ed8   71903:
 324954abe5537c4187bda1271851055f8bfddb9c   71871:
 abe8316a4d64acf46321dc67dd52adc5eac099cd   71807:
 0b7a360c5dcb522e97976810c101e58cbc6b712b   71679:
 f5fb02189c1c8c5b98f457738ef436ba4b748d48 v: v3

---
 [refs]                        | 2 +-
 trunk/fs/inotify.c            | 8 ++++++++
 trunk/include/linux/inotify.h | 1 +
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 8933d561bd1a..22da5053eec9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b9efe8a234ad874a049460417c54680338f96360
+refs/heads/master: 455434d450a358ac5bcf3fc58f8913d13c544622
diff --git a/trunk/fs/inotify.c b/trunk/fs/inotify.c
index 4b2469bb6554..2c5b92152876 100644
--- a/trunk/fs/inotify.c
+++ b/trunk/fs/inotify.c
@@ -701,6 +701,14 @@ s32 inotify_clone_watch(struct inotify_watch *old, struct inotify_watch *new)
 	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/trunk/include/linux/inotify.h b/trunk/include/linux/inotify.h
index e76e2272e2ab..742b917e7d1b 100644
--- a/trunk/include/linux/inotify.h
+++ b/trunk/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 *,