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 *,