aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Paris <eparis@redhat.com>2010-08-18 12:25:49 -0400
committerEric Paris <eparis@redhat.com>2010-08-22 20:09:41 -0400
commit5f3f259fa8f1d7969360acfad5307d03c2f53d63 (patch)
treef1f781b5ebae2c03d27bd1a36bbd808eab8c7402
parentfaa9560ae76ef50a3cbfb1a6afc0343fd8172374 (diff)
fsnotify: reset used_inode and used_vfsmount on each pass
The fsnotify main loop has 2 booleans which tell if a particular mark was sent to the listeners or if it should be processed in the next pass. The problem is that the booleans were not reset on each traversal of the loop. So marks could get skipped even when they were not sent to the notifiers. Reported-by: Tvrtko Ursulin <tvrtko.ursulin@sophos.com> Signed-off-by: Eric Paris <eparis@redhat.com>
-rw-r--r--fs/notify/fsnotify.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/notify/fsnotify.c b/fs/notify/fsnotify.c
index f3e3b355ba7f..59dc7a02bd0c 100644
--- a/fs/notify/fsnotify.c
+++ b/fs/notify/fsnotify.c
@@ -220,7 +220,7 @@ int fsnotify(struct inode *to_tell, __u32 mask, void *data, int data_is,
220 struct fsnotify_event *event = NULL; 220 struct fsnotify_event *event = NULL;
221 struct vfsmount *mnt; 221 struct vfsmount *mnt;
222 int idx, ret = 0; 222 int idx, ret = 0;
223 bool used_inode = false, used_vfsmount = false; 223 bool used_inode, used_vfsmount;
224 /* global tests shouldn't care about events on child only the specific event */ 224 /* global tests shouldn't care about events on child only the specific event */
225 __u32 test_mask = (mask & ~FS_EVENT_ON_CHILD); 225 __u32 test_mask = (mask & ~FS_EVENT_ON_CHILD);
226 226
@@ -261,6 +261,8 @@ int fsnotify(struct inode *to_tell, __u32 mask, void *data, int data_is,
261 } 261 }
262 262
263 while (inode_node || vfsmount_node) { 263 while (inode_node || vfsmount_node) {
264 used_inode = used_vfsmount = false;
265
264 if (inode_node) { 266 if (inode_node) {
265 inode_mark = hlist_entry(srcu_dereference(inode_node, &fsnotify_mark_srcu), 267 inode_mark = hlist_entry(srcu_dereference(inode_node, &fsnotify_mark_srcu),
266 struct fsnotify_mark, i.i_list); 268 struct fsnotify_mark, i.i_list);