Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 123df294 authored by Al Viro's avatar Al Viro
Browse files

Lose the new_name argument of fsnotify_move() 



it's always new_dentry->d_name.name

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 6339204e

fs/debugfs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -496,7 +496,7 @@ struct dentry *debugfs_rename(struct dentry *old_dir, struct dentry *old_dentry, 
	}

	d_move(old_dentry, dentry);

	fsnotify_move(old_dir->d_inode, new_dir->d_inode, old_name,

		old_dentry->d_name.name, S_ISDIR(old_dentry->d_inode->i_mode),

		S_ISDIR(old_dentry->d_inode->i_mode),

		NULL, old_dentry);

	fsnotify_oldname_free(old_name);

	unlock_rename(new_dir, old_dir);

fs/namei.c

+2 −4
Original line number Diff line number Diff line
@@ -2661,11 +2661,9 @@ int vfs_rename(struct inode *old_dir, struct dentry *old_dentry, 
		error = vfs_rename_dir(old_dir,old_dentry,new_dir,new_dentry);

	else

		error = vfs_rename_other(old_dir,old_dentry,new_dir,new_dentry);

	if (!error) {

		const char *new_name = old_dentry->d_name.name;

		fsnotify_move(old_dir, new_dir, old_name, new_name, is_dir,

	if (!error)

		fsnotify_move(old_dir, new_dir, old_name, is_dir,

			      new_dentry->d_inode, old_dentry);

	}

	fsnotify_oldname_free(old_name);



	return error;

include/linux/fsnotify.h

+2 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ static inline void fsnotify_link_count(struct inode *inode) 
 * fsnotify_move - file old_name at old_dir was moved to new_name at new_dir

 */

static inline void fsnotify_move(struct inode *old_dir, struct inode *new_dir,

				 const char *old_name, const char *new_name,

				 const char *old_name,

				 int isdir, struct inode *target, struct dentry *moved)

{

	struct inode *source = moved->d_inode;
@@ -73,6 +73,7 @@ static inline void fsnotify_move(struct inode *old_dir, struct inode *new_dir, 
	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);

	const char *new_name = moved->d_name.name;



	if (old_dir == new_dir)

		old_dir_mask |= FS_DN_RENAME;