From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 252AE76C9C; Tue, 20 Feb 2024 21:09:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708463367; cv=none; b=HHF7nilT5gXVMqdLk02b9mi9YAnp7HJG8vt7UDuQyPILsFFBlqTlOaDZVvnSi+GPUfzMRdVdbgalaSPgmyzffiDdEamIeZ9EWnVZNC6YTTTt/R7tppZ6Z5dyNFKMb9h1p9bNUnfQRA4DDnM08roxK8sJQekRH4AN245H00XvuSg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708463367; c=relaxed/simple; bh=/wOzUHMn44dCGfKdgmMMv7gFIVwwokBT1gO8Hx99qDs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lLstSwI94iKfQzBqnmw8EZYhr98CRVnG3aAx0sWNnzbXa0vBGsFYYx3+OovROxajMA4SuCIsgxHy+9FareoO3znvC2NREOCTduIjfPUANx4VVfIoLfJdHxJfDCsaiXy7HoyseFN82He4wAkqzVNJ7I9VW3n+rMSNQmBnIm8ahA0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=S9C2SsyW; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="S9C2SsyW" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 88115C433F1; Tue, 20 Feb 2024 21:09:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1708463367; bh=/wOzUHMn44dCGfKdgmMMv7gFIVwwokBT1gO8Hx99qDs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=S9C2SsyWAfzU/mS22hqSS2v2tPNk1rqu0JXa990qeaSGe9wHLfXU2YYGGZtBZttCW 2+MHQ0YVtLfkOyGYOVGWQ8VcnyhLLIZ5oaayRAjLUMsBOVtDe5VdZWqcgvorbGG5qo 3LgH90nu76v+bk+FP2zILwXB3qKGnRaqzD9jyrAQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Johannes Thumshirn , Josef Bacik , Boris Burkov , Filipe Manana , David Sterba Subject: [PATCH 6.6 003/331] btrfs: add and use helper to check if block group is used Date: Tue, 20 Feb 2024 21:51:59 +0100 Message-ID: <20240220205637.684303220@linuxfoundation.org> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240220205637.572693592@linuxfoundation.org> References: <20240220205637.572693592@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Filipe Manana commit 1693d5442c458ae8d5b0d58463b873cd879569ed upstream. Add a helper function to determine if a block group is being used and make use of it at btrfs_delete_unused_bgs(). This helper will also be used in future code changes. Reviewed-by: Johannes Thumshirn Reviewed-by: Josef Bacik Reviewed-by: Boris Burkov Signed-off-by: Filipe Manana Reviewed-by: David Sterba Signed-off-by: David Sterba Signed-off-by: Greg Kroah-Hartman --- fs/btrfs/block-group.c | 3 +-- fs/btrfs/block-group.h | 7 +++++++ 2 files changed, 8 insertions(+), 2 deletions(-) --- a/fs/btrfs/block-group.c +++ b/fs/btrfs/block-group.c @@ -1524,8 +1524,7 @@ void btrfs_delete_unused_bgs(struct btrf } spin_lock(&block_group->lock); - if (block_group->reserved || block_group->pinned || - block_group->used || block_group->ro || + if (btrfs_is_block_group_used(block_group) || block_group->ro || list_is_singular(&block_group->list)) { /* * We want to bail if we made new allocations or have --- a/fs/btrfs/block-group.h +++ b/fs/btrfs/block-group.h @@ -255,6 +255,13 @@ static inline u64 btrfs_block_group_end( return (block_group->start + block_group->length); } +static inline bool btrfs_is_block_group_used(const struct btrfs_block_group *bg) +{ + lockdep_assert_held(&bg->lock); + + return (bg->used > 0 || bg->reserved > 0 || bg->pinned > 0); +} + static inline bool btrfs_is_block_group_data_only( struct btrfs_block_group *block_group) {