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

Commit 7a7eaa40 authored by Josef Bacik's avatar Josef Bacik
Browse files

Btrfs: take away the num_items argument from btrfs_join_transaction 



I keep forgetting that btrfs_join_transaction() just ignores the num_items
argument, which leads me to sending pointless patches and looking stupid :).  So
just kill the num_items argument from btrfs_join_transaction and
btrfs_start_ioctl_transaction, since neither of them use it.  Thanks,

Signed-off-by: default avatarJosef Bacik <josef@redhat.com>
parent 74b21075

fs/btrfs/disk-io.c

+3 −3
Original line number Diff line number Diff line
@@ -1568,7 +1568,7 @@ static int transaction_kthread(void *arg) 
		transid = cur->transid;

		spin_unlock(&root->fs_info->new_trans_lock);



		trans = btrfs_join_transaction(root, 1);

		trans = btrfs_join_transaction(root);

		BUG_ON(IS_ERR(trans));

		if (transid == trans->transid) {

			ret = btrfs_commit_transaction(trans, root);
@@ -2495,13 +2495,13 @@ int btrfs_commit_super(struct btrfs_root *root) 
	down_write(&root->fs_info->cleanup_work_sem);

	up_write(&root->fs_info->cleanup_work_sem);



	trans = btrfs_join_transaction(root, 1);

	trans = btrfs_join_transaction(root);

	if (IS_ERR(trans))

		return PTR_ERR(trans);

	ret = btrfs_commit_transaction(trans, root);

	BUG_ON(ret);

	/* run commit again to drop the original snapshot */

	trans = btrfs_join_transaction(root, 1);

	trans = btrfs_join_transaction(root);

	if (IS_ERR(trans))

		return PTR_ERR(trans);

	btrfs_commit_transaction(trans, root);

fs/btrfs/extent-tree.c

+6 −6
Original line number Diff line number Diff line
@@ -3174,7 +3174,7 @@ int btrfs_check_data_free_space(struct inode *inode, u64 bytes) 
			spin_unlock(&data_sinfo->lock);

alloc:

			alloc_target = btrfs_get_alloc_profile(root, 1);

			trans = btrfs_join_transaction(root, 1);

			trans = btrfs_join_transaction(root);

			if (IS_ERR(trans))

				return PTR_ERR(trans);
@@ -3202,7 +3202,7 @@ int btrfs_check_data_free_space(struct inode *inode, u64 bytes) 
commit_trans:

		if (!committed && !root->fs_info->open_ioctl_trans) {

			committed = 1;

			trans = btrfs_join_transaction(root, 1);

			trans = btrfs_join_transaction(root);

			if (IS_ERR(trans))

				return PTR_ERR(trans);

			ret = btrfs_commit_transaction(trans, root);
@@ -3589,7 +3589,7 @@ static int reserve_metadata_bytes(struct btrfs_trans_handle *trans, 
		goto out;



	ret = -ENOSPC;

	trans = btrfs_join_transaction(root, 1);

	trans = btrfs_join_transaction(root);

	if (IS_ERR(trans))

		goto out;

	ret = btrfs_commit_transaction(trans, root);
@@ -3816,7 +3816,7 @@ int btrfs_block_rsv_check(struct btrfs_trans_handle *trans, 
		if (trans)

			return -EAGAIN;



		trans = btrfs_join_transaction(root, 1);

		trans = btrfs_join_transaction(root);

		BUG_ON(IS_ERR(trans));

		ret = btrfs_commit_transaction(trans, root);

		return 0;
@@ -7649,7 +7649,7 @@ int btrfs_drop_dead_reloc_roots(struct btrfs_root *root) 


		BUG_ON(reloc_root->commit_root != NULL);

		while (1) {

			trans = btrfs_join_transaction(root, 1);

			trans = btrfs_join_transaction(root);

			BUG_ON(IS_ERR(trans));



			mutex_lock(&root->fs_info->drop_mutex);
@@ -8176,7 +8176,7 @@ int btrfs_set_block_group_ro(struct btrfs_root *root, 


	BUG_ON(cache->ro);



	trans = btrfs_join_transaction(root, 1);

	trans = btrfs_join_transaction(root);

	BUG_ON(IS_ERR(trans));



	alloc_flags = update_block_group_flags(root, cache->flags);

fs/btrfs/inode.c

+17 −17
Original line number Diff line number Diff line
@@ -420,7 +420,7 @@ static noinline int compress_file_range(struct inode *inode, 
		}

	}

	if (start == 0) {

		trans = btrfs_join_transaction(root, 1);

		trans = btrfs_join_transaction(root);

		BUG_ON(IS_ERR(trans));

		btrfs_set_trans_block_group(trans, inode);

		trans->block_rsv = &root->fs_info->delalloc_block_rsv;
@@ -617,7 +617,7 @@ static noinline int submit_compressed_extents(struct inode *inode, 
			    async_extent->start + async_extent->ram_size - 1,

			    GFP_NOFS);



		trans = btrfs_join_transaction(root, 1);

		trans = btrfs_join_transaction(root);

		BUG_ON(IS_ERR(trans));

		trans->block_rsv = &root->fs_info->delalloc_block_rsv;

		ret = btrfs_reserve_extent(trans, root,
@@ -779,7 +779,7 @@ static noinline int cow_file_range(struct inode *inode, 
	int ret = 0;



	BUG_ON(root == root->fs_info->tree_root);

	trans = btrfs_join_transaction(root, 1);

	trans = btrfs_join_transaction(root);

	BUG_ON(IS_ERR(trans));

	btrfs_set_trans_block_group(trans, inode);

	trans->block_rsv = &root->fs_info->delalloc_block_rsv;
@@ -1056,9 +1056,9 @@ static noinline int run_delalloc_nocow(struct inode *inode, 
	BUG_ON(!path);

	if (root == root->fs_info->tree_root) {

		nolock = true;

		trans = btrfs_join_transaction_nolock(root, 1);

		trans = btrfs_join_transaction_nolock(root);

	} else {

		trans = btrfs_join_transaction(root, 1);

		trans = btrfs_join_transaction(root);

	}

	BUG_ON(IS_ERR(trans));

	trans->block_rsv = &root->fs_info->delalloc_block_rsv;
@@ -1718,9 +1718,9 @@ static int btrfs_finish_ordered_io(struct inode *inode, u64 start, u64 end) 
		ret = btrfs_ordered_update_i_size(inode, 0, ordered_extent);

		if (!ret) {

			if (nolock)

				trans = btrfs_join_transaction_nolock(root, 1);

				trans = btrfs_join_transaction_nolock(root);

			else

				trans = btrfs_join_transaction(root, 1);

				trans = btrfs_join_transaction(root);

			BUG_ON(IS_ERR(trans));

			btrfs_set_trans_block_group(trans, inode);

			trans->block_rsv = &root->fs_info->delalloc_block_rsv;
@@ -1735,9 +1735,9 @@ static int btrfs_finish_ordered_io(struct inode *inode, u64 start, u64 end) 
			 0, &cached_state, GFP_NOFS);



	if (nolock)

		trans = btrfs_join_transaction_nolock(root, 1);

		trans = btrfs_join_transaction_nolock(root);

	else

		trans = btrfs_join_transaction(root, 1);

		trans = btrfs_join_transaction(root);

	BUG_ON(IS_ERR(trans));

	btrfs_set_trans_block_group(trans, inode);

	trans->block_rsv = &root->fs_info->delalloc_block_rsv;
@@ -2415,7 +2415,7 @@ int btrfs_orphan_cleanup(struct btrfs_root *root) 
					(u64)-1);



	if (root->orphan_block_rsv || root->orphan_item_inserted) {

		trans = btrfs_join_transaction(root, 1);

		trans = btrfs_join_transaction(root);

		if (!IS_ERR(trans))

			btrfs_end_transaction(trans, root);

	}
@@ -4378,9 +4378,9 @@ int btrfs_write_inode(struct inode *inode, struct writeback_control *wbc) 


	if (wbc->sync_mode == WB_SYNC_ALL) {

		if (nolock)

			trans = btrfs_join_transaction_nolock(root, 1);

			trans = btrfs_join_transaction_nolock(root);

		else

			trans = btrfs_join_transaction(root, 1);

			trans = btrfs_join_transaction(root);

		if (IS_ERR(trans))

			return PTR_ERR(trans);

		btrfs_set_trans_block_group(trans, inode);
@@ -4407,7 +4407,7 @@ void btrfs_dirty_inode(struct inode *inode) 
	if (BTRFS_I(inode)->dummy_inode)

		return;



	trans = btrfs_join_transaction(root, 1);

	trans = btrfs_join_transaction(root);

	BUG_ON(IS_ERR(trans));

	btrfs_set_trans_block_group(trans, inode);
@@ -5226,7 +5226,7 @@ struct extent_map *btrfs_get_extent(struct inode *inode, struct page *page, 
				free_extent_map(em);

				em = NULL;

				btrfs_release_path(root, path);

				trans = btrfs_join_transaction(root, 1);

				trans = btrfs_join_transaction(root);

				if (IS_ERR(trans))

					return ERR_CAST(trans);

				goto again;
@@ -5470,7 +5470,7 @@ static struct extent_map *btrfs_new_extent_direct(struct inode *inode, 
		btrfs_drop_extent_cache(inode, start, start + len - 1, 0);

	}



	trans = btrfs_join_transaction(root, 0);

	trans = btrfs_join_transaction(root);

	if (IS_ERR(trans))

		return ERR_CAST(trans);
@@ -5703,7 +5703,7 @@ static int btrfs_get_blocks_direct(struct inode *inode, sector_t iblock, 
		 * to make sure the current transaction stays open

		 * while we look for nocow cross refs

		 */

		trans = btrfs_join_transaction(root, 0);

		trans = btrfs_join_transaction(root);

		if (IS_ERR(trans))

			goto must_cow;
@@ -5841,7 +5841,7 @@ static void btrfs_endio_direct_write(struct bio *bio, int err) 


	BUG_ON(!ordered);



	trans = btrfs_join_transaction(root, 1);

	trans = btrfs_join_transaction(root);

	if (IS_ERR(trans)) {

		err = -ENOMEM;

		goto out;

fs/btrfs/ioctl.c

+2 −2
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ static int btrfs_ioctl_setflags(struct file *file, void __user *arg) 
		ip->flags &= ~(BTRFS_INODE_COMPRESS | BTRFS_INODE_NOCOMPRESS);

	}



	trans = btrfs_join_transaction(root, 1);

	trans = btrfs_join_transaction(root);

	BUG_ON(IS_ERR(trans));



	ret = btrfs_update_inode(trans, root, inode);
@@ -2182,7 +2182,7 @@ static long btrfs_ioctl_trans_start(struct file *file) 
	mutex_unlock(&root->fs_info->trans_mutex);



	ret = -ENOMEM;

	trans = btrfs_start_ioctl_transaction(root, 0);

	trans = btrfs_start_ioctl_transaction(root);

	if (IS_ERR(trans))

		goto out_drop;

fs/btrfs/relocation.c

+6 −6
Original line number Diff line number Diff line
@@ -2149,7 +2149,7 @@ int prepare_to_merge(struct reloc_control *rc, int err) 
			err = ret;

	}



	trans = btrfs_join_transaction(rc->extent_root, 1);

	trans = btrfs_join_transaction(rc->extent_root);

	if (IS_ERR(trans)) {

		if (!err)

			btrfs_block_rsv_release(rc->extent_root,
@@ -3233,7 +3233,7 @@ static int delete_block_group_cache(struct btrfs_fs_info *fs_info, 
		goto out;

	}



	trans = btrfs_join_transaction(root, 0);

	trans = btrfs_join_transaction(root);

	if (IS_ERR(trans)) {

		btrfs_free_path(path);

		ret = PTR_ERR(trans);
@@ -3642,7 +3642,7 @@ int prepare_to_relocate(struct reloc_control *rc) 
	rc->create_reloc_tree = 1;

	set_reloc_control(rc);



	trans = btrfs_join_transaction(rc->extent_root, 1);

	trans = btrfs_join_transaction(rc->extent_root);

	BUG_ON(IS_ERR(trans));

	btrfs_commit_transaction(trans, rc->extent_root);

	return 0;
@@ -3831,7 +3831,7 @@ static noinline_for_stack int relocate_block_group(struct reloc_control *rc) 
	btrfs_block_rsv_release(rc->extent_root, rc->block_rsv, (u64)-1);



	/* get rid of pinned extents */

	trans = btrfs_join_transaction(rc->extent_root, 1);

	trans = btrfs_join_transaction(rc->extent_root);

	if (IS_ERR(trans))

		err = PTR_ERR(trans);

	else
@@ -4156,7 +4156,7 @@ int btrfs_recover_relocation(struct btrfs_root *root) 


	set_reloc_control(rc);



	trans = btrfs_join_transaction(rc->extent_root, 1);

	trans = btrfs_join_transaction(rc->extent_root);

	if (IS_ERR(trans)) {

		unset_reloc_control(rc);

		err = PTR_ERR(trans);
@@ -4190,7 +4190,7 @@ int btrfs_recover_relocation(struct btrfs_root *root) 


	unset_reloc_control(rc);



	trans = btrfs_join_transaction(rc->extent_root, 1);

	trans = btrfs_join_transaction(rc->extent_root);

	if (IS_ERR(trans))

		err = PTR_ERR(trans);

	else