aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/notify/fsnotify.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/notify/fsnotify.c b/fs/notify/fsnotify.c
index ccb14d3fc0de..b39c5c161adb 100644
--- a/fs/notify/fsnotify.c
+++ b/fs/notify/fsnotify.c
@@ -123,7 +123,7 @@ int __fsnotify_parent(struct path *path, struct dentry *dentry, __u32 mask)
123} 123}
124EXPORT_SYMBOL_GPL(__fsnotify_parent); 124EXPORT_SYMBOL_GPL(__fsnotify_parent);
125 125
126static int send_to_group(struct inode *to_tell, struct vfsmount *mnt, 126static int send_to_group(struct inode *to_tell,
127 struct fsnotify_mark *inode_mark, 127 struct fsnotify_mark *inode_mark,
128 struct fsnotify_mark *vfsmount_mark, 128 struct fsnotify_mark *vfsmount_mark,
129 __u32 mask, void *data, 129 __u32 mask, void *data,
@@ -168,10 +168,10 @@ static int send_to_group(struct inode *to_tell, struct vfsmount *mnt,
168 vfsmount_test_mask &= ~inode_mark->ignored_mask; 168 vfsmount_test_mask &= ~inode_mark->ignored_mask;
169 } 169 }
170 170
171 pr_debug("%s: group=%p to_tell=%p mnt=%p mask=%x inode_mark=%p" 171 pr_debug("%s: group=%p to_tell=%p mask=%x inode_mark=%p"
172 " inode_test_mask=%x vfsmount_mark=%p vfsmount_test_mask=%x" 172 " inode_test_mask=%x vfsmount_mark=%p vfsmount_test_mask=%x"
173 " data=%p data_is=%d cookie=%d event=%p\n", 173 " data=%p data_is=%d cookie=%d event=%p\n",
174 __func__, group, to_tell, mnt, mask, inode_mark, 174 __func__, group, to_tell, mask, inode_mark,
175 inode_test_mask, vfsmount_mark, vfsmount_test_mask, data, 175 inode_test_mask, vfsmount_mark, vfsmount_test_mask, data,
176 data_is, cookie, *event); 176 data_is, cookie, *event);
177 177
@@ -258,16 +258,16 @@ int fsnotify(struct inode *to_tell, __u32 mask, void *data, int data_is,
258 258
259 if (inode_group > vfsmount_group) { 259 if (inode_group > vfsmount_group) {
260 /* handle inode */ 260 /* handle inode */
261 ret = send_to_group(to_tell, NULL, inode_mark, NULL, mask, data, 261 ret = send_to_group(to_tell, inode_mark, NULL, mask, data,
262 data_is, cookie, file_name, &event); 262 data_is, cookie, file_name, &event);
263 /* we didn't use the vfsmount_mark */ 263 /* we didn't use the vfsmount_mark */
264 vfsmount_group = NULL; 264 vfsmount_group = NULL;
265 } else if (vfsmount_group > inode_group) { 265 } else if (vfsmount_group > inode_group) {
266 ret = send_to_group(to_tell, &mnt->mnt, NULL, vfsmount_mark, mask, data, 266 ret = send_to_group(to_tell, NULL, vfsmount_mark, mask, data,
267 data_is, cookie, file_name, &event); 267 data_is, cookie, file_name, &event);
268 inode_group = NULL; 268 inode_group = NULL;
269 } else { 269 } else {
270 ret = send_to_group(to_tell, &mnt->mnt, inode_mark, vfsmount_mark, 270 ret = send_to_group(to_tell, inode_mark, vfsmount_mark,
271 mask, data, data_is, cookie, file_name, 271 mask, data, data_is, cookie, file_name,
272 &event); 272 &event);
273 } 273 }