From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: sandeen@sandeen.net, darrick.wong@oracle.com
Cc: linux-xfs@vger.kernel.org
Subject: [PATCH 10/16] xfs_repair: refactor verify_dfsbno_range
Date: Sat, 09 May 2020 09:31:00 -0700 [thread overview]
Message-ID: <158904186058.982941.7156787817804393560.stgit@magnolia> (raw)
In-Reply-To: <158904179213.982941.9666913277909349291.stgit@magnolia>
From: Darrick J. Wong <darrick.wong@oracle.com>
Refactor this function to use libxfs type checking helpers.
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
libxfs/libxfs_api_defs.h | 1 +
repair/dinode.c | 26 +++++++++-----------------
2 files changed, 10 insertions(+), 17 deletions(-)
diff --git a/libxfs/libxfs_api_defs.h b/libxfs/libxfs_api_defs.h
index c03f0efa..69f79a08 100644
--- a/libxfs/libxfs_api_defs.h
+++ b/libxfs/libxfs_api_defs.h
@@ -184,6 +184,7 @@
#define xfs_verify_agbno libxfs_verify_agbno
#define xfs_verify_cksum libxfs_verify_cksum
#define xfs_verify_dir_ino libxfs_verify_dir_ino
+#define xfs_verify_fsbno libxfs_verify_fsbno
#define xfs_verify_ino libxfs_verify_ino
#define xfs_verify_rtbno libxfs_verify_rtbno
#define xfs_zero_extent libxfs_zero_extent
diff --git a/repair/dinode.c b/repair/dinode.c
index b343534c..135703d9 100644
--- a/repair/dinode.c
+++ b/repair/dinode.c
@@ -228,31 +228,23 @@ verify_dfsbno(xfs_mount_t *mp,
#define XR_DFSBNORANGE_OVERFLOW 3
static __inline int
-verify_dfsbno_range(xfs_mount_t *mp,
- xfs_fsblock_t fsbno,
- xfs_filblks_t count)
+verify_dfsbno_range(
+ struct xfs_mount *mp,
+ xfs_fsblock_t fsbno,
+ xfs_filblks_t count)
{
- xfs_agnumber_t agno;
- xfs_agblock_t agbno;
- xfs_sb_t *sbp = &mp->m_sb;;
-
/* the start and end blocks better be in the same allocation group */
- agno = XFS_FSB_TO_AGNO(mp, fsbno);
- if (agno != XFS_FSB_TO_AGNO(mp, fsbno + count - 1)) {
+ if (XFS_FSB_TO_AGNO(mp, fsbno) !=
+ XFS_FSB_TO_AGNO(mp, fsbno + count - 1)) {
return XR_DFSBNORANGE_OVERFLOW;
}
- agbno = XFS_FSB_TO_AGBNO(mp, fsbno);
- if (verify_ag_bno(sbp, agno, agbno)) {
+ if (!libxfs_verify_fsbno(mp, fsbno))
return XR_DFSBNORANGE_BADSTART;
- }
-
- agbno = XFS_FSB_TO_AGBNO(mp, fsbno + count - 1);
- if (verify_ag_bno(sbp, agno, agbno)) {
+ if (!libxfs_verify_fsbno(mp, fsbno + count - 1))
return XR_DFSBNORANGE_BADEND;
- }
- return (XR_DFSBNORANGE_VALID);
+ return XR_DFSBNORANGE_VALID;
}
static int
next prev parent reply other threads:[~2020-05-09 16:31 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-09 16:29 [PATCH 00/16] xfs_repair: catch things that xfs_check misses Darrick J. Wong
2020-05-09 16:29 ` [PATCH 01/16] xfs_repair: fix missing dir buffer corruption checks Darrick J. Wong
2020-05-09 17:08 ` Christoph Hellwig
2020-05-11 16:44 ` Darrick J. Wong
2020-05-11 17:36 ` Darrick J. Wong
2020-05-12 17:29 ` [PATCH v2 " Darrick J. Wong
2020-05-13 6:22 ` Christoph Hellwig
2020-05-13 15:35 ` Darrick J. Wong
2020-05-09 16:30 ` [PATCH 02/16] xfs_repair: warn when we would have rebuilt a directory Darrick J. Wong
2020-05-09 17:09 ` Christoph Hellwig
2020-05-09 16:30 ` [PATCH 03/16] xfs_repair: check for AG btree records that would wrap around Darrick J. Wong
2020-05-09 17:09 ` Christoph Hellwig
2020-05-09 16:30 ` [PATCH 04/16] xfs_repair: fix bnobt and refcountbt record order checks Darrick J. Wong
2020-05-09 17:10 ` Christoph Hellwig
2020-05-09 16:30 ` [PATCH 05/16] xfs_repair: check for out-of-order inobt records Darrick J. Wong
2020-05-09 17:11 ` Christoph Hellwig
2020-05-09 16:30 ` [PATCH 06/16] xfs_repair: fix rmapbt record order check Darrick J. Wong
2020-05-10 7:33 ` Christoph Hellwig
2020-05-09 16:30 ` [PATCH 07/16] xfs_repair: tag inobt vs finobt errors properly Darrick J. Wong
2020-05-09 17:14 ` Christoph Hellwig
2020-05-09 16:30 ` [PATCH 08/16] xfs_repair: complain about bad interior btree pointers Darrick J. Wong
2020-05-09 17:15 ` Christoph Hellwig
2020-05-09 16:30 ` [PATCH 09/16] xfs_repair: convert to libxfs_verify_agbno Darrick J. Wong
2020-05-09 17:18 ` Christoph Hellwig
2020-05-11 16:22 ` Darrick J. Wong
2020-05-12 8:07 ` Christoph Hellwig
2020-05-09 16:31 ` Darrick J. Wong [this message]
2020-05-10 7:24 ` [PATCH 10/16] xfs_repair: refactor verify_dfsbno_range Christoph Hellwig
2020-05-09 16:31 ` [PATCH 11/16] xfs_repair: remove verify_dfsbno Darrick J. Wong
2020-05-10 7:24 ` Christoph Hellwig
2020-05-09 16:31 ` [PATCH 12/16] xfs_repair: remove verify_aginum Darrick J. Wong
2020-05-10 7:25 ` Christoph Hellwig
2020-05-09 16:31 ` [PATCH 13/16] xfs_repair: mark entire free space btree record as free1 Darrick J. Wong
2020-05-10 7:26 ` Christoph Hellwig
2020-05-09 16:31 ` [PATCH 14/16] xfs_repair: complain about free space only seen by one btree Darrick J. Wong
2020-05-10 7:26 ` Christoph Hellwig
2020-05-09 16:31 ` [PATCH 15/16] xfs_repair: complain about extents in unknown state Darrick J. Wong
2020-05-10 7:27 ` Christoph Hellwig
2020-05-09 16:31 ` [PATCH 16/16] xfs_repair: complain about any nonzero inprogress value, not just 1 Darrick J. Wong
2020-05-10 7:27 ` 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=158904186058.982941.7156787817804393560.stgit@magnolia \
--to=darrick.wong@oracle.com \
--cc=linux-xfs@vger.kernel.org \
--cc=sandeen@sandeen.net \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.