Commit 90b1377d authored by David Sterba's avatar David Sterba
Browse files

btrfs: qgroup: remove obsolete fs_info members 



The commit fcebe456 ("Btrfs: rework qgroup accounting") reworked
qgroups and added some new structures. Another rework of qgroup
mechanics e69bcee3 ("btrfs: qgroup: Cleanup the old
ref_node-oriented mechanism.") stopped using them and left uncleaned.

Reviewed-by: default avatarQu Wenruo <wqu@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent e064d5e9

fs/btrfs/ctree.h

+0 −3
Original line number Diff line number Diff line
@@ -1092,10 +1092,7 @@ struct btrfs_fs_info { 


	/* holds configuration and tracking. Protected by qgroup_lock */

	struct rb_root qgroup_tree;

	struct rb_root qgroup_op_tree;

	spinlock_t qgroup_lock;

	spinlock_t qgroup_op_lock;

	atomic_t qgroup_op_seq;



	/*

	 * used to avoid frequently calling ulist_alloc()/ulist_free()

fs/btrfs/disk-io.c

+0 −3
Original line number Diff line number Diff line
@@ -2161,7 +2161,6 @@ static void btrfs_init_qgroup(struct btrfs_fs_info *fs_info) 
	spin_lock_init(&fs_info->qgroup_lock);

	mutex_init(&fs_info->qgroup_ioctl_lock);

	fs_info->qgroup_tree = RB_ROOT;

	fs_info->qgroup_op_tree = RB_ROOT;

	INIT_LIST_HEAD(&fs_info->dirty_qgroups);

	fs_info->qgroup_seq = 1;

	fs_info->qgroup_ulist = NULL;
@@ -2666,7 +2665,6 @@ int open_ctree(struct super_block *sb, 
	spin_lock_init(&fs_info->defrag_inodes_lock);

	spin_lock_init(&fs_info->tree_mod_seq_lock);

	spin_lock_init(&fs_info->super_lock);

	spin_lock_init(&fs_info->qgroup_op_lock);

	spin_lock_init(&fs_info->buffer_lock);

	spin_lock_init(&fs_info->unused_bgs_lock);

	rwlock_init(&fs_info->tree_mod_log_lock);
@@ -2693,7 +2691,6 @@ int open_ctree(struct super_block *sb, 


	atomic_set(&fs_info->async_delalloc_pages, 0);

	atomic_set(&fs_info->defrag_running, 0);

	atomic_set(&fs_info->qgroup_op_seq, 0);

	atomic_set(&fs_info->reada_works_cnt, 0);

	atomic_set(&fs_info->nr_delayed_iputs, 0);

	atomic64_set(&fs_info->tree_mod_seq, 0);

fs/btrfs/tests/btrfs-tests.c

+0 −1
Original line number Diff line number Diff line
@@ -109,7 +109,6 @@ struct btrfs_fs_info *btrfs_alloc_dummy_fs_info(u32 nodesize, u32 sectorsize) 


	spin_lock_init(&fs_info->buffer_lock);

	spin_lock_init(&fs_info->qgroup_lock);

	spin_lock_init(&fs_info->qgroup_op_lock);

	spin_lock_init(&fs_info->super_lock);

	spin_lock_init(&fs_info->fs_roots_radix_lock);

	spin_lock_init(&fs_info->tree_mod_seq_lock);