Revert "fsnotify: store struct file not struct path"

This reverts commit 3bcf3860a4ff9bbc522820b4b765e65e4deceb3e (and the
accompanying commit c1e5c954020e "vfs/fsnotify: fsnotify_close can delay
the final work in fput" that was a horribly ugly hack to make it work at
all).

The 'struct file' approach not only causes that disgusting hack, it
somehow breaks pulseaudio, probably due to some other subtlety with
f_count handling.

Fix up various conflicts due to later fsnotify work.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 21 insertions, 16 deletions

diff --git a/include/linux/fsnotify.h b/include/linux/fsnotify.h
index e4e2204187ee..59d0df43ff9d 100644
--- a/include/linux/fsnotify.h
+++ b/include/linux/fsnotify.h
@@ -26,18 +26,19 @@ static inline void fsnotify_d_instantiate(struct dentry *dentry,
 }
 
 /* Notify this dentry's parent about a child's events. */
-static inline void fsnotify_parent(struct file *file, struct dentry *dentry, __u32 mask)
+static inline void fsnotify_parent(struct path *path, struct dentry *dentry, __u32 mask)
 {
         if (!dentry)
-                dentry = file->f_path.dentry;
+                dentry = path->dentry;
 
-        __fsnotify_parent(file, dentry, mask);
+        __fsnotify_parent(path, dentry, mask);
 }
 
 /* simple call site for access decisions */
 static inline int fsnotify_perm(struct file *file, int mask)
 {
-        struct inode *inode = file->f_path.dentry->d_inode;
+        struct path *path = &file->f_path;
+        struct inode *inode = path->dentry->d_inode;
         __u32 fsnotify_mask = 0;
 
         if (file->f_mode & FMODE_NONOTIFY)
@@ -51,7 +52,7 @@ static inline int fsnotify_perm(struct file *file, int mask)
         else
                 BUG();
 
-        return fsnotify(inode, fsnotify_mask, file, FSNOTIFY_EVENT_FILE, NULL, 0);
+        return fsnotify(inode, fsnotify_mask, path, FSNOTIFY_EVENT_PATH, NULL, 0);
 }
 
 /*
@@ -186,15 +187,16 @@ static inline void fsnotify_mkdir(struct inode *inode, struct dentry *dentry)
  */
 static inline void fsnotify_access(struct file *file)
 {
-        struct inode *inode = file->f_path.dentry->d_inode;
+        struct path *path = &file->f_path;
+        struct inode *inode = path->dentry->d_inode;
         __u32 mask = FS_ACCESS;
 
         if (S_ISDIR(inode->i_mode))
                 mask |= FS_IN_ISDIR;
 
         if (!(file->f_mode & FMODE_NONOTIFY)) {
-                fsnotify_parent(file, NULL, mask);
-                fsnotify(inode, mask, file, FSNOTIFY_EVENT_FILE, NULL, 0);
+                fsnotify_parent(path, NULL, mask);
+                fsnotify(inode, mask, path, FSNOTIFY_EVENT_PATH, NULL, 0);
         }
 }
 
@@ -203,15 +205,16 @@ static inline void fsnotify_access(struct file *file)
  */
 static inline void fsnotify_modify(struct file *file)
 {
-        struct inode *inode = file->f_path.dentry->d_inode;
+        struct path *path = &file->f_path;
+        struct inode *inode = path->dentry->d_inode;
         __u32 mask = FS_MODIFY;
 
         if (S_ISDIR(inode->i_mode))
                 mask |= FS_IN_ISDIR;
 
         if (!(file->f_mode & FMODE_NONOTIFY)) {
-                fsnotify_parent(file, NULL, mask);
-                fsnotify(inode, mask, file, FSNOTIFY_EVENT_FILE, NULL, 0);
+                fsnotify_parent(path, NULL, mask);
+                fsnotify(inode, mask, path, FSNOTIFY_EVENT_PATH, NULL, 0);
         }
 }
 
@@ -220,15 +223,16 @@ static inline void fsnotify_modify(struct file *file)
  */
 static inline void fsnotify_open(struct file *file)
 {
-        struct inode *inode = file->f_path.dentry->d_inode;
+        struct path *path = &file->f_path;
+        struct inode *inode = path->dentry->d_inode;
         __u32 mask = FS_OPEN;
 
         if (S_ISDIR(inode->i_mode))
                 mask |= FS_IN_ISDIR;
 
         if (!(file->f_mode & FMODE_NONOTIFY)) {
-                fsnotify_parent(file, NULL, mask);
-                fsnotify(inode, mask, file, FSNOTIFY_EVENT_FILE, NULL, 0);
+                fsnotify_parent(path, NULL, mask);
+                fsnotify(inode, mask, path, FSNOTIFY_EVENT_PATH, NULL, 0);
         }
 }
 
@@ -237,6 +241,7 @@ static inline void fsnotify_open(struct file *file)
  */
 static inline void fsnotify_close(struct file *file)
 {
+        struct path *path = &file->f_path;
         struct inode *inode = file->f_path.dentry->d_inode;
         fmode_t mode = file->f_mode;
         __u32 mask = (mode & FMODE_WRITE) ? FS_CLOSE_WRITE : FS_CLOSE_NOWRITE;
@@ -245,8 +250,8 @@ static inline void fsnotify_close(struct file *file)
                 mask |= FS_IN_ISDIR;
 
         if (!(file->f_mode & FMODE_NONOTIFY)) {
-                fsnotify_parent(file, NULL, mask);
-                fsnotify(inode, mask, file, FSNOTIFY_EVENT_FILE, NULL, 0);
+                fsnotify_parent(path, NULL, mask);
+                fsnotify(inode, mask, path, FSNOTIFY_EVENT_PATH, NULL, 0);
         }
 }