Commit 9baf93d6 authored by Amir Goldstein's avatar Amir Goldstein Committed by Jan Kara
Browse files

fsnotify: pass data_type to fsnotify_name() 

Align the arguments of fsnotify_name() to those of fsnotify().

Link: https://lore.kernel.org/r/20211025192746.66445-2-krisman@collabora.com


Reviewed-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarAmir Goldstein <amir73il@gmail.com>
Signed-off-by: default avatarGabriel Krisman Bertazi <krisman@collabora.com>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
parent 64570fbc

include/linux/fsnotify.h

+13 −9
Original line number Diff line number Diff line
@@ -26,20 +26,21 @@ 
 * FS_EVENT_ON_CHILD mask on the parent inode and will not be reported if only

 * the child is interested and not the parent.

 */

static inline void fsnotify_name(struct inode *dir, __u32 mask,

				 struct inode *child,

				 const struct qstr *name, u32 cookie)

static inline int fsnotify_name(__u32 mask, const void *data, int data_type,

				struct inode *dir, const struct qstr *name,

				u32 cookie)

{

	if (atomic_long_read(&dir->i_sb->s_fsnotify_connectors) == 0)

		return;

		return 0;



	fsnotify(mask, child, FSNOTIFY_EVENT_INODE, dir, name, NULL, cookie);

	return fsnotify(mask, data, data_type, dir, name, NULL, cookie);

}



static inline void fsnotify_dirent(struct inode *dir, struct dentry *dentry,

				   __u32 mask)

{

	fsnotify_name(dir, mask, d_inode(dentry), &dentry->d_name, 0);

	fsnotify_name(mask, d_inode(dentry), FSNOTIFY_EVENT_INODE,

		      dir, &dentry->d_name, 0);

}



static inline void fsnotify_inode(struct inode *inode, __u32 mask)
@@ -154,8 +155,10 @@ static inline void fsnotify_move(struct inode *old_dir, struct inode *new_dir, 
		new_dir_mask |= FS_ISDIR;

	}



	fsnotify_name(old_dir, old_dir_mask, source, old_name, fs_cookie);

	fsnotify_name(new_dir, new_dir_mask, source, new_name, fs_cookie);

	fsnotify_name(old_dir_mask, source, FSNOTIFY_EVENT_INODE,

		      old_dir, old_name, fs_cookie);

	fsnotify_name(new_dir_mask, source, FSNOTIFY_EVENT_INODE,

		      new_dir, new_name, fs_cookie);



	if (target)

		fsnotify_link_count(target);
@@ -209,7 +212,8 @@ static inline void fsnotify_link(struct inode *dir, struct inode *inode, 
	fsnotify_link_count(inode);

	audit_inode_child(dir, new_dentry, AUDIT_TYPE_CHILD_CREATE);



	fsnotify_name(dir, FS_CREATE, inode, &new_dentry->d_name, 0);

	fsnotify_name(FS_CREATE, inode, FSNOTIFY_EVENT_INODE,

		      dir, &new_dentry->d_name, 0);

}



/*