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 314BD2BD59C; Sun, 1 Mar 2026 01:43:00 +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=1772329380; cv=none; b=ufQ8Yw2mw8PoG0Gzo51N+fZAaVLN78P15dorcKV0Xr1la5Leg7c8PzNgr5ODN8HpAdez0Rrb9stwSGtSiVhqHRwt0a/xaChHk1ZEjJNgtAneSKzjWSyN3EjCZVE6qLhKu+y03I4iK7YN1z48EKCyeMeDIENav6fc/Kfie6VjncI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772329380; c=relaxed/simple; bh=Di7yHqLX5I7K7qMRnir9UF7rL2QRli72foPG+H+XYaA=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=b9jZcalyyUZIY9Y5VpC15JR/aOWxRI92/vO8IvaPxzuHcj0cI1EG4BDTyjKCmIzadaY3xVbq6nIxf6VvxPqp3WkYEYoCZyx7oO0jHaxwpF4gGU/5W7OrV/RwB+V+wjqMFE4PNE096Dwce4JNnAIO4jTw/gfL12l2CzJDzpDAtOo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=uJe7iv4k; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="uJe7iv4k" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7DF48C19421; Sun, 1 Mar 2026 01:42:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772329380; bh=Di7yHqLX5I7K7qMRnir9UF7rL2QRli72foPG+H+XYaA=; h=From:To:Cc:Subject:Date:From; b=uJe7iv4kEDekWJ2bPxtBJWrXPDy5YVMikblyDzS9hsJi4X5WS+5io6Rf7k8GDGNaN MlLmwhK2SOKFrIMoCQ105yijjlN9+4Zt2H0TuGaYvdxqdxVPMxg+M7frxfP4L53V16 L2liArdCOLu0hdpq/YihQFeSzur+W3SPJVArk1aNVp6bNtcPE4ra+gbJcw8VajKl19 zZboHhePQaHzv6jyczNiNL8Kti69u6V0Se1deTUg+YPyI1XkOCrxJU/cK0GRYN6iT8 PfS9OB6cBbXYCTiLhFzCg8AuxHpQbjd8lp5rNZHXY9CQdzSyohaDXFgtyAR7kFbp+3 TmJ5AF+29Xv8w== From: Sasha Levin To: stable@vger.kernel.org, djwong@kernel.org Cc: Christoph Hellwig , Carlos Maiolino , linux-xfs@vger.kernel.org Subject: FAILED: Patch "xfs: mark data structures corrupt on EIO and ENODATA" failed to apply to 6.1-stable tree Date: Sat, 28 Feb 2026 20:42:57 -0500 Message-ID: <20260301014258.1704928-1-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Hint: ignore X-stable: review 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 . Thanks, Sasha ------------------ original commit in Linus's tree ------------------ >From f39854a3fb2f06dc69b81ada002b641ba5b4696b Mon Sep 17 00:00:00 2001 From: "Darrick J. Wong" Date: Thu, 18 Dec 2025 18:40:50 -0800 Subject: [PATCH] xfs: mark data structures corrupt on EIO and ENODATA I learned a few things this year: first, blk_status_to_errno can return ENODATA for critical media errors; and second, the scrub code doesn't mark data structures as corrupt on ENODATA or EIO. Currently, scrub failing to capture these errors isn't all that impactful -- the checking code will exit to userspace with EIO/ENODATA, and xfs_scrub will log a complaint and exit with nonzero status. Most people treat fsck tools failing as a sign that the fs is corrupt, but online fsck should mark the metadata bad and keep moving. Cc: stable@vger.kernel.org # v4.15 Fixes: 4700d22980d459 ("xfs: create helpers to record and deal with scrub problems") Signed-off-by: Darrick J. Wong Reviewed-by: Christoph Hellwig Signed-off-by: Carlos Maiolino --- fs/xfs/scrub/btree.c | 2 ++ fs/xfs/scrub/common.c | 4 ++++ fs/xfs/scrub/dabtree.c | 2 ++ 3 files changed, 8 insertions(+) diff --git a/fs/xfs/scrub/btree.c b/fs/xfs/scrub/btree.c index 8ba004979862f..40f36db9f07d5 100644 --- a/fs/xfs/scrub/btree.c +++ b/fs/xfs/scrub/btree.c @@ -42,6 +42,8 @@ __xchk_btree_process_error( break; case -EFSBADCRC: case -EFSCORRUPTED: + case -EIO: + case -ENODATA: /* Note the badness but don't abort. */ sc->sm->sm_flags |= errflag; *error = 0; diff --git a/fs/xfs/scrub/common.c b/fs/xfs/scrub/common.c index 38d0b7d5c894b..affed35a8c96f 100644 --- a/fs/xfs/scrub/common.c +++ b/fs/xfs/scrub/common.c @@ -103,6 +103,8 @@ __xchk_process_error( break; case -EFSBADCRC: case -EFSCORRUPTED: + case -EIO: + case -ENODATA: /* Note the badness but don't abort. */ sc->sm->sm_flags |= errflag; *error = 0; @@ -177,6 +179,8 @@ __xchk_fblock_process_error( break; case -EFSBADCRC: case -EFSCORRUPTED: + case -EIO: + case -ENODATA: /* Note the badness but don't abort. */ sc->sm->sm_flags |= errflag; *error = 0; diff --git a/fs/xfs/scrub/dabtree.c b/fs/xfs/scrub/dabtree.c index dd14f355358ca..5858d4d5e279b 100644 --- a/fs/xfs/scrub/dabtree.c +++ b/fs/xfs/scrub/dabtree.c @@ -45,6 +45,8 @@ xchk_da_process_error( break; case -EFSBADCRC: case -EFSCORRUPTED: + case -EIO: + case -ENODATA: /* Note the badness but don't abort. */ sc->sm->sm_flags |= XFS_SCRUB_OFLAG_CORRUPT; *error = 0; -- 2.51.0