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 5F1AB3FFADA; Sat, 28 Feb 2026 17:43:32 +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=1772300612; cv=none; b=G/zdTh/Lw+ZS7P0Ak2jUz/uxo6OLY6Z6cqhphtzENLFHCO+k2V5yz/aSzGzdor/LBtCFPAhBu0DlGxrzTa33MAxfkV2jzzurExIS86t6zBARBvolSmi7XiiPj6ddR0XFr9la5TfiJbfjOAW4UEumYopncLoel9FzV3XDvmSOXIw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772300612; c=relaxed/simple; bh=hbXZtEnI7h+qFxH3cDPv4Wg6WkTxhKe9oHLMa70Ar48=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CYRCoELrkJ2r0n3HXjJ/G+lfPUcqd6MtoeT8N6hjVfgtObG7LqQQd2qYNErcGcvZMbvoVwUr02Ylx2+pGcVK7xTx0VR7TnNQSuxqPrI9YDIykCunIeWzOSA/nRevYoabE2AdjCNDyPPA5ilqdVImQCmksQG1h2dhW4mcinOU0mo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=MIy/ztAc; 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="MIy/ztAc" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8BB43C116D0; Sat, 28 Feb 2026 17:43:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772300612; bh=hbXZtEnI7h+qFxH3cDPv4Wg6WkTxhKe9oHLMa70Ar48=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MIy/ztAcxi/ZsxxADr1Nh9dNseXP/7rfqjQHoqm8pdJFaKiWhiJ9H0TP2O8u9GPwL NjhRj9bd44at4G8cKIuER0ntLF0/S8wfVlQv0Ga/JfU/J8KLPuQj5eqADU14bgVnir C8fgTjYpGepyMEflYs0mxPnza6mDcDqreU+VZ+M0k2foIbh2HqvFjLEQoWnJQhGqhc x4gdXGB8uUHMDSXHNdzJrPJflLzl7okcklJOSvB8W6LfVJ2lA5puuPI1kF+FdnqtHJ MGw25YIvdIeUSAykTAlx+E3cmPlsXvzMnFyh5wHbYEAdplN9aajrsxJ/rT1cRMAN/O Ar3d49oUqIxzA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: "Darrick J. Wong" , Christoph Hellwig , Carlos Maiolino , Sasha Levin Subject: [PATCH 6.19 652/844] xfs: mark data structures corrupt on EIO and ENODATA Date: Sat, 28 Feb 2026 12:29:25 -0500 Message-ID: <20260228173244.1509663-653-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260228173244.1509663-1-sashal@kernel.org> References: <20260228173244.1509663-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit From: "Darrick J. Wong" [ Upstream commit f39854a3fb2f06dc69b81ada002b641ba5b4696b ] 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 Signed-off-by: Sasha Levin --- 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 acade92c5fce1..b497f6a474c77 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 7bfa37c99480f..5f9be4151d722 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 056de4819f866..a6a5d3a75d994 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