aboutsummaryrefslogtreecommitdiffstats
path: root/fs/notify/fanotify/fanotify.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/notify/fanotify/fanotify.c')
-rw-r--r--fs/notify/fanotify/fanotify.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/notify/fanotify/fanotify.c b/fs/notify/fanotify/fanotify.c
index f3c40c0e2b86..c2a3029052bc 100644
--- a/fs/notify/fanotify/fanotify.c
+++ b/fs/notify/fanotify/fanotify.c
@@ -17,9 +17,9 @@ static bool should_merge(struct fsnotify_event *old, struct fsnotify_event *new)
17 old->data_type == new->data_type && 17 old->data_type == new->data_type &&
18 old->tgid == new->tgid) { 18 old->tgid == new->tgid) {
19 switch (old->data_type) { 19 switch (old->data_type) {
20 case (FSNOTIFY_EVENT_PATH): 20 case (FSNOTIFY_EVENT_FILE):
21 if ((old->path.mnt == new->path.mnt) && 21 if ((old->file->f_path.mnt == new->file->f_path.mnt) &&
22 (old->path.dentry == new->path.dentry)) 22 (old->file->f_path.dentry == new->file->f_path.dentry))
23 return true; 23 return true;
24 case (FSNOTIFY_EVENT_NONE): 24 case (FSNOTIFY_EVENT_NONE):
25 return true; 25 return true;
@@ -226,7 +226,7 @@ static bool fanotify_should_send_event(struct fsnotify_group *group, struct inod
226 return false; 226 return false;
227 227
228 /* if we don't have enough info to send an event to userspace say no */ 228 /* if we don't have enough info to send an event to userspace say no */
229 if (data_type != FSNOTIFY_EVENT_PATH) 229 if (data_type != FSNOTIFY_EVENT_FILE)
230 return false; 230 return false;
231 231
232 if (mnt) 232 if (mnt)