fsnotify: store struct file not struct path

Al explains that calling dentry_open() with a mnt/dentry pair is only
garunteed to be safe if they are already used in an open struct file.  To
make sure this is the case don't store and use a struct path in fsnotify,
always use a struct file.

Signed-off-by: Eric Paris <eparis@redhat.com>

1 files changed, 6 insertions, 6 deletions

diff --git a/fs/notify/inotify/inotify_fsnotify.c b/fs/notify/inotify/inotify_fsnotify.c
index 73a1106b354..3c506e0364c 100644
--- a/fs/notify/inotify/inotify_fsnotify.c
+++ b/fs/notify/inotify/inotify_fsnotify.c
@@ -52,9 +52,9 @@ static bool event_compare(struct fsnotify_event *old, struct fsnotify_event *new
                             !strcmp(old->file_name, new->file_name))
                                 return true;
                         break;
-                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;
                         break;
                 case (FSNOTIFY_EVENT_NONE):
@@ -165,10 +165,10 @@ static bool inotify_should_send_event(struct fsnotify_group *group, struct inode
         send = (fsn_mark->mask & mask);
 
         if (send && (fsn_mark->mask & FS_EXCL_UNLINK) &&
-            (data_type == FSNOTIFY_EVENT_PATH)) {
-                struct path *path  = data;
+            (data_type == FSNOTIFY_EVENT_FILE)) {
+                struct file *file  = data;
 
-                if (d_unlinked(path->dentry))
+                if (d_unlinked(file->f_path.dentry))
                         send = false;
         }