Revert "fsnotify: store struct file not struct path"

[sfrench/cifs-2.6.git] / fs / notify / inotify / inotify_fsnotify.c

diff --git a/fs/notify/inotify/inotify_fsnotify.c b/fs/notify/inotify/inotify_fsnotify.c
index 5e73eeb2c69721fa799ef358c9f6dd1142b9c5fb..a91b69a6a291be3e29082a69c8697cb049d5992c 100644 (file)
--- 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_FILE):
-                       if ((old->file->f_path.mnt == new->file->f_path.mnt) &&
-                           (old->file->f_path.dentry == new->file->f_path.dentry))
+               case (FSNOTIFY_EVENT_PATH):
+                       if ((old->path.mnt == new->path.mnt) &&
+                           (old->path.dentry == new->path.dentry))
                                return true;
                        break;
                case (FSNOTIFY_EVENT_NONE):
@@ -147,10 +147,10 @@ static bool inotify_should_send_event(struct fsnotify_group *group, struct inode
                                      __u32 mask, void *data, int data_type)
 {
        if ((inode_mark->mask & FS_EXCL_UNLINK) &&
-           (data_type == FSNOTIFY_EVENT_FILE)) {
-               struct file *file  = data;
+           (data_type == FSNOTIFY_EVENT_PATH)) {
+               struct path *path = data;
 
-               if (d_unlinked(file->f_path.dentry))
+               if (d_unlinked(path->dentry))
                        return false;
        }