Commit 6db75318 authored by Sweet Tea Dorminy's avatar Sweet Tea Dorminy Committed by David Sterba
Browse files

btrfs: use struct fscrypt_str instead of struct qstr 



While struct qstr is more natural without fscrypt, since it's provided
by dentries, struct fscrypt_str is provided by the fscrypt handlers
processing dentries, and is thus more natural in the fscrypt world.
Replace all of the struct qstr uses with struct fscrypt_str.

Signed-off-by: default avatarSweet Tea Dorminy <sweettea-kernel@dorminy.me>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent ab3c5c18

fs/btrfs/ctree.h

+9 −10
Original line number Diff line number Diff line
@@ -1518,10 +1518,10 @@ int btrfs_drop_subtree(struct btrfs_trans_handle *trans, 
/* root-item.c */

int btrfs_add_root_ref(struct btrfs_trans_handle *trans, u64 root_id,

		       u64 ref_id, u64 dirid, u64 sequence,

		       const struct qstr *name);

		       const struct fscrypt_str *name);

int btrfs_del_root_ref(struct btrfs_trans_handle *trans, u64 root_id,

		       u64 ref_id, u64 dirid, u64 *sequence,

		       const struct qstr *name);

		       const struct fscrypt_str *name);

int btrfs_del_root(struct btrfs_trans_handle *trans,

		   const struct btrfs_key *key);

int btrfs_insert_root(struct btrfs_trans_handle *trans, struct btrfs_root *root,
@@ -1550,23 +1550,23 @@ int btrfs_uuid_tree_iterate(struct btrfs_fs_info *fs_info); 


/* dir-item.c */

int btrfs_check_dir_item_collision(struct btrfs_root *root, u64 dir,

			  const struct qstr *name);

			  const struct fscrypt_str *name);

int btrfs_insert_dir_item(struct btrfs_trans_handle *trans,

			  const struct qstr *name, struct btrfs_inode *dir,

			  const struct fscrypt_str *name, struct btrfs_inode *dir,

			  struct btrfs_key *location, u8 type, u64 index);

struct btrfs_dir_item *btrfs_lookup_dir_item(struct btrfs_trans_handle *trans,

					     struct btrfs_root *root,

					     struct btrfs_path *path, u64 dir,

					     const struct qstr *name, int mod);

					     const struct fscrypt_str *name, int mod);

struct btrfs_dir_item *

btrfs_lookup_dir_index_item(struct btrfs_trans_handle *trans,

			    struct btrfs_root *root,

			    struct btrfs_path *path, u64 dir,

			    u64 index, const struct qstr *name, int mod);

			    u64 index, const struct fscrypt_str *name, int mod);

struct btrfs_dir_item *

btrfs_search_dir_index_item(struct btrfs_root *root,

			    struct btrfs_path *path, u64 dirid,

			    const struct qstr *name);

			    const struct fscrypt_str *name);

int btrfs_delete_one_dir_name(struct btrfs_trans_handle *trans,

			      struct btrfs_root *root,

			      struct btrfs_path *path,
@@ -1647,10 +1647,10 @@ struct inode *btrfs_lookup_dentry(struct inode *dir, struct dentry *dentry); 
int btrfs_set_inode_index(struct btrfs_inode *dir, u64 *index);

int btrfs_unlink_inode(struct btrfs_trans_handle *trans,

		       struct btrfs_inode *dir, struct btrfs_inode *inode,

		       const struct qstr *name);

		       const struct fscrypt_str *name);

int btrfs_add_link(struct btrfs_trans_handle *trans,

		   struct btrfs_inode *parent_inode, struct btrfs_inode *inode,

		   const struct qstr *name, int add_backref, u64 index);

		   const struct fscrypt_str *name, int add_backref, u64 index);

int btrfs_delete_subvolume(struct inode *dir, struct dentry *dentry);

int btrfs_truncate_block(struct btrfs_inode *inode, loff_t from, loff_t len,

			 int front);
@@ -1676,7 +1676,6 @@ struct btrfs_new_inode_args { 
	struct posix_acl *default_acl;

	struct posix_acl *acl;

	struct fscrypt_name fname;

	struct qstr name;

};

int btrfs_new_inode_prepare(struct btrfs_new_inode_args *args,

			    unsigned int *trans_num_items);

fs/btrfs/dir-item.c

+5 −5
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ int btrfs_insert_xattr_item(struct btrfs_trans_handle *trans, 
 * Will return 0 or -ENOMEM

 */

int btrfs_insert_dir_item(struct btrfs_trans_handle *trans,

			  const struct qstr *name, struct btrfs_inode *dir,

			  const struct fscrypt_str *name, struct btrfs_inode *dir,

			  struct btrfs_key *location, u8 type, u64 index)

{

	int ret = 0;
@@ -208,7 +208,7 @@ static struct btrfs_dir_item *btrfs_lookup_match_dir( 
struct btrfs_dir_item *btrfs_lookup_dir_item(struct btrfs_trans_handle *trans,

					     struct btrfs_root *root,

					     struct btrfs_path *path, u64 dir,

					     const struct qstr *name,

					     const struct fscrypt_str *name,

					     int mod)

{

	struct btrfs_key key;
@@ -227,7 +227,7 @@ struct btrfs_dir_item *btrfs_lookup_dir_item(struct btrfs_trans_handle *trans, 
}



int btrfs_check_dir_item_collision(struct btrfs_root *root, u64 dir,

				   const struct qstr *name)

				   const struct fscrypt_str *name)

{

	int ret;

	struct btrfs_key key;
@@ -304,7 +304,7 @@ struct btrfs_dir_item * 
btrfs_lookup_dir_index_item(struct btrfs_trans_handle *trans,

			    struct btrfs_root *root,

			    struct btrfs_path *path, u64 dir,

			    u64 index, const struct qstr *name, int mod)

			    u64 index, const struct fscrypt_str *name, int mod)

{

	struct btrfs_dir_item *di;

	struct btrfs_key key;
@@ -323,7 +323,7 @@ btrfs_lookup_dir_index_item(struct btrfs_trans_handle *trans, 


struct btrfs_dir_item *

btrfs_search_dir_index_item(struct btrfs_root *root, struct btrfs_path *path,

			    u64 dirid, const struct qstr *name)

			    u64 dirid, const struct fscrypt_str *name)

{

	struct btrfs_dir_item *di;

	struct btrfs_key key;

fs/btrfs/inode-item.c

+7 −7
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 


struct btrfs_inode_ref *btrfs_find_name_in_backref(struct extent_buffer *leaf,

						   int slot,

						   const struct qstr *name)

						   const struct fscrypt_str *name)

{

	struct btrfs_inode_ref *ref;

	unsigned long ptr;
@@ -42,7 +42,7 @@ struct btrfs_inode_ref *btrfs_find_name_in_backref(struct extent_buffer *leaf, 


struct btrfs_inode_extref *btrfs_find_name_in_ext_backref(

		struct extent_buffer *leaf, int slot, u64 ref_objectid,

		const struct qstr *name)

		const struct fscrypt_str *name)

{

	struct btrfs_inode_extref *extref;

	unsigned long ptr;
@@ -81,7 +81,7 @@ struct btrfs_inode_extref * 
btrfs_lookup_inode_extref(struct btrfs_trans_handle *trans,

			  struct btrfs_root *root,

			  struct btrfs_path *path,

			  const struct qstr *name,

			  const struct fscrypt_str *name,

			  u64 inode_objectid, u64 ref_objectid, int ins_len,

			  int cow)

{
@@ -104,7 +104,7 @@ btrfs_lookup_inode_extref(struct btrfs_trans_handle *trans, 


static int btrfs_del_inode_extref(struct btrfs_trans_handle *trans,

				  struct btrfs_root *root,

				  const struct qstr *name,

				  const struct fscrypt_str *name,

				  u64 inode_objectid, u64 ref_objectid,

				  u64 *index)

{
@@ -174,7 +174,7 @@ static int btrfs_del_inode_extref(struct btrfs_trans_handle *trans, 
}



int btrfs_del_inode_ref(struct btrfs_trans_handle *trans,

			struct btrfs_root *root, const struct qstr *name,

			struct btrfs_root *root, const struct fscrypt_str *name,

			u64 inode_objectid, u64 ref_objectid, u64 *index)

{

	struct btrfs_path *path;
@@ -251,7 +251,7 @@ int btrfs_del_inode_ref(struct btrfs_trans_handle *trans, 
 */

static int btrfs_insert_inode_extref(struct btrfs_trans_handle *trans,

				     struct btrfs_root *root,

				     const struct qstr *name,

				     const struct fscrypt_str *name,

				     u64 inode_objectid, u64 ref_objectid,

				     u64 index)

{
@@ -306,7 +306,7 @@ static int btrfs_insert_inode_extref(struct btrfs_trans_handle *trans, 


/* Will return 0, -ENOMEM, -EMLINK, or -EEXIST or anything from the CoW path */

int btrfs_insert_inode_ref(struct btrfs_trans_handle *trans,

			   struct btrfs_root *root, const struct qstr *name,

			   struct btrfs_root *root, const struct fscrypt_str *name,

			   u64 inode_objectid, u64 ref_objectid, u64 index)

{

	struct btrfs_fs_info *fs_info = root->fs_info;

fs/btrfs/inode-item.h

+5 −5
Original line number Diff line number Diff line
@@ -64,10 +64,10 @@ int btrfs_truncate_inode_items(struct btrfs_trans_handle *trans, 
			       struct btrfs_root *root,

			       struct btrfs_truncate_control *control);

int btrfs_insert_inode_ref(struct btrfs_trans_handle *trans,

			   struct btrfs_root *root, const struct qstr *name,

			   struct btrfs_root *root, const struct fscrypt_str *name,

			   u64 inode_objectid, u64 ref_objectid, u64 index);

int btrfs_del_inode_ref(struct btrfs_trans_handle *trans,

			struct btrfs_root *root, const struct qstr *name,

			struct btrfs_root *root, const struct fscrypt_str *name,

			u64 inode_objectid, u64 ref_objectid, u64 *index);

int btrfs_insert_empty_inode(struct btrfs_trans_handle *trans,

			     struct btrfs_root *root,
@@ -80,15 +80,15 @@ struct btrfs_inode_extref *btrfs_lookup_inode_extref( 
			  struct btrfs_trans_handle *trans,

			  struct btrfs_root *root,

			  struct btrfs_path *path,

			  const struct qstr *name,

			  const struct fscrypt_str *name,

			  u64 inode_objectid, u64 ref_objectid, int ins_len,

			  int cow);



struct btrfs_inode_ref *btrfs_find_name_in_backref(struct extent_buffer *leaf,

						   int slot,

						   const struct qstr *name);

						   const struct fscrypt_str *name);

struct btrfs_inode_extref *btrfs_find_name_in_ext_backref(

		struct extent_buffer *leaf, int slot, u64 ref_objectid,

		const struct qstr *name);

		const struct fscrypt_str *name);



#endif

fs/btrfs/inode.c

+34 −53
Original line number Diff line number Diff line
@@ -4286,7 +4286,7 @@ int btrfs_update_inode_fallback(struct btrfs_trans_handle *trans, 
static int __btrfs_unlink_inode(struct btrfs_trans_handle *trans,

				struct btrfs_inode *dir,

				struct btrfs_inode *inode,

				const struct qstr *name,

				const struct fscrypt_str *name,

				struct btrfs_rename_ctx *rename_ctx)

{

	struct btrfs_root *root = dir->root;
@@ -4389,7 +4389,7 @@ static int __btrfs_unlink_inode(struct btrfs_trans_handle *trans, 


int btrfs_unlink_inode(struct btrfs_trans_handle *trans,

		       struct btrfs_inode *dir, struct btrfs_inode *inode,

		       const struct qstr *name)

		       const struct fscrypt_str *name)

{

	int ret;
@@ -4430,12 +4430,10 @@ static int btrfs_unlink(struct inode *dir, struct dentry *dentry) 
	struct inode *inode = d_inode(dentry);

	int ret;

	struct fscrypt_name fname;

	struct qstr name;



	ret = fscrypt_setup_filename(dir, &dentry->d_name, 1, &fname);

	if (ret)

		return ret;

	name = (struct qstr)FSTR_TO_QSTR(&fname.disk_name);



	/* This needs to handle no-key deletions later on */
@@ -4449,7 +4447,7 @@ static int btrfs_unlink(struct inode *dir, struct dentry *dentry) 
			0);



	ret = btrfs_unlink_inode(trans, BTRFS_I(dir), BTRFS_I(d_inode(dentry)),

				 &name);

				 &fname.disk_name);

	if (ret)

		goto end_trans;
@@ -4476,7 +4474,6 @@ static int btrfs_unlink_subvol(struct btrfs_trans_handle *trans, 
	struct extent_buffer *leaf;

	struct btrfs_dir_item *di;

	struct btrfs_key key;

	struct qstr name;

	u64 index;

	int ret;

	u64 objectid;
@@ -4486,7 +4483,6 @@ static int btrfs_unlink_subvol(struct btrfs_trans_handle *trans, 
	ret = fscrypt_setup_filename(dir, &dentry->d_name, 1, &fname);

	if (ret)

		return ret;

	name = (struct qstr)FSTR_TO_QSTR(&fname.disk_name);



	/* This needs to handle no-key deletions later on */
@@ -4506,7 +4502,8 @@ static int btrfs_unlink_subvol(struct btrfs_trans_handle *trans, 
		goto out;

	}



	di = btrfs_lookup_dir_item(trans, root, path, dir_ino, &name, -1);

	di = btrfs_lookup_dir_item(trans, root, path, dir_ino,

				   &fname.disk_name, -1);

	if (IS_ERR_OR_NULL(di)) {

		ret = di ? PTR_ERR(di) : -ENOENT;

		goto out;
@@ -4532,7 +4529,7 @@ static int btrfs_unlink_subvol(struct btrfs_trans_handle *trans, 
	 * call btrfs_del_root_ref, and it _shouldn't_ fail.

	 */

	if (btrfs_ino(inode) == BTRFS_EMPTY_SUBVOL_DIR_OBJECTID) {

		di = btrfs_search_dir_index_item(root, path, dir_ino, &name);

		di = btrfs_search_dir_index_item(root, path, dir_ino, &fname.disk_name);

		if (IS_ERR_OR_NULL(di)) {

			if (!di)

				ret = -ENOENT;
@@ -4549,7 +4546,7 @@ static int btrfs_unlink_subvol(struct btrfs_trans_handle *trans, 
	} else {

		ret = btrfs_del_root_ref(trans, objectid,

					 root->root_key.objectid, dir_ino,

					 &index, &name);

					 &index, &fname.disk_name);

		if (ret) {

			btrfs_abort_transaction(trans, ret);

			goto out;
@@ -4562,7 +4559,7 @@ static int btrfs_unlink_subvol(struct btrfs_trans_handle *trans, 
		goto out;

	}



	btrfs_i_size_write(BTRFS_I(dir), dir->i_size - name.len * 2);

	btrfs_i_size_write(BTRFS_I(dir), dir->i_size - fname.disk_name.len * 2);

	inode_inc_iversion(dir);

	dir->i_mtime = current_time(dir);

	dir->i_ctime = dir->i_mtime;
@@ -4585,7 +4582,7 @@ static noinline int may_destroy_subvol(struct btrfs_root *root) 
	struct btrfs_path *path;

	struct btrfs_dir_item *di;

	struct btrfs_key key;

	struct qstr name = QSTR_INIT("default", 7);

	struct fscrypt_str name = FSTR_INIT("default", 7);

	u64 dir_id;

	int ret;
@@ -4836,7 +4833,6 @@ static int btrfs_rmdir(struct inode *dir, struct dentry *dentry) 
	struct btrfs_trans_handle *trans;

	u64 last_unlink_trans;

	struct fscrypt_name fname;

	struct qstr name;



	if (inode->i_size > BTRFS_EMPTY_DIR_SIZE)

		return -ENOTEMPTY;
@@ -4852,7 +4848,6 @@ static int btrfs_rmdir(struct inode *dir, struct dentry *dentry) 
	err = fscrypt_setup_filename(dir, &dentry->d_name, 1, &fname);

	if (err)

		return err;

	name = (struct qstr)FSTR_TO_QSTR(&fname.disk_name);



	/* This needs to handle no-key deletions later on */
@@ -4875,7 +4870,7 @@ static int btrfs_rmdir(struct inode *dir, struct dentry *dentry) 


	/* now the directory is empty */

	err = btrfs_unlink_inode(trans, BTRFS_I(dir), BTRFS_I(d_inode(dentry)),

				 &name);

				 &fname.disk_name);

	if (!err) {

		btrfs_i_size_write(BTRFS_I(inode), 0);

		/*
@@ -5569,7 +5564,6 @@ void btrfs_evict_inode(struct inode *inode) 
static int btrfs_inode_by_name(struct inode *dir, struct dentry *dentry,

			       struct btrfs_key *location, u8 *type)

{

	struct qstr name;

	struct btrfs_dir_item *di;

	struct btrfs_path *path;

	struct btrfs_root *root = BTRFS_I(dir)->root;
@@ -5584,12 +5578,10 @@ static int btrfs_inode_by_name(struct inode *dir, struct dentry *dentry, 
	if (ret)

		goto out;



	name = (struct qstr)FSTR_TO_QSTR(&fname.disk_name);



	/* This needs to handle no-key deletions later on */



	di = btrfs_lookup_dir_item(NULL, root, path, btrfs_ino(BTRFS_I(dir)),

				   &name, 0);

				   &fname.disk_name, 0);

	if (IS_ERR_OR_NULL(di)) {

		ret = di ? PTR_ERR(di) : -ENOENT;

		goto out;
@@ -5601,7 +5593,7 @@ static int btrfs_inode_by_name(struct inode *dir, struct dentry *dentry, 
		ret = -EUCLEAN;

		btrfs_warn(root->fs_info,

"%s gets something invalid in DIR_ITEM (name %s, directory ino %llu, location(%llu %u %llu))",

			   __func__, name.name, btrfs_ino(BTRFS_I(dir)),

			   __func__, fname.disk_name.name, btrfs_ino(BTRFS_I(dir)),

			   location->objectid, location->type, location->offset);

	}

	if (!ret)
@@ -5631,14 +5623,11 @@ static int fixup_tree_root_location(struct btrfs_fs_info *fs_info, 
	int ret;

	int err = 0;

	struct fscrypt_name fname;

	struct qstr name;



	ret = fscrypt_setup_filename(dir, &dentry->d_name, 0, &fname);

	if (ret)

		return ret;



	name = (struct qstr)FSTR_TO_QSTR(&fname.disk_name);



	path = btrfs_alloc_path();

	if (!path) {

		err = -ENOMEM;
@@ -5660,11 +5649,11 @@ static int fixup_tree_root_location(struct btrfs_fs_info *fs_info, 
	leaf = path->nodes[0];

	ref = btrfs_item_ptr(leaf, path->slots[0], struct btrfs_root_ref);

	if (btrfs_root_ref_dirid(leaf, ref) != btrfs_ino(BTRFS_I(dir)) ||

	    btrfs_root_ref_name_len(leaf, ref) != name.len)

	    btrfs_root_ref_name_len(leaf, ref) != fname.disk_name.len)

		goto out;



	ret = memcmp_extent_buffer(leaf, name.name, (unsigned long)(ref + 1),

				   name.len);

	ret = memcmp_extent_buffer(leaf, fname.disk_name.name,

				   (unsigned long)(ref + 1), fname.disk_name.len);

	if (ret)

		goto out;
@@ -6297,7 +6286,6 @@ int btrfs_new_inode_prepare(struct btrfs_new_inode_args *args, 
					     &args->fname);

		if (ret)

			return ret;

		args->name = (struct qstr)FSTR_TO_QSTR(&args->fname.disk_name);

	}



	ret = posix_acl_create(dir, &inode->i_mode, &args->default_acl, &args->acl);
@@ -6380,7 +6368,7 @@ int btrfs_create_new_inode(struct btrfs_trans_handle *trans, 
{

	struct inode *dir = args->dir;

	struct inode *inode = args->inode;

	const struct qstr *name = args->orphan ? NULL : &args->dentry->d_name;

	const struct fscrypt_str *name = args->orphan ? NULL : &args->fname.disk_name;

	struct btrfs_fs_info *fs_info = btrfs_sb(dir->i_sb);

	struct btrfs_root *root;

	struct btrfs_inode_item *inode_item;
@@ -6615,7 +6603,7 @@ int btrfs_create_new_inode(struct btrfs_trans_handle *trans, 
 */

int btrfs_add_link(struct btrfs_trans_handle *trans,

		   struct btrfs_inode *parent_inode, struct btrfs_inode *inode,

		   const struct qstr *name, int add_backref, u64 index)

		   const struct fscrypt_str *name, int add_backref, u64 index)

{

	int ret = 0;

	struct btrfs_key key;
@@ -6771,7 +6759,6 @@ static int btrfs_link(struct dentry *old_dentry, struct inode *dir, 
	struct inode *inode = d_inode(old_dentry);

	struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);

	struct fscrypt_name fname;

	struct qstr name;

	u64 index;

	int err;

	int drop_inode = 0;
@@ -6787,8 +6774,6 @@ static int btrfs_link(struct dentry *old_dentry, struct inode *dir, 
	if (err)

		goto fail;



	name = (struct qstr)FSTR_TO_QSTR(&fname.disk_name);



	err = btrfs_set_inode_index(BTRFS_I(dir), &index);

	if (err)

		goto fail;
@@ -6815,7 +6800,7 @@ static int btrfs_link(struct dentry *old_dentry, struct inode *dir, 
	set_bit(BTRFS_INODE_COPY_EVERYTHING, &BTRFS_I(inode)->runtime_flags);



	err = btrfs_add_link(trans, BTRFS_I(dir), BTRFS_I(inode),

			     &name, 1, index);

			     &fname.disk_name, 1, index);



	if (err) {

		drop_inode = 1;
@@ -9080,7 +9065,7 @@ static int btrfs_rename_exchange(struct inode *old_dir, 
	int ret2;

	bool need_abort = false;

	struct fscrypt_name old_fname, new_fname;

	struct qstr old_name, new_name;

	struct fscrypt_str *old_name, *new_name;



	/*

	 * For non-subvolumes allow exchange only within one subvolume, in the
@@ -9102,8 +9087,8 @@ static int btrfs_rename_exchange(struct inode *old_dir, 
		return ret;

	}



	old_name = (struct qstr)FSTR_TO_QSTR(&old_fname.disk_name);

	new_name = (struct qstr)FSTR_TO_QSTR(&new_fname.disk_name);

	old_name = &old_fname.disk_name;

	new_name = &new_fname.disk_name;



	/* close the race window with snapshot create/destroy ioctl */

	if (old_ino == BTRFS_FIRST_FREE_OBJECTID ||
@@ -9172,7 +9157,7 @@ static int btrfs_rename_exchange(struct inode *old_dir, 
		/* force full log commit if subvolume involved. */

		btrfs_set_log_full_commit(trans);

	} else {

		ret = btrfs_insert_inode_ref(trans, dest, &new_name, old_ino,

		ret = btrfs_insert_inode_ref(trans, dest, new_name, old_ino,

					     btrfs_ino(BTRFS_I(new_dir)),

					     old_idx);

		if (ret)
@@ -9185,7 +9170,7 @@ static int btrfs_rename_exchange(struct inode *old_dir, 
		/* force full log commit if subvolume involved. */

		btrfs_set_log_full_commit(trans);

	} else {

		ret = btrfs_insert_inode_ref(trans, root, &old_name, new_ino,

		ret = btrfs_insert_inode_ref(trans, root, old_name, new_ino,

					     btrfs_ino(BTRFS_I(old_dir)),

					     new_idx);

		if (ret) {
@@ -9220,7 +9205,7 @@ static int btrfs_rename_exchange(struct inode *old_dir, 
	} else { /* src is an inode */

		ret = __btrfs_unlink_inode(trans, BTRFS_I(old_dir),

					   BTRFS_I(old_dentry->d_inode),

					   &old_name, &old_rename_ctx);

					   old_name, &old_rename_ctx);

		if (!ret)

			ret = btrfs_update_inode(trans, root, BTRFS_I(old_inode));

	}
@@ -9235,7 +9220,7 @@ static int btrfs_rename_exchange(struct inode *old_dir, 
	} else { /* dest is an inode */

		ret = __btrfs_unlink_inode(trans, BTRFS_I(new_dir),

					   BTRFS_I(new_dentry->d_inode),

					   &new_name, &new_rename_ctx);

					   new_name, &new_rename_ctx);

		if (!ret)

			ret = btrfs_update_inode(trans, dest, BTRFS_I(new_inode));

	}
@@ -9245,14 +9230,14 @@ static int btrfs_rename_exchange(struct inode *old_dir, 
	}



	ret = btrfs_add_link(trans, BTRFS_I(new_dir), BTRFS_I(old_inode),

			     &new_name, 0, old_idx);

			     new_name, 0, old_idx);

	if (ret) {

		btrfs_abort_transaction(trans, ret);

		goto out_fail;

	}



	ret = btrfs_add_link(trans, BTRFS_I(old_dir), BTRFS_I(new_inode),

			     &old_name, 0, new_idx);

			     old_name, 0, new_idx);

	if (ret) {

		btrfs_abort_transaction(trans, ret);

		goto out_fail;
@@ -9337,7 +9322,6 @@ static int btrfs_rename(struct user_namespace *mnt_userns, 
	int ret2;

	u64 old_ino = btrfs_ino(BTRFS_I(old_inode));

	struct fscrypt_name old_fname, new_fname;

	struct qstr old_name, new_name;



	if (btrfs_ino(BTRFS_I(new_dir)) == BTRFS_EMPTY_SUBVOL_DIR_OBJECTID)

		return -EPERM;
@@ -9364,12 +9348,8 @@ static int btrfs_rename(struct user_namespace *mnt_userns, 
		return ret;

	}



	old_name = (struct qstr)FSTR_TO_QSTR(&old_fname.disk_name);

	new_name = (struct qstr)FSTR_TO_QSTR(&new_fname.disk_name);



	/* check for collisions, even if the  name isn't there */

	ret = btrfs_check_dir_item_collision(dest, new_dir->i_ino, &new_name);



	ret = btrfs_check_dir_item_collision(dest, new_dir->i_ino, &new_fname.disk_name);

	if (ret) {

		if (ret == -EEXIST) {

			/* we shouldn't get
@@ -9462,8 +9442,9 @@ static int btrfs_rename(struct user_namespace *mnt_userns, 
		/* force full log commit if subvolume involved. */

		btrfs_set_log_full_commit(trans);

	} else {

		ret = btrfs_insert_inode_ref(trans, dest, &new_name, old_ino,

					     btrfs_ino(BTRFS_I(new_dir)), index);

		ret = btrfs_insert_inode_ref(trans, dest, &new_fname.disk_name,

					     old_ino, btrfs_ino(BTRFS_I(new_dir)),

					     index);

		if (ret)

			goto out_fail;

	}
@@ -9486,7 +9467,7 @@ static int btrfs_rename(struct user_namespace *mnt_userns, 
	} else {

		ret = __btrfs_unlink_inode(trans, BTRFS_I(old_dir),

					   BTRFS_I(d_inode(old_dentry)),

					   &old_name, &rename_ctx);

					   &old_fname.disk_name, &rename_ctx);

		if (!ret)

			ret = btrfs_update_inode(trans, root, BTRFS_I(old_inode));

	}
@@ -9505,7 +9486,7 @@ static int btrfs_rename(struct user_namespace *mnt_userns, 
		} else {

			ret = btrfs_unlink_inode(trans, BTRFS_I(new_dir),

						 BTRFS_I(d_inode(new_dentry)),

						 &new_name);

						 &new_fname.disk_name);

		}

		if (!ret && new_inode->i_nlink == 0)

			ret = btrfs_orphan_add(trans,
@@ -9517,7 +9498,7 @@ static int btrfs_rename(struct user_namespace *mnt_userns, 
	}



	ret = btrfs_add_link(trans, BTRFS_I(new_dir), BTRFS_I(old_inode),

			     &new_name, 0, index);

			     &new_fname.disk_name, 0, index);

	if (ret) {

		btrfs_abort_transaction(trans, ret);

		goto out_fail;