aboutsummaryrefslogtreecommitdiff
path: root/fs/inotify.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-12-16 22:53:53 +0100
committerIngo Molnar <mingo@elte.hu>2008-12-16 22:53:53 +0100
commitc15cb37cc4e9809624411333b96109ddf770e29c (patch)
tree3d4dbb48d97d5df9096ad815b99b20660cdc1bbf /fs/inotify.c
parent77be80e437fec44f8b7a620314b7d7b605b8d93b (diff)
parent8b1fae4e4200388b64dd88065639413cb3f1051c (diff)
Merge commit 'v2.6.28-rc8' into x86/uv
Diffstat (limited to 'fs/inotify.c')
-rw-r--r--fs/inotify.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/inotify.c b/fs/inotify.c
index 7bbed1b8982..dae3f28f30d 100644
--- a/fs/inotify.c
+++ b/fs/inotify.c
@@ -428,11 +428,13 @@ void inotify_unmount_inodes(struct list_head *list)
watches = &inode->inotify_watches;
list_for_each_entry_safe(watch, next_w, watches, i_list) {
struct inotify_handle *ih= watch->ih;
+ get_inotify_watch(watch);
mutex_lock(&ih->mutex);
ih->in_ops->handle_event(watch, watch->wd, IN_UNMOUNT, 0,
NULL, NULL);
inotify_remove_watch_locked(ih, watch);
mutex_unlock(&ih->mutex);
+ put_inotify_watch(watch);
}
mutex_unlock(&inode->inotify_mutex);
iput(inode);