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 69C8C205E2F for ; Thu, 16 Oct 2025 13:02:06 +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=1760619726; cv=none; b=UQs+AiX12xjUOqL13tMUG78pda8PaOcVAYlgGXeI44aN/ZwR/5B0YcVbvVfBGs0B1MjvBn8CmnLppvoZ+NHiklWpRLwSXLlH2QI/TP8xCmA6cNwfumRQW6yx+/0LiwINRkxsoPaJtju4wVm2tp7rJ243bo8h10C67y+MAmcZ1ng= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760619726; c=relaxed/simple; bh=eF9Wf43q2CGQLEIH4beBeo3SbuOfY2G9/O9XGgr+ZPo=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=IWE6HVyjp4GKu0Fofbjk4ULI7aCJB9aZw39kp1XkRhfShMXVKTCc6io0zNv7fQzyaqxsbrfKgCB17dsP/WXiOPHQEVKndJVWBrdxgTooKnP390KJGH+8LykaulwYi51u6JiwmsQnJZKAWR/+TA2jnRnLJDgjA3tuTTxFyMW5efs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=1nmtJxC8; 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="1nmtJxC8" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E27A6C4CEF1; Thu, 16 Oct 2025 13:02:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1760619726; bh=eF9Wf43q2CGQLEIH4beBeo3SbuOfY2G9/O9XGgr+ZPo=; h=Subject:To:Cc:From:Date:From; b=1nmtJxC8l905Yd5lFIFNwVI5EGeI/EiLEBnovPWNbDLtvrb8eCtojB3nDY2RkCNye 50vVwUVTwi4FhpJ/S9P7pB00IahrxNRNKUwmu13bTkBgF2VirJYtLugxmmU+YFWvsa aHzTZHPQT2ZerRm+anrC+78mLeLWnRn899v/sVKw= Subject: FAILED: patch "[PATCH] xfs: use deferred intent items for reaping crosslinked blocks" failed to apply to 6.12-stable tree To: djwong@kernel.org,hch@lst.de,stable@vger.kernel.org Cc: From: Date: Thu, 16 Oct 2025 15:02:03 +0200 Message-ID: <2025101603-parasitic-impatient-2d2b@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.12-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.12.y git checkout FETCH_HEAD git cherry-pick -x cd32a0c0dcdf634f2e0e71f41c272e19dece6264 # git commit -s git send-email --to '' --in-reply-to '2025101603-parasitic-impatient-2d2b@gregkh' --subject-prefix 'PATCH 6.12.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From cd32a0c0dcdf634f2e0e71f41c272e19dece6264 Mon Sep 17 00:00:00 2001 From: "Darrick J. Wong" Date: Tue, 8 Apr 2025 16:14:32 -0700 Subject: [PATCH] xfs: use deferred intent items for reaping crosslinked blocks When we're removing rmap records for crosslinked blocks, use deferred intent items so that we can try to free/unmap as many of the old data structure's blocks as we can in the same transaction as the commit. Cc: # v6.6 Fixes: 1c7ce115e52106 ("xfs: reap large AG metadata extents when possible") Signed-off-by: "Darrick J. Wong" Reviewed-by: Christoph Hellwig diff --git a/fs/xfs/scrub/reap.c b/fs/xfs/scrub/reap.c index 8703897c0a9c..86d3d104b8d9 100644 --- a/fs/xfs/scrub/reap.c +++ b/fs/xfs/scrub/reap.c @@ -416,8 +416,6 @@ xreap_agextent_iter( trace_xreap_dispose_unmap_extent(pag_group(sc->sa.pag), agbno, *aglenp); - rs->force_roll = true; - if (rs->oinfo == &XFS_RMAP_OINFO_COW) { /* * If we're unmapping CoW staging extents, remove the @@ -426,11 +424,14 @@ xreap_agextent_iter( */ xfs_refcount_free_cow_extent(sc->tp, false, fsbno, *aglenp); + rs->force_roll = true; return 0; } - return xfs_rmap_free(sc->tp, sc->sa.agf_bp, sc->sa.pag, agbno, - *aglenp, rs->oinfo); + xfs_rmap_free_extent(sc->tp, false, fsbno, *aglenp, + rs->oinfo->oi_owner); + rs->deferred++; + return 0; } trace_xreap_dispose_free_extent(pag_group(sc->sa.pag), agbno, *aglenp);