From 70904adeafd03c17a44d12f9cd4496448d63a11d Mon Sep 17 00:00:00 2001 From: Nick Piggin Date: Wed, 6 Feb 2008 01:37:28 -0800 Subject: [PATCH] --- yaml --- r: 83445 b: refs/heads/master c: d599e36a9ea85432587f4550acc113cd7549d12a h: refs/heads/master i: 83443: 726d810687636e7353243ced76f5cbe8940cd108 v: v3 --- [refs] | 2 +- trunk/fs/inotify.c | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 1d2423e70692..1ee999150181 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: eea63e0e8a60d00485b47fb6e75d9aa2566b989b +refs/heads/master: d599e36a9ea85432587f4550acc113cd7549d12a diff --git a/trunk/fs/inotify.c b/trunk/fs/inotify.c index 2c5b92152876..b2b109bf29d6 100644 --- a/trunk/fs/inotify.c +++ b/trunk/fs/inotify.c @@ -627,6 +627,7 @@ s32 inotify_add_watch(struct inotify_handle *ih, struct inotify_watch *watch, struct inode *inode, u32 mask) { int ret = 0; + int newly_watched; /* don't allow invalid bits: we don't want flags set */ mask &= IN_ALL_EVENTS | IN_ONESHOT; @@ -653,12 +654,18 @@ s32 inotify_add_watch(struct inotify_handle *ih, struct inotify_watch *watch, */ watch->inode = igrab(inode); - if (!inotify_inode_watched(inode)) - set_dentry_child_flags(inode, 1); - /* Add the watch to the handle's and the inode's list */ + newly_watched = !inotify_inode_watched(inode); list_add(&watch->h_list, &ih->watches); list_add(&watch->i_list, &inode->inotify_watches); + /* + * Set child flags _after_ adding the watch, so there is no race + * windows where newly instantiated children could miss their parent's + * watched flag. + */ + if (newly_watched) + set_dentry_child_flags(inode, 1); + out: mutex_unlock(&ih->mutex); mutex_unlock(&inode->inotify_mutex);