From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B897AC433EF for ; Wed, 15 Dec 2021 20:00:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234114AbhLOUAD (ORCPT ); Wed, 15 Dec 2021 15:00:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43964 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234066AbhLOUAC (ORCPT ); Wed, 15 Dec 2021 15:00:02 -0500 Received: from mail-qk1-x734.google.com (mail-qk1-x734.google.com [IPv6:2607:f8b0:4864:20::734]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8C199C061574 for ; Wed, 15 Dec 2021 12:00:02 -0800 (PST) Received: by mail-qk1-x734.google.com with SMTP id t6so21254169qkg.1 for ; Wed, 15 Dec 2021 12:00:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=toxicpanda-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=73XRzuy8oCfpUBBwUBIexjzdvBy9a0dZ8atJyXaOSpI=; b=dwRYhL0q0KKd45dhBKRy7mxoTVWkwrx8mayshVl2WJrOaoJNQtgl9LGHb5KQpfM9t0 DwCKIW1/yOb8y2HLKRZHlLkezguk0eym00fjNExvlPHXHI/gBDQfYDxCoN83uwwvbH6t v8X9YLjVgP1ajo6P/SllWyw4A6Fe0zSUgNTL+fcetYpmef/Yrt73nMnPNeQHgr8LE6Ug aKERUqqS68yWPJabCfArBFWOakyFdOLu+YzPk7b25Qcc3iG0ftFZoVfxS5BBCWCtI4ul r25jGBfsYAC95MQWsFfA/KEBM8rkMecDishf436LfZZzE4HXmTcWy1CHAoTQTCDnJdLr 8Hfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=73XRzuy8oCfpUBBwUBIexjzdvBy9a0dZ8atJyXaOSpI=; b=Zt4GaKvkg47Z7Q+gmNGjgkKdwTkdjjxPgz5ruFbyA6JIQjwyHvwZzj3hYdDXkuAmwt 2IkzCy9na9eQl7FBRx/DPM/AdxhZK0z4hvjhE9ODfVmhZtS3+VcNBPXFGVC5cpVClVcw Oyzm5poJFB+Mr9yfj44nriyhv8v4PjasJSk2wIb2RHhjOCEnmRpbgnYOR3N/r8rNZAFX f5+Qzt35h0qFlqoEAAnfPWSsEIv0ujj+jFsjWhrKxkeJEp1KnMpFx3uKqX4PI2Yq4XYr jnWoOYZatpqhBPFPzY77YaygIA8dtCQ+uIYXDZpDM6KoxJx9OIgOtM1MCcZV2RlAMSBb +Keg== X-Gm-Message-State: AOAM530gEvaShUQt07EUpaXNafvWJIptHhUEMd9CB91nBAAz8fHV0DIp 46jOt3bqwwL6H8jiw5BlAS49KQVH3r6dCA== X-Google-Smtp-Source: ABdhPJx+NnhKX8H0LPScfFI7lc04435cZdxfb3BZ5w6ICnh1kfOh1ivpRjD6zHMDwTF5jRv4xy6qmQ== X-Received: by 2002:a05:620a:892:: with SMTP id b18mr9992047qka.360.1639598401380; Wed, 15 Dec 2021 12:00:01 -0800 (PST) Received: from localhost (cpe-174-109-172-136.nc.res.rr.com. [174.109.172.136]) by smtp.gmail.com with ESMTPSA id d187sm1556772qkc.122.2021.12.15.12.00.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Dec 2021 12:00:00 -0800 (PST) From: Josef Bacik To: linux-btrfs@vger.kernel.org, kernel-team@fb.com Subject: [PATCH v4 07/22] btrfs-progs: check-lowmem: use the btrfs_block_group_root helper Date: Wed, 15 Dec 2021 14:59:33 -0500 Message-Id: X-Mailer: git-send-email 2.26.3 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org When we're messing with block group items use the btrfs_block_group_root() helper to get the correct root to search, and this will do the right thing based on the file system flags. Signed-off-by: Josef Bacik --- check/mode-lowmem.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/check/mode-lowmem.c b/check/mode-lowmem.c index 6d222247..5ec3c090 100644 --- a/check/mode-lowmem.c +++ b/check/mode-lowmem.c @@ -266,7 +266,7 @@ static int modify_block_group_cache(struct btrfs_block_group *block_group, int c */ static int modify_block_groups_cache(u64 flags, int cache) { - struct btrfs_root *root = btrfs_extent_root(gfs_info, 0); + struct btrfs_root *root = btrfs_block_group_root(gfs_info); struct btrfs_key key; struct btrfs_path path; struct btrfs_block_group *bg_cache; @@ -331,7 +331,7 @@ static int clear_block_groups_full(u64 flags) static int create_chunk_and_block_group(u64 flags, u64 *start, u64 *nbytes) { struct btrfs_trans_handle *trans; - struct btrfs_root *root = btrfs_extent_root(gfs_info, 0); + struct btrfs_root *root = btrfs_block_group_root(gfs_info); int ret; if ((flags & BTRFS_BLOCK_GROUP_TYPE_MASK) == 0) @@ -419,7 +419,7 @@ static int is_chunk_almost_full(u64 start) { struct btrfs_path path; struct btrfs_key key; - struct btrfs_root *root = btrfs_extent_root(gfs_info, 0); + struct btrfs_root *root = btrfs_block_group_root(gfs_info); struct btrfs_block_group_item *bi; struct btrfs_block_group_item bg_item; struct extent_buffer *eb; @@ -4593,7 +4593,7 @@ next: static int find_block_group_item(struct btrfs_path *path, u64 bytenr, u64 len, u64 type) { - struct btrfs_root *root = btrfs_extent_root(gfs_info, 0); + struct btrfs_root *root = btrfs_block_group_root(gfs_info); struct btrfs_block_group_item bgi; struct btrfs_key key; int ret; -- 2.26.3