2 files changed, 7 insertions, 7 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)
             old->data_type == new->data_type &&
             old->tgid == new->tgid) {
                 switch (old->data_type) {
-                case (FSNOTIFY_EVENT_PATH):
-                        if ((old->path.mnt == new->path.mnt) &&
-                            (old->path.dentry == new->path.dentry))
+                case (FSNOTIFY_EVENT_FILE):
+                        if ((old->file->f_path.mnt == new->file->f_path.mnt) &&
+                            (old->file->f_path.dentry == new->file->f_path.dentry))
                                 return true;
                 case (FSNOTIFY_EVENT_NONE):
                         return true;
@@ -226,7 +226,7 @@ static bool fanotify_should_send_event(struct fsnotify_group *group, struct inod
                 return false;
 
         /* if we don't have enough info to send an event to userspace say no */
-        if (data_type != FSNOTIFY_EVENT_PATH)
+        if (data_type != FSNOTIFY_EVENT_FILE)
                 return false;
 
         if (mnt)
diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c
index 7182c83be90e..50cea74bf1c8 100644
--- a/fs/notify/fanotify/fanotify_user.c
+++ b/fs/notify/fanotify/fanotify_user.c
@@ -65,7 +65,7 @@ static int create_fd(struct fsnotify_group *group, struct fsnotify_event *event)
         if (client_fd < 0)
                 return client_fd;
 
-        if (event->data_type != FSNOTIFY_EVENT_PATH) {
+        if (event->data_type != FSNOTIFY_EVENT_FILE) {
                 WARN_ON(1);
                 put_unused_fd(client_fd);
                 return -EINVAL;
@@ -75,8 +75,8 @@ static int create_fd(struct fsnotify_group *group, struct fsnotify_event *event)
          * we need a new file handle for the userspace program so it can read even if it was
          * originally opened O_WRONLY.
          */
-        dentry = dget(event->path.dentry);
-        mnt = mntget(event->path.mnt);
+        dentry = dget(event->file->f_path.dentry);
+        mnt = mntget(event->file->f_path.mnt);
         /* it's possible this event was an overflow event.  in that case dentry and mnt
          * are NULL;  That's fine, just don't call dentry open */
         if (dentry && mnt)