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

Commit f486135e authored by David Sterba's avatar David Sterba
Browse files

btrfs: remove unused qgroup members from btrfs_trans_handle 



The members have been effectively unused since "Btrfs: rework qgroup
accounting" (fcebe456), there's no substitute for
assert_qgroups_uptodate so it's removed as well.

Reviewed-by: default avatarQu Wenruo <quwenruo@cn.fujitsu.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 994a5d2b

fs/btrfs/extent-tree.c

+0 −1
Original line number Diff line number Diff line
@@ -3003,7 +3003,6 @@ int btrfs_run_delayed_refs(struct btrfs_trans_handle *trans, 
		goto again;

	}

out:

	assert_qgroups_uptodate(trans);

	trans->can_flush_pending_bgs = can_flush_pending_bgs;

	return 0;

}

fs/btrfs/qgroup.c

+0 −12
Original line number Diff line number Diff line
@@ -2487,18 +2487,6 @@ void btrfs_qgroup_free_refroot(struct btrfs_fs_info *fs_info, 
	spin_unlock(&fs_info->qgroup_lock);

}



void assert_qgroups_uptodate(struct btrfs_trans_handle *trans)

{

	if (list_empty(&trans->qgroup_ref_list) && !trans->delayed_ref_elem.seq)

		return;

	btrfs_err(trans->fs_info,

		"qgroups not uptodate in trans handle %p:  list is%s empty, seq is %#x.%x",

		trans, list_empty(&trans->qgroup_ref_list) ? "" : " not",

		(u32)(trans->delayed_ref_elem.seq >> 32),

		(u32)trans->delayed_ref_elem.seq);

	BUG();

}



/*

 * returns < 0 on error, 0 when more leafs are to be scanned.

 * returns 1 when done.

fs/btrfs/qgroup.h

+0 −1
Original line number Diff line number Diff line
@@ -196,7 +196,6 @@ static inline void btrfs_qgroup_free_delayed_ref(struct btrfs_fs_info *fs_info, 
	btrfs_qgroup_free_refroot(fs_info, ref_root, num_bytes);

	trace_btrfs_qgroup_free_delayed_ref(fs_info, ref_root, num_bytes);

}

void assert_qgroups_uptodate(struct btrfs_trans_handle *trans);



#ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS

int btrfs_verify_qgroup_counts(struct btrfs_fs_info *fs_info, u64 qgroupid,

fs/btrfs/tests/btrfs-tests.c

+0 −1
Original line number Diff line number Diff line
@@ -237,7 +237,6 @@ void btrfs_init_dummy_trans(struct btrfs_trans_handle *trans) 
{

	memset(trans, 0, sizeof(*trans));

	trans->transid = 1;

	INIT_LIST_HEAD(&trans->qgroup_ref_list);

	trans->type = __TRANS_DUMMY;

}

fs/btrfs/transaction.c

+0 −3
Original line number Diff line number Diff line
@@ -572,7 +572,6 @@ start_transaction(struct btrfs_root *root, unsigned int num_items, 


	h->type = type;

	h->can_flush_pending_bgs = true;

	INIT_LIST_HEAD(&h->qgroup_ref_list);

	INIT_LIST_HEAD(&h->new_bgs);



	smp_mb();
@@ -917,7 +916,6 @@ static int __btrfs_end_transaction(struct btrfs_trans_handle *trans, 
		wake_up_process(info->transaction_kthread);

		err = -EIO;

	}

	assert_qgroups_uptodate(trans);



	kmem_cache_free(btrfs_trans_handle_cachep, trans);

	if (must_run_delayed_refs) {
@@ -2223,7 +2221,6 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans) 


	switch_commit_roots(cur_trans, fs_info);



	assert_qgroups_uptodate(trans);

	ASSERT(list_empty(&cur_trans->dirty_bgs));

	ASSERT(list_empty(&cur_trans->io_bgs));

	update_super_roots(fs_info);