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

Commit e5c304e6 authored by Nikolay Borisov's avatar Nikolay Borisov Committed by David Sterba
Browse files

btrfs: Don't pass fs_info to btrfs_run_delayed_items/_nr 



We already pass the transaction which has a reference to the fs_info,
so use that. No functional changes.

Signed-off-by: default avatarNikolay Borisov <nborisov@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent b84acab3

fs/btrfs/delayed-inode.c

+2 −4
Original line number Diff line number Diff line
@@ -1162,14 +1162,12 @@ static int __btrfs_run_delayed_items(struct btrfs_trans_handle *trans, int nr) 
	return ret;

}



int btrfs_run_delayed_items(struct btrfs_trans_handle *trans,

			    struct btrfs_fs_info *fs_info)

int btrfs_run_delayed_items(struct btrfs_trans_handle *trans)

{

	return __btrfs_run_delayed_items(trans, -1);

}



int btrfs_run_delayed_items_nr(struct btrfs_trans_handle *trans,

			       struct btrfs_fs_info *fs_info, int nr)

int btrfs_run_delayed_items_nr(struct btrfs_trans_handle *trans, int nr)

{

	return __btrfs_run_delayed_items(trans, nr);

}

fs/btrfs/delayed-inode.h

+2 −4
Original line number Diff line number Diff line
@@ -111,10 +111,8 @@ int btrfs_delete_delayed_dir_index(struct btrfs_trans_handle *trans, 


int btrfs_inode_delayed_dir_index_count(struct btrfs_inode *inode);



int btrfs_run_delayed_items(struct btrfs_trans_handle *trans,

			    struct btrfs_fs_info *fs_info);

int btrfs_run_delayed_items_nr(struct btrfs_trans_handle *trans,

			       struct btrfs_fs_info *fs_info, int nr);

int btrfs_run_delayed_items(struct btrfs_trans_handle *trans);

int btrfs_run_delayed_items_nr(struct btrfs_trans_handle *trans, int nr);



void btrfs_balance_delayed_items(struct btrfs_fs_info *fs_info);

fs/btrfs/extent-tree.c

+1 −1
Original line number Diff line number Diff line
@@ -4994,7 +4994,7 @@ static void flush_space(struct btrfs_fs_info *fs_info, 
			ret = PTR_ERR(trans);

			break;

		}

		ret = btrfs_run_delayed_items_nr(trans, fs_info, nr);

		ret = btrfs_run_delayed_items_nr(trans, nr);

		btrfs_end_transaction(trans);

		break;

	case FLUSH_DELALLOC:

fs/btrfs/transaction.c

+4 −4
Original line number Diff line number Diff line
@@ -1530,7 +1530,7 @@ static noinline int create_pending_snapshot(struct btrfs_trans_handle *trans, 
	 * otherwise we corrupt the FS during

	 * snapshot

	 */

	ret = btrfs_run_delayed_items(trans, fs_info);

	ret = btrfs_run_delayed_items(trans);

	if (ret) {	/* Transaction aborted */

		btrfs_abort_transaction(trans, ret);

		goto fail;
@@ -2067,7 +2067,7 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans) 
	if (ret)

		goto cleanup_transaction;



	ret = btrfs_run_delayed_items(trans, fs_info);

	ret = btrfs_run_delayed_items(trans);

	if (ret)

		goto cleanup_transaction;
@@ -2075,7 +2075,7 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans) 
		   extwriter_counter_read(cur_trans) == 0);



	/* some pending stuffs might be added after the previous flush. */

	ret = btrfs_run_delayed_items(trans, fs_info);

	ret = btrfs_run_delayed_items(trans);

	if (ret)

		goto cleanup_transaction;
@@ -2128,7 +2128,7 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans) 
	 * because all the tree which are snapshoted will be forced to COW

	 * the nodes and leaves.

	 */

	ret = btrfs_run_delayed_items(trans, fs_info);

	ret = btrfs_run_delayed_items(trans);

	if (ret) {

		mutex_unlock(&fs_info->reloc_mutex);

		goto scrub_continue;

fs/btrfs/tree-log.c

+4 −8
Original line number Diff line number Diff line
@@ -853,7 +853,6 @@ static noinline int drop_one_dir_item(struct btrfs_trans_handle *trans, 
				      struct btrfs_inode *dir,

				      struct btrfs_dir_item *di)

{

	struct btrfs_fs_info *fs_info = root->fs_info;

	struct inode *inode;

	char *name;

	int name_len;
@@ -887,7 +886,7 @@ static noinline int drop_one_dir_item(struct btrfs_trans_handle *trans, 
	if (ret)

		goto out;

	else

		ret = btrfs_run_delayed_items(trans, fs_info);

		ret = btrfs_run_delayed_items(trans);

out:

	kfree(name);

	iput(inode);
@@ -1007,7 +1006,6 @@ static inline int __add_inode_ref(struct btrfs_trans_handle *trans, 
				  u64 ref_index, char *name, int namelen,

				  int *search_done)

{

	struct btrfs_fs_info *fs_info = root->fs_info;

	int ret;

	char *victim_name;

	int victim_name_len;
@@ -1065,7 +1063,7 @@ static inline int __add_inode_ref(struct btrfs_trans_handle *trans, 
				kfree(victim_name);

				if (ret)

					return ret;

				ret = btrfs_run_delayed_items(trans, fs_info);

				ret = btrfs_run_delayed_items(trans);

				if (ret)

					return ret;

				*search_done = 1;
@@ -1136,8 +1134,7 @@ static inline int __add_inode_ref(struct btrfs_trans_handle *trans, 
							victim_name_len);

					if (!ret)

						ret = btrfs_run_delayed_items(

								  trans,

								  fs_info);

								  trans);

				}

				iput(victim_parent);

				kfree(victim_name);
@@ -2098,7 +2095,6 @@ static noinline int check_item_in_log(struct btrfs_trans_handle *trans, 
				      struct inode *dir,

				      struct btrfs_key *dir_key)

{

	struct btrfs_fs_info *fs_info = root->fs_info;

	int ret;

	struct extent_buffer *eb;

	int slot;
@@ -2162,7 +2158,7 @@ static noinline int check_item_in_log(struct btrfs_trans_handle *trans, 
			ret = btrfs_unlink_inode(trans, root, BTRFS_I(dir),

					BTRFS_I(inode), name, name_len);

			if (!ret)

				ret = btrfs_run_delayed_items(trans, fs_info);

				ret = btrfs_run_delayed_items(trans);

			kfree(name);

			iput(inode);

			if (ret)