Commit f4ec3a3d authored by Al Viro's avatar Al Viro
Browse files

switch fsnotify_move() to passing const struct qstr * for old_name 



note that in the second (RENAME_EXCHANGE) call of fsnotify_move() in
vfs_rename() the old_dentry->d_name is guaranteed to be unchanged
throughout the evaluation of fsnotify_move() (by the fact that the
parent directory is locked exclusive), so we don't need to fetch
old_dentry->d_name.name in the caller.

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

fs/debugfs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -819,7 +819,7 @@ struct dentry *debugfs_rename(struct dentry *old_dir, struct dentry *old_dentry, 
		goto exit;

	}

	d_move(old_dentry, dentry);

	fsnotify_move(d_inode(old_dir), d_inode(new_dir), old_name.name.name,

	fsnotify_move(d_inode(old_dir), d_inode(new_dir), &old_name.name,

		d_is_dir(old_dentry),

		NULL, old_dentry);

	release_dentry_name_snapshot(&old_name);

fs/namei.c

+2 −2
Original line number Diff line number Diff line
@@ -4498,10 +4498,10 @@ int vfs_rename(struct inode *old_dir, struct dentry *old_dentry, 
		inode_unlock(target);

	dput(new_dentry);

	if (!error) {

		fsnotify_move(old_dir, new_dir, old_name.name.name, is_dir,

		fsnotify_move(old_dir, new_dir, &old_name.name, is_dir,

			      !(flags & RENAME_EXCHANGE) ? target : NULL, old_dentry);

		if (flags & RENAME_EXCHANGE) {

			fsnotify_move(new_dir, old_dir, old_dentry->d_name.name,

			fsnotify_move(new_dir, old_dir, &old_dentry->d_name,

				      new_is_dir, NULL, new_dentry);

		}

	}

include/linux/fsnotify.h

+2 −2
Original line number Diff line number Diff line
@@ -102,7 +102,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 unsigned char *old_name,

				 const struct qstr *old_name,

				 int isdir, struct inode *target,

				 struct dentry *moved)

{
@@ -122,7 +122,7 @@ static inline void fsnotify_move(struct inode *old_dir, struct inode *new_dir, 
		mask |= FS_ISDIR;

	}



	fsnotify(old_dir, old_dir_mask, source, FSNOTIFY_EVENT_INODE, old_name,

	fsnotify(old_dir, old_dir_mask, source, FSNOTIFY_EVENT_INODE, old_name->name,

		 fs_cookie);

	fsnotify(new_dir, new_dir_mask, source, FSNOTIFY_EVENT_INODE, new_name,

		 fs_cookie);