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

Commit 5998a21b authored by Eric Biggers's avatar Eric Biggers Committed by Jaegeuk Kim
Browse files

f2fs: switch to fscrypt_prepare_rename() 



Reviewed-by: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent dd5ca5fe

fs/f2fs/namei.c

+7 −24
Original line number Diff line number Diff line
@@ -790,18 +790,6 @@ static int f2fs_rename(struct inode *old_dir, struct dentry *old_dentry, 
	if (unlikely(f2fs_cp_error(sbi)))

		return -EIO;



	if ((f2fs_encrypted_inode(old_dir) &&

			!fscrypt_has_encryption_key(old_dir)) ||

			(f2fs_encrypted_inode(new_dir) &&

			!fscrypt_has_encryption_key(new_dir)))

		return -ENOKEY;



	if ((old_dir != new_dir) && f2fs_encrypted_inode(new_dir) &&

			!fscrypt_has_permitted_context(new_dir, old_inode)) {

		err = -EPERM;

		goto out;

	}



	if (is_inode_flag_set(new_dir, FI_PROJ_INHERIT) &&

			(!projid_eq(F2FS_I(new_dir)->i_projid,

			F2FS_I(old_dentry->d_inode)->i_projid)))
@@ -985,18 +973,6 @@ static int f2fs_cross_rename(struct inode *old_dir, struct dentry *old_dentry, 
	if (unlikely(f2fs_cp_error(sbi)))

		return -EIO;



	if ((f2fs_encrypted_inode(old_dir) &&

			!fscrypt_has_encryption_key(old_dir)) ||

			(f2fs_encrypted_inode(new_dir) &&

			!fscrypt_has_encryption_key(new_dir)))

		return -ENOKEY;



	if ((f2fs_encrypted_inode(old_dir) || f2fs_encrypted_inode(new_dir)) &&

			(old_dir != new_dir) &&

			(!fscrypt_has_permitted_context(new_dir, old_inode) ||

			 !fscrypt_has_permitted_context(old_dir, new_inode)))

		return -EPERM;



	if ((is_inode_flag_set(new_dir, FI_PROJ_INHERIT) &&

			!projid_eq(F2FS_I(new_dir)->i_projid,

			F2FS_I(old_dentry->d_inode)->i_projid)) ||
@@ -1132,9 +1108,16 @@ static int f2fs_rename2(struct inode *old_dir, struct dentry *old_dentry, 
			struct inode *new_dir, struct dentry *new_dentry,

			unsigned int flags)

{

	int err;



	if (flags & ~(RENAME_NOREPLACE | RENAME_EXCHANGE | RENAME_WHITEOUT))

		return -EINVAL;



	err = fscrypt_prepare_rename(old_dir, old_dentry, new_dir, new_dentry,

				     flags);

	if (err)

		return err;



	if (flags & RENAME_EXCHANGE) {

		return f2fs_cross_rename(old_dir, old_dentry,

					 new_dir, new_dentry);