fsnotify: kill FSNOTIFY_EVENT_FILE

Some fsnotify operations send a struct file.  This is more information than
we technically need.  We instead send a struct path in all cases instead of
sometimes a path and sometimes a file.

Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
Signed-off-by: Eric Paris <eparis@redhat.com>

1 files changed, 19 insertions, 17 deletions

diff --git a/include/linux/fsnotify.h b/include/linux/fsnotify.h
index 04ea03ea8090..06d296d85ebf 100644
--- a/include/linux/fsnotify.h
+++ b/include/linux/fsnotify.h
@@ -26,14 +26,12 @@ static inline void fsnotify_d_instantiate(struct dentry *entry,
 }
 
 /* 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)
 {
-        BUG_ON(file && dentry);
+        if (!dentry)
+                dentry = path->dentry;
 
-        if (file)
-                dentry = file->f_path.dentry;
-
-        __fsnotify_parent(file, dentry, mask);
+        __fsnotify_parent(path, dentry, mask);
 }
 
 /*
@@ -160,14 +158,15 @@ 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;
 
-        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);
 }
 
 /*
@@ -175,14 +174,15 @@ 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;
 
-        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);
 }
 
 /*
@@ -190,14 +190,15 @@ 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;
 
-        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);
 }
 
 /*
@@ -205,6 +206,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;
@@ -212,8 +214,8 @@ static inline void fsnotify_close(struct file *file)
         if (S_ISDIR(inode->i_mode))
                 mask |= FS_IN_ISDIR;
 
-        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);
 }
 
 /*