Commit 9add2945 authored by Lu Fengqi's avatar Lu Fengqi Committed by David Sterba
Browse files

btrfs: Remove fs_info from btrfs_delete_delayed_dir_index 



It can be referenced from the passed transaction handle.

Signed-off-by: default avatarLu Fengqi <lufq.fnst@cn.fujitsu.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 4465c8b4

fs/btrfs/delayed-inode.c

+3 −3
Original line number Diff line number Diff line
@@ -1493,7 +1493,6 @@ static int btrfs_delete_delayed_insertion_item(struct btrfs_fs_info *fs_info, 
}



int btrfs_delete_delayed_dir_index(struct btrfs_trans_handle *trans,

				   struct btrfs_fs_info *fs_info,

				   struct btrfs_inode *dir, u64 index)

{

	struct btrfs_delayed_node *node;
@@ -1509,7 +1508,8 @@ int btrfs_delete_delayed_dir_index(struct btrfs_trans_handle *trans, 
	item_key.type = BTRFS_DIR_INDEX_KEY;

	item_key.offset = index;



	ret = btrfs_delete_delayed_insertion_item(fs_info, node, &item_key);

	ret = btrfs_delete_delayed_insertion_item(trans->fs_info, node,

						  &item_key);

	if (!ret)

		goto end;
@@ -1531,7 +1531,7 @@ int btrfs_delete_delayed_dir_index(struct btrfs_trans_handle *trans, 
	mutex_lock(&node->mutex);

	ret = __btrfs_add_delayed_deletion_item(node, item);

	if (unlikely(ret)) {

		btrfs_err(fs_info,

		btrfs_err(trans->fs_info,

			  "err add delayed dir index item(index: %llu) into the deletion tree of the delayed node(root id: %llu, inode id: %llu, errno: %d)",

			  index, node->root->objectid, node->inode_id, ret);

		BUG();

fs/btrfs/delayed-inode.h

+0 −1
Original line number Diff line number Diff line
@@ -92,7 +92,6 @@ int btrfs_insert_delayed_dir_index(struct btrfs_trans_handle *trans, 
				   u64 index);



int btrfs_delete_delayed_dir_index(struct btrfs_trans_handle *trans,

				   struct btrfs_fs_info *fs_info,

				   struct btrfs_inode *dir, u64 index);



int btrfs_inode_delayed_dir_index_count(struct btrfs_inode *inode);

fs/btrfs/inode.c

+2 −2
Original line number Diff line number Diff line
@@ -3978,7 +3978,7 @@ static int __btrfs_unlink_inode(struct btrfs_trans_handle *trans, 
		goto err;

	}

skip_backref:

	ret = btrfs_delete_delayed_dir_index(trans, fs_info, dir, index);

	ret = btrfs_delete_delayed_dir_index(trans, dir, index);

	if (ret) {

		btrfs_abort_transaction(trans, ret);

		goto err;
@@ -4144,7 +4144,7 @@ static int btrfs_unlink_subvol(struct btrfs_trans_handle *trans, 
	}

	btrfs_release_path(path);



	ret = btrfs_delete_delayed_dir_index(trans, fs_info, BTRFS_I(dir), index);

	ret = btrfs_delete_delayed_dir_index(trans, BTRFS_I(dir), index);

	if (ret) {

		btrfs_abort_transaction(trans, ret);

		goto out;