aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/inotify.c23
-rw-r--r--include/linux/inotify.h7
2 files changed, 21 insertions, 9 deletions
diff --git a/fs/inotify.c b/fs/inotify.c
index 8477c4fbecb4..723836a1f718 100644
--- a/fs/inotify.c
+++ b/fs/inotify.c
@@ -207,7 +207,7 @@ static struct inotify_watch *inode_find_handle(struct inode *inode,
207} 207}
208 208
209/* 209/*
210 * remove_watch_no_event - remove_watch() without the IN_IGNORED event. 210 * remove_watch_no_event - remove watch without the IN_IGNORED event.
211 * 211 *
212 * Callers must hold both inode->inotify_mutex and ih->mutex. 212 * Callers must hold both inode->inotify_mutex and ih->mutex.
213 */ 213 */
@@ -223,17 +223,22 @@ static void remove_watch_no_event(struct inotify_watch *watch,
223 idr_remove(&ih->idr, watch->wd); 223 idr_remove(&ih->idr, watch->wd);
224} 224}
225 225
226/* 226/**
227 * remove_watch - Remove a watch from both the handle and the inode. Sends 227 * inotify_remove_watch_locked - Remove a watch from both the handle and the
228 * the IN_IGNORED event signifying that the inode is no longer watched. 228 * inode. Sends the IN_IGNORED event signifying that the inode is no longer
229 * watched. May be invoked from a caller's event handler.
230 * @ih: inotify handle associated with watch
231 * @watch: watch to remove
229 * 232 *
230 * Callers must hold both inode->inotify_mutex and ih->mutex. 233 * Callers must hold both inode->inotify_mutex and ih->mutex.
231 */ 234 */
232static void remove_watch(struct inotify_watch *watch, struct inotify_handle *ih) 235void inotify_remove_watch_locked(struct inotify_handle *ih,
236 struct inotify_watch *watch)
233{ 237{
234 remove_watch_no_event(watch, ih); 238 remove_watch_no_event(watch, ih);
235 ih->in_ops->handle_event(watch, watch->wd, IN_IGNORED, 0, NULL, NULL); 239 ih->in_ops->handle_event(watch, watch->wd, IN_IGNORED, 0, NULL, NULL);
236} 240}
241EXPORT_SYMBOL_GPL(inotify_remove_watch_locked);
237 242
238/* Kernel API for producing events */ 243/* Kernel API for producing events */
239 244
@@ -378,7 +383,7 @@ void inotify_unmount_inodes(struct list_head *list)
378 383
379 need_iput_tmp = need_iput; 384 need_iput_tmp = need_iput;
380 need_iput = NULL; 385 need_iput = NULL;
381 /* In case the remove_watch() drops a reference. */ 386 /* In case inotify_remove_watch_locked() drops a reference. */
382 if (inode != need_iput_tmp) 387 if (inode != need_iput_tmp)
383 __iget(inode); 388 __iget(inode);
384 else 389 else
@@ -411,7 +416,7 @@ void inotify_unmount_inodes(struct list_head *list)
411 mutex_lock(&ih->mutex); 416 mutex_lock(&ih->mutex);
412 ih->in_ops->handle_event(watch, watch->wd, IN_UNMOUNT, 0, 417 ih->in_ops->handle_event(watch, watch->wd, IN_UNMOUNT, 0,
413 NULL, NULL); 418 NULL, NULL);
414 remove_watch(watch, ih); 419 inotify_remove_watch_locked(ih, watch);
415 mutex_unlock(&ih->mutex); 420 mutex_unlock(&ih->mutex);
416 } 421 }
417 mutex_unlock(&inode->inotify_mutex); 422 mutex_unlock(&inode->inotify_mutex);
@@ -434,7 +439,7 @@ void inotify_inode_is_dead(struct inode *inode)
434 list_for_each_entry_safe(watch, next, &inode->inotify_watches, i_list) { 439 list_for_each_entry_safe(watch, next, &inode->inotify_watches, i_list) {
435 struct inotify_handle *ih = watch->ih; 440 struct inotify_handle *ih = watch->ih;
436 mutex_lock(&ih->mutex); 441 mutex_lock(&ih->mutex);
437 remove_watch(watch, ih); 442 inotify_remove_watch_locked(ih, watch);
438 mutex_unlock(&ih->mutex); 443 mutex_unlock(&ih->mutex);
439 } 444 }
440 mutex_unlock(&inode->inotify_mutex); 445 mutex_unlock(&inode->inotify_mutex);
@@ -687,7 +692,7 @@ int inotify_rm_wd(struct inotify_handle *ih, u32 wd)
687 692
688 /* make sure that we did not race */ 693 /* make sure that we did not race */
689 if (likely(idr_find(&ih->idr, wd) == watch)) 694 if (likely(idr_find(&ih->idr, wd) == watch))
690 remove_watch(watch, ih); 695 inotify_remove_watch_locked(ih, watch);
691 696
692 mutex_unlock(&ih->mutex); 697 mutex_unlock(&ih->mutex);
693 mutex_unlock(&inode->inotify_mutex); 698 mutex_unlock(&inode->inotify_mutex);
diff --git a/include/linux/inotify.h b/include/linux/inotify.h
index e7e7fb7fc778..d4f48c6402e6 100644
--- a/include/linux/inotify.h
+++ b/include/linux/inotify.h
@@ -122,6 +122,8 @@ extern __s32 inotify_add_watch(struct inotify_handle *, struct inotify_watch *,
122 struct inode *, __u32); 122 struct inode *, __u32);
123extern int inotify_rm_watch(struct inotify_handle *, struct inotify_watch *); 123extern int inotify_rm_watch(struct inotify_handle *, struct inotify_watch *);
124extern int inotify_rm_wd(struct inotify_handle *, __u32); 124extern int inotify_rm_wd(struct inotify_handle *, __u32);
125extern void inotify_remove_watch_locked(struct inotify_handle *,
126 struct inotify_watch *);
125extern void get_inotify_watch(struct inotify_watch *); 127extern void get_inotify_watch(struct inotify_watch *);
126extern void put_inotify_watch(struct inotify_watch *); 128extern void put_inotify_watch(struct inotify_watch *);
127 129
@@ -205,6 +207,11 @@ static inline int inotify_rm_wd(struct inotify_handle *ih, __u32 wd)
205 return -EOPNOTSUPP; 207 return -EOPNOTSUPP;
206} 208}
207 209
210static inline void inotify_remove_watch_locked(struct inotify_handle *ih,
211 struct inotify_watch *watch)
212{
213}
214
208static inline void get_inotify_watch(struct inotify_watch *watch) 215static inline void get_inotify_watch(struct inotify_watch *watch)
209{ 216{
210} 217}