@@ -25,6 +25,30 @@ static inline int fsnotify_parent(struct path *path, struct dentry *dentry, __u3
return __fsnotify_parent(path, dentry, mask);
}
+/*
+ * Notify this dentry's parent about a filename event (create,delete,rename).
+ * Unlike fsnotify_parent(), the event will be reported regardless of the
+ * FS_EVENT_ON_CHILD mask on the parent inode
+ */
+static inline int fsnotify_filename(struct dentry *dentry, __u32 mask,
+ const unsigned char *file_name, u32 cookie)
+{
+ struct dentry *parent = dget_parent(dentry);
+ struct inode *p_inode = parent->d_inode;
+ int ret;
+
+ ret = fsnotify(p_inode, mask, parent, FSNOTIFY_EVENT_DENTRY,
+ file_name, cookie);
+
+ dput(parent);
+ return ret;
+}
+
+static inline int fsnotify_d_name(struct dentry *dentry, __u32 mask)
+{
+ return fsnotify_filename(dentry, mask, dentry->d_name.name, 0);
+}
+
/* simple call site for access decisions */
static inline int fsnotify_perm(struct file *file, int mask)
{
@@ -68,8 +92,8 @@ static inline void fsnotify_move(struct inode *old_dir, struct inode *new_dir,
{
struct inode *source = moved->d_inode;
u32 fs_cookie = fsnotify_get_cookie();
- __u32 old_dir_mask = (FS_EVENT_ON_CHILD | FS_MOVED_FROM);
- __u32 new_dir_mask = (FS_EVENT_ON_CHILD | FS_MOVED_TO);
+ __u32 old_dir_mask = FS_MOVED_FROM;
+ __u32 new_dir_mask = FS_MOVED_TO;
const unsigned char *new_name = moved->d_name.name;
if (old_dir == new_dir)
@@ -82,8 +106,7 @@ static inline void fsnotify_move(struct inode *old_dir, struct inode *new_dir,
fsnotify(old_dir, old_dir_mask, source, FSNOTIFY_EVENT_INODE, old_name,
fs_cookie);
- fsnotify(new_dir, new_dir_mask, moved, FSNOTIFY_EVENT_DENTRY, new_name,
- fs_cookie);
+ fsnotify_filename(moved, new_dir_mask, new_name, fs_cookie);
if (target)
fsnotify_link_count(target);
@@ -119,7 +142,7 @@ static inline void fsnotify_nameremove(struct dentry *dentry, int isdir)
if (isdir)
mask |= FS_ISDIR;
- fsnotify_parent(NULL, dentry, mask);
+ fsnotify_d_name(dentry, mask);
}
/*
@@ -138,7 +161,7 @@ static inline void fsnotify_create(struct inode *inode, struct dentry *dentry)
{
audit_inode_child(inode, dentry, AUDIT_TYPE_CHILD_CREATE);
- fsnotify(inode, FS_CREATE, dentry, FSNOTIFY_EVENT_DENTRY, dentry->d_name.name, 0);
+ fsnotify_d_name(dentry, FS_CREATE);
}
/*
@@ -151,7 +174,7 @@ static inline void fsnotify_link(struct inode *dir, struct inode *inode, struct
fsnotify_link_count(inode);
audit_inode_child(dir, new_dentry, AUDIT_TYPE_CHILD_CREATE);
- fsnotify(dir, FS_CREATE, new_dentry, FSNOTIFY_EVENT_DENTRY, new_dentry->d_name.name, 0);
+ fsnotify_d_name(new_dentry, FS_CREATE);
}
/*
@@ -163,7 +186,7 @@ static inline void fsnotify_mkdir(struct inode *inode, struct dentry *dentry)
audit_inode_child(inode, dentry, AUDIT_TYPE_CHILD_CREATE);
- fsnotify(inode, mask, dentry, FSNOTIFY_EVENT_DENTRY, dentry->d_name.name, 0);
+ fsnotify_d_name(dentry, mask);
}
/*
Filename events are referring to events that modify directory entries, such as create,delete,rename. Those events should always be reported on a watched directory, regardless if FS_EVENT_ON_CHILD is set on the watch mask. fsnotify_nameremove() and fsnotify_move() were modified to no longer set the FS_EVENT_ON_CHILD event bit. This is a semantic change to align with the filename event definition. It has no effect on any existing backend, because dnotify and inotify always requets the child events and fanotify does not get the delete,rename events. The fsnotify_filename() helper is used to report all the filename events. It gets a reference on parent dentry and passes it as the data for the event along with the filename. fsnotify_filename() is different from fsnotify_parent(). fsnotify_parent() is intended to report any events that happened on child inodes when FS_EVENT_ON_CHILD is requested. fsnotify_filename() is intended to report only filename events, such as create,mkdir,link. Those events must always be reported on a watched directory, regardless if FS_EVENT_ON_CHILD was requested. fsnotify_d_name() is a helper for the common case where the filename to pass is dentry->d_name.name. It is safe to use these helpers with negative or not instantiated dentries, such as the case with fsnotify_link() and fsnotify_nameremove(). Signed-off-by: Amir Goldstein <amir73il@gmail.com> --- include/linux/fsnotify.h | 39 +++++++++++++++++++++++++++++++-------- 1 file changed, 31 insertions(+), 8 deletions(-)