From: "Darrick J. Wong" <djwong@kernel.org>
To: djwong@kernel.org, cem@kernel.org
Cc: linux-xfs@vger.kernel.org
Subject: [PATCH 5/6] xfs_repair: set aformat and anextents correctly when clearing the attr fork
Date: Tue, 12 Sep 2023 12:40:04 -0700 [thread overview]
Message-ID: <169454760445.3539425.1849980383287926875.stgit@frogsfrogsfrogs> (raw)
In-Reply-To: <169454757570.3539425.3597048437340386509.stgit@frogsfrogsfrogs>
From: Darrick J. Wong <djwong@kernel.org>
Ever since commit b42db0860e130 ("xfs: enhance dinode verifier"), we've
required that inodes with zero di_forkoff must also have di_aformat ==
EXTENTS and di_naextents == 0. clear_dinode_attr actually does this,
but then both callers inexplicably set di_format = LOCAL. That in turn
causes a verifier failure the next time the xattrs of that file are
read by the kernel. Get rid of the bogus field write.
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
---
repair/dinode.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/repair/dinode.c b/repair/dinode.c
index e534a01b500..c10dd1fa322 100644
--- a/repair/dinode.c
+++ b/repair/dinode.c
@@ -2078,7 +2078,6 @@ process_inode_attr_fork(
if (!no_modify) {
do_warn(_(", clearing attr fork\n"));
*dirty += clear_dinode_attr(mp, dino, lino);
- dino->di_aformat = XFS_DINODE_FMT_LOCAL;
ASSERT(*dirty > 0);
} else {
do_warn(_(", would clear attr fork\n"));
@@ -2135,7 +2134,6 @@ process_inode_attr_fork(
/* clear attributes if not done already */
if (!no_modify) {
*dirty += clear_dinode_attr(mp, dino, lino);
- dino->di_aformat = XFS_DINODE_FMT_LOCAL;
} else {
do_warn(_("would clear attr fork\n"));
}
next prev parent reply other threads:[~2023-09-12 19:40 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-12 19:39 [PATCHSET 0/6] xfsprogs: minor fixes Darrick J. Wong
2023-09-12 19:39 ` [PATCH 1/6] libfrog: fix overly sleep workqueues Darrick J. Wong
2023-09-13 12:41 ` Carlos Maiolino
2023-10-05 12:34 ` Carlos Maiolino
2023-09-12 19:39 ` [PATCH 2/6] libfrog: don't fail on XFS_FSOP_GEOM_FLAGS_NREXT64 in xfrog_bulkstat_single5 Darrick J. Wong
2023-09-13 12:50 ` Carlos Maiolino
2023-10-05 12:34 ` Carlos Maiolino
2023-09-12 19:39 ` [PATCH 3/6] libxfs: use XFS_IGET_CREATE when creating new files Darrick J. Wong
2023-09-13 12:58 ` Carlos Maiolino
2023-09-14 18:24 ` Bill O'Donnell
2023-10-05 12:35 ` Carlos Maiolino
2023-09-12 19:39 ` [PATCH 4/6] xfs_scrub: actually return errno from check_xattr_ns_names Darrick J. Wong
2023-09-13 13:00 ` Carlos Maiolino
2023-10-05 12:36 ` Carlos Maiolino
2023-09-12 19:40 ` Darrick J. Wong [this message]
2023-09-13 13:02 ` [PATCH 5/6] xfs_repair: set aformat and anextents correctly when clearing the attr fork Carlos Maiolino
2023-09-14 18:25 ` Bill O'Donnell
2023-10-05 12:37 ` Carlos Maiolino
2023-09-12 19:40 ` [PATCH 6/6] libxfs: fix atomic64_t detection on x86 32-bit architectures Darrick J. Wong
2023-09-12 19:47 ` [PATCH v1.1 " Darrick J. Wong
2023-09-13 13:22 ` Carlos Maiolino
2023-09-14 18:26 ` Bill O'Donnell
2023-10-05 12:45 ` Carlos Maiolino
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=169454760445.3539425.1849980383287926875.stgit@frogsfrogsfrogs \
--to=djwong@kernel.org \
--cc=cem@kernel.org \
--cc=linux-xfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox