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 295941E8836 for ; Mon, 18 Aug 2025 10:56:43 +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=1755514603; cv=none; b=iBoofNCt8skclm0DOyxUp8AQOAoMChdVNYLI6oJfSEuITp1ypE/P8XdhAi7lLpEJR4NbSTILItkBaxgEM6ZB7gJX3akzvMIEtHY11s6X4xPB+FiahxBt6lLOHNl7bc7/JvIa9Bnyv/wJgP+uULE86viNHcj/McdJ4WjYoEuKeCY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755514603; c=relaxed/simple; bh=6mixhonXpoUrExr5IUYJrc4KDCTa7Hs9tu+z5vD7hPk=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=jKlvvuBhWR9wsai1i3j7Jq5R127gSh2VlKc56dejzIndwIQLOrGcz47APEzAv5H7f/rstFzbc8stZ49BhR35wBF4VcXgc9XNMc9Ft9uiwogB5W/PGpnlE5aLqst3+oEllNZDNQvYkx4q4KV29MByqxlKl+WhVhjatDDcDaRDodc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=aS3wDK+c; 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="aS3wDK+c" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8A46CC4CEEB; Mon, 18 Aug 2025 10:56:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1755514603; bh=6mixhonXpoUrExr5IUYJrc4KDCTa7Hs9tu+z5vD7hPk=; h=Subject:To:Cc:From:Date:From; b=aS3wDK+cOm6/9Dhnoqma7+R8PvyskUlfOKnI64AdGxjhbQVAqfCUNZK4VRZgzIoaN vsiAV4IovezWMDVcgAndyhk3Cn5hdtaZOcsAGAbZXT4hZF9Lq01axBib4BhNtqRXZx cqZE4M7em1uggiiV9v9S3WqAJZi3CyJwbmOX7qnc= Subject: FAILED: patch "[PATCH] btrfs: zoned: requeue to unused block group list if zone" failed to apply to 6.1-stable tree To: naohiro.aota@wdc.com,dsterba@suse.com,johannes.thumshirn@wdc.com Cc: From: Date: Mon, 18 Aug 2025 12:56:19 +0200 Message-ID: <2025081819-dean-outage-295c@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y git checkout FETCH_HEAD git cherry-pick -x 62be7afcc13b2727bdc6a4c91aefed6b452e6ecc # git commit -s git send-email --to '' --in-reply-to '2025081819-dean-outage-295c@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 62be7afcc13b2727bdc6a4c91aefed6b452e6ecc Mon Sep 17 00:00:00 2001 From: Naohiro Aota Date: Sun, 29 Jun 2025 23:18:29 +0900 Subject: [PATCH] btrfs: zoned: requeue to unused block group list if zone finish failed btrfs_zone_finish() can fail for several reason. If it is -EAGAIN, we need to try it again later. So, put the block group to the retry list properly. Failing to do so will keep the removable block group intact until remount and can causes unnecessary ENOSPC. Fixes: 74e91b12b115 ("btrfs: zoned: zone finish unused block group") CC: stable@vger.kernel.org # 6.1+ Reviewed-by: Johannes Thumshirn Signed-off-by: Naohiro Aota Signed-off-by: David Sterba diff --git a/fs/btrfs/block-group.c b/fs/btrfs/block-group.c index 3ddf9fe52b9d..47c6d040176c 100644 --- a/fs/btrfs/block-group.c +++ b/fs/btrfs/block-group.c @@ -1639,8 +1639,10 @@ void btrfs_delete_unused_bgs(struct btrfs_fs_info *fs_info) ret = btrfs_zone_finish(block_group); if (ret < 0) { btrfs_dec_block_group_ro(block_group); - if (ret == -EAGAIN) + if (ret == -EAGAIN) { + btrfs_link_bg_list(block_group, &retry_list); ret = 0; + } goto next; }