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

Commit 639e7a91 authored by Jeff Layton's avatar Jeff Layton Committed by Steve French
Browse files

cifs: eliminate redundant xdev check in cifs_rename 



The VFS always checks that the source and target of a rename are on the
same vfsmount, and hence have the same superblock. So, this check is
redundant. Remove it and simplify the error handling.

Signed-off-by: default avatarJeff Layton <jlayton@redhat.com>
Signed-off-by: default avatarSteve French <sfrench@us.ibm.com>
parent c8e56f1f

fs/cifs/inode.c

+9 −21
Original line number Diff line number Diff line
@@ -1462,28 +1462,17 @@ int cifs_rename(struct inode *source_dir, struct dentry *source_dentry, 
{

	char *fromName = NULL;

	char *toName = NULL;

	struct cifs_sb_info *cifs_sb_source;

	struct cifs_sb_info *cifs_sb_target;

	struct cifs_sb_info *cifs_sb;

	struct cifsTconInfo *tcon;

	FILE_UNIX_BASIC_INFO *info_buf_source = NULL;

	FILE_UNIX_BASIC_INFO *info_buf_target;

	int xid, rc, tmprc;



	cifs_sb_target = CIFS_SB(target_dir->i_sb);

	cifs_sb_source = CIFS_SB(source_dir->i_sb);

	tcon = cifs_sb_source->tcon;

	cifs_sb = CIFS_SB(source_dir->i_sb);

	tcon = cifs_sb->tcon;



	xid = GetXid();



	/*

	 * BB: this might be allowed if same server, but different share.

	 * Consider adding support for this

	 */

	if (tcon != cifs_sb_target->tcon) {

		rc = -EXDEV;

		goto cifs_rename_exit;

	}



	/*

	 * we already have the rename sem so we do not need to

	 * grab it again here to protect the path integrity
@@ -1519,17 +1508,16 @@ int cifs_rename(struct inode *source_dir, struct dentry *source_dentry, 
		info_buf_target = info_buf_source + 1;

		tmprc = CIFSSMBUnixQPathInfo(xid, tcon, fromName,

					info_buf_source,

					cifs_sb_source->local_nls,

					cifs_sb_source->mnt_cifs_flags &

					cifs_sb->local_nls,

					cifs_sb->mnt_cifs_flags &

					CIFS_MOUNT_MAP_SPECIAL_CHR);

		if (tmprc != 0)

			goto unlink_target;



		tmprc = CIFSSMBUnixQPathInfo(xid, tcon,

					toName, info_buf_target,

					cifs_sb_target->local_nls,

					/* remap based on source sb */

					cifs_sb_source->mnt_cifs_flags &

		tmprc = CIFSSMBUnixQPathInfo(xid, tcon, toName,

					info_buf_target,

					cifs_sb->local_nls,

					cifs_sb->mnt_cifs_flags &

					CIFS_MOUNT_MAP_SPECIAL_CHR);



		if (tmprc == 0 && (info_buf_source->UniqueId ==