btrfs: qgroup: remove no longer used fs_info->qgroup_ulist

It's not used anymore after commit 091344508249 ("btrfs: qgroup: use
qgroup_iterator in qgroup_convert_meta()"), so remove it.

Reviewed-by: Boris Burkov <boris@bur.io>
Reviewed-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: Filipe Manana <fdmanana@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index f6fa951c6be9eb312c9b4eb25dd54ec8512c900f..ee4911452cfd94455c23be6845746ffdf282565a 100644 (file)
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -1947,7 +1947,6 @@ static void btrfs_init_qgroup(struct btrfs_fs_info *fs_info)
        fs_info->qgroup_tree = RB_ROOT;
        INIT_LIST_HEAD(&fs_info->dirty_qgroups);
        fs_info->qgroup_seq = 1;
-       fs_info->qgroup_ulist = NULL;
        fs_info->qgroup_rescan_running = false;
        fs_info->qgroup_drop_subtree_thres = BTRFS_QGROUP_DROP_SUBTREE_THRES_DEFAULT;
        mutex_init(&fs_info->qgroup_rescan_lock);

diff --git a/fs/btrfs/fs.h b/fs/btrfs/fs.h
index b239e4b8421cf01dd988ce447c0a29a0a0bb5178..a731c883687dd7cb67023b1a29f88a6dd7cee38d 100644 (file)
--- a/fs/btrfs/fs.h
+++ b/fs/btrfs/fs.h
@@ -740,12 +740,6 @@ struct btrfs_fs_info {
        struct rb_root qgroup_tree;
        spinlock_t qgroup_lock;
 
-       /*
-        * Used to avoid frequently calling ulist_alloc()/ulist_free()
-        * when doing qgroup accounting, it must be protected by qgroup_lock.
-        */
-       struct ulist *qgroup_ulist;
-
        /*
         * Protect user change for quota operations. If a transaction is needed,
         * it must be started before locking this lock.

diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c
index 310ca2dd9f242f3be5769f7c7c348f83c87ede3e..42d3cfb843185db41084849e99c28dc2e7631df0 100644 (file)
--- a/fs/btrfs/qgroup.c
+++ b/fs/btrfs/qgroup.c
@@ -397,12 +397,6 @@ int btrfs_read_qgroup_config(struct btrfs_fs_info *fs_info)
        if (!fs_info->quota_root)
                return 0;
 
-       fs_info->qgroup_ulist = ulist_alloc(GFP_KERNEL);
-       if (!fs_info->qgroup_ulist) {
-               ret = -ENOMEM;
-               goto out;
-       }
-
        path = btrfs_alloc_path();
        if (!path) {
                ret = -ENOMEM;
@@ -587,8 +581,6 @@ out:
                if (fs_info->qgroup_flags & BTRFS_QGROUP_STATUS_FLAG_RESCAN)
                        ret = qgroup_rescan_init(fs_info, rescan_progress, 0);
        } else {
-               ulist_free(fs_info->qgroup_ulist);
-               fs_info->qgroup_ulist = NULL;
                fs_info->qgroup_flags &= ~BTRFS_QGROUP_STATUS_FLAG_RESCAN;
                btrfs_sysfs_del_qgroups(fs_info);
        }
@@ -660,13 +652,6 @@ void btrfs_free_qgroup_config(struct btrfs_fs_info *fs_info)
        }
        spin_unlock(&fs_info->qgroup_lock);
 
-       /*
-        * We call btrfs_free_qgroup_config() when unmounting
-        * filesystem and disabling quota, so we set qgroup_ulist
-        * to be null here to avoid double free.
-        */
-       ulist_free(fs_info->qgroup_ulist);
-       fs_info->qgroup_ulist = NULL;
        btrfs_sysfs_del_qgroups(fs_info);
 }
 
@@ -1012,7 +997,6 @@ int btrfs_quota_enable(struct btrfs_fs_info *fs_info,
        struct btrfs_qgroup *qgroup = NULL;
        struct btrfs_qgroup *prealloc = NULL;
        struct btrfs_trans_handle *trans = NULL;
-       struct ulist *ulist = NULL;
        const bool simple = (quota_ctl_args->cmd == BTRFS_QUOTA_CTL_ENABLE_SIMPLE_QUOTA);
        int ret = 0;
        int slot;
@@ -1035,12 +1019,6 @@ int btrfs_quota_enable(struct btrfs_fs_info *fs_info,
        if (fs_info->quota_root)
                goto out;
 
-       ulist = ulist_alloc(GFP_KERNEL);
-       if (!ulist) {
-               ret = -ENOMEM;
-               goto out;
-       }
-
        ret = btrfs_sysfs_add_qgroups(fs_info);
        if (ret < 0)
                goto out;
@@ -1080,9 +1058,6 @@ int btrfs_quota_enable(struct btrfs_fs_info *fs_info,
        if (fs_info->quota_root)
                goto out;
 
-       fs_info->qgroup_ulist = ulist;
-       ulist = NULL;
-
        /*
         * initially create the quota tree
         */
@@ -1281,17 +1256,13 @@ out_free_root:
        if (ret)
                btrfs_put_root(quota_root);
 out:
-       if (ret) {
-               ulist_free(fs_info->qgroup_ulist);
-               fs_info->qgroup_ulist = NULL;
+       if (ret)
                btrfs_sysfs_del_qgroups(fs_info);
-       }
        mutex_unlock(&fs_info->qgroup_ioctl_lock);
        if (ret && trans)
                btrfs_end_transaction(trans);
        else if (trans)
                ret = btrfs_end_transaction(trans);
-       ulist_free(ulist);
        kfree(prealloc);
        return ret;
 }