btrfs: qgroup: cleanup the unused srcroot from btrfs_qgroup_inherit
authorLu Fengqi <lufq.fnst@cn.fujitsu.com>
Tue, 17 Jul 2018 08:58:22 +0000 (16:58 +0800)
committerDavid Sterba <dsterba@suse.com>
Mon, 6 Aug 2018 11:12:49 +0000 (13:12 +0200)
Since commit 0b246afa62b0 ("btrfs: root->fs_info cleanup, add fs_info
convenience variables"), the srcroot is no longer used to get
fs_info::nodesize.  In fact, it can be dropped after commit 707e8a071528
("btrfs: use nodesize everywhere, kill leafsize").

Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
fs/btrfs/qgroup.c

index 97a59a444500346d06dfabc9f6aff53b2b96c53e..e0bd48c5a98bf57e8984679774c705e3117b1b4d 100644 (file)
@@ -2287,22 +2287,6 @@ int btrfs_qgroup_inherit(struct btrfs_trans_handle *trans,
        if (ret)
                goto out;
 
-       if (srcid) {
-               struct btrfs_root *srcroot;
-               struct btrfs_key srckey;
-
-               srckey.objectid = srcid;
-               srckey.type = BTRFS_ROOT_ITEM_KEY;
-               srckey.offset = (u64)-1;
-               srcroot = btrfs_read_fs_root_no_name(fs_info, &srckey);
-               if (IS_ERR(srcroot)) {
-                       ret = PTR_ERR(srcroot);
-                       goto out;
-               }
-
-               level_size = fs_info->nodesize;
-       }
-
        /*
         * add qgroup to all inherited groups
         */
@@ -2359,6 +2343,7 @@ int btrfs_qgroup_inherit(struct btrfs_trans_handle *trans,
                 * our counts don't go crazy, so at this point the only
                 * difference between the two roots should be the root node.
                 */
+               level_size = fs_info->nodesize;
                dstgroup->rfer = srcgroup->rfer;
                dstgroup->rfer_cmpr = srcgroup->rfer_cmpr;
                dstgroup->excl = level_size;