From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: darrick.wong@oracle.com
Cc: linux-xfs@vger.kernel.org, david@fromorbit.com
Subject: [PATCH 3/4] xfs: strengthen rmap record flags checking
Date: Mon, 09 Nov 2020 10:17:51 -0800 [thread overview]
Message-ID: <160494587178.772802.7759758846362664950.stgit@magnolia> (raw)
In-Reply-To: <160494585293.772802.13326482733013279072.stgit@magnolia>
From: Darrick J. Wong <darrick.wong@oracle.com>
We always know the correct state of the rmap record flags (attr, bmbt,
unwritten) so check them by direct comparison.
Fixes: d852657ccfc0 ("xfs: cross-reference reverse-mapping btree")
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
fs/xfs/scrub/bmap.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/fs/xfs/scrub/bmap.c b/fs/xfs/scrub/bmap.c
index 412e2ec55e38..fed56d213a3f 100644
--- a/fs/xfs/scrub/bmap.c
+++ b/fs/xfs/scrub/bmap.c
@@ -218,13 +218,13 @@ xchk_bmap_xref_rmap(
* which doesn't track unwritten state.
*/
if (owner != XFS_RMAP_OWN_COW &&
- irec->br_state == XFS_EXT_UNWRITTEN &&
- !(rmap.rm_flags & XFS_RMAP_UNWRITTEN))
+ !!(irec->br_state == XFS_EXT_UNWRITTEN) !=
+ !!(rmap.rm_flags & XFS_RMAP_UNWRITTEN))
xchk_fblock_xref_set_corrupt(info->sc, info->whichfork,
irec->br_startoff);
- if (info->whichfork == XFS_ATTR_FORK &&
- !(rmap.rm_flags & XFS_RMAP_ATTR_FORK))
+ if (!!(info->whichfork == XFS_ATTR_FORK) !=
+ !!(rmap.rm_flags & XFS_RMAP_ATTR_FORK))
xchk_fblock_xref_set_corrupt(info->sc, info->whichfork,
irec->br_startoff);
if (rmap.rm_flags & XFS_RMAP_BMBT_BLOCK)
next prev parent reply other threads:[~2020-11-09 18:17 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-09 18:17 [PATCH 0/4] xfs: fix various scrub problems Darrick J. Wong
2020-11-09 18:17 ` [PATCH 1/4] xfs: fix brainos in the refcount scrubber's rmap fragment processor Darrick J. Wong
2020-11-10 18:35 ` Christoph Hellwig
2020-11-12 12:51 ` Chandan Babu R
2020-11-12 16:05 ` Darrick J. Wong
2020-11-13 5:11 ` Chandan Babu R
2020-11-09 18:17 ` [PATCH 2/4] xfs: fix the minrecs logic when dealing with inode root child blocks Darrick J. Wong
2020-11-13 6:35 ` Chandan Babu R
2020-11-14 10:39 ` Christoph Hellwig
2020-11-09 18:17 ` Darrick J. Wong [this message]
2020-11-13 7:02 ` [PATCH 3/4] xfs: strengthen rmap record flags checking Chandan Babu R
2020-11-14 10:40 ` Christoph Hellwig
2020-11-09 18:17 ` [PATCH 4/4] xfs: directory scrub should check the null bestfree entries too Darrick J. Wong
2020-11-13 9:08 ` Chandan Babu R
2020-11-14 10:40 ` Christoph Hellwig
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=160494587178.772802.7759758846362664950.stgit@magnolia \
--to=darrick.wong@oracle.com \
--cc=david@fromorbit.com \
--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;
as well as URLs for NNTP newsgroup(s).