Signed-off-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
---
db/check.c | 138 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 file changed, 130 insertions(+), 8 deletions(-)
diff --git a/db/check.c b/db/check.c
index 9b40725..143a7c3 100644
--- a/db/check.c
+++ b/db/check.c
@@ -44,7 +44,7 @@ typedef enum {
DBM_FREE1, DBM_FREE2, DBM_FREELIST, DBM_INODE,
DBM_LOG, DBM_MISSING, DBM_QUOTA, DBM_RTBITMAP,
DBM_RTDATA, DBM_RTFREE, DBM_RTSUM, DBM_SB,
- DBM_SYMLINK, DBM_BTFINO,
+ DBM_SYMLINK, DBM_BTFINO, DBM_BTRL, DBM_RLDATA,
DBM_NDBM
} dbm_t;
@@ -52,7 +52,8 @@ typedef struct inodata {
struct inodata *next;
nlink_t link_set;
nlink_t link_add;
- char isdir;
+ char isdir:1;
+ char isreflink:1;
char security;
char ilist;
xfs_ino_t ino;
@@ -171,6 +172,8 @@ static const char *typename[] = {
"sb",
"symlink",
"btfino",
+ "btrl",
+ "rldata",
NULL
};
static int verbose;
@@ -228,7 +231,8 @@ static int blocktrash_f(int argc, char **argv);
static int blockuse_f(int argc, char **argv);
static int check_blist(xfs_fsblock_t bno);
static void check_dbmap(xfs_agnumber_t agno, xfs_agblock_t agbno,
- xfs_extlen_t len, dbm_t type);
+ xfs_extlen_t len, dbm_t type,
+ int ignore_reflink);
static int check_inomap(xfs_agnumber_t agno, xfs_agblock_t agbno,
xfs_extlen_t len, xfs_ino_t c_ino);
static void check_linkcounts(xfs_agnumber_t agno);
@@ -349,6 +353,9 @@ static void scanfunc_ino(struct xfs_btree_block *block, int level,
static void scanfunc_fino(struct xfs_btree_block *block, int level,
xfs_agf_t *agf, xfs_agblock_t bno,
int isroot);
+static void scanfunc_rl(struct xfs_btree_block *block, int level,
+ xfs_agf_t *agf, xfs_agblock_t bno,
+ int isroot);
static void set_dbmap(xfs_agnumber_t agno, xfs_agblock_t agbno,
xfs_extlen_t len, dbm_t type,
xfs_agnumber_t c_agno, xfs_agblock_t c_agbno);
@@ -1041,6 +1048,7 @@ blocktrash_f(
(1 << DBM_RTSUM) |
(1 << DBM_SYMLINK) |
(1 << DBM_BTFINO) |
+ (1 << DBM_BTRL) |
(1 << DBM_SB);
while ((c = getopt(argc, argv, "0123n:s:t:x:y:")) != EOF) {
switch (c) {
@@ -1241,18 +1249,25 @@ check_dbmap(
xfs_agnumber_t agno,
xfs_agblock_t agbno,
xfs_extlen_t len,
- dbm_t type)
+ dbm_t type,
+ int ignore_reflink)
{
xfs_extlen_t i;
char *p;
+ dbm_t d;
for (i = 0, p = &dbmap[agno][agbno]; i < len; i++, p++) {
+ d = (dbm_t)*p;
+ if (ignore_reflink && (d == DBM_UNKNOWN || d == DBM_DATA ||
+ d == DBM_RLDATA))
+ continue;
if ((dbm_t)*p != type) {
- if (!sflag || CHECK_BLISTA(agno, agbno + i))
+ if (!sflag || CHECK_BLISTA(agno, agbno + i)) {
dbprintf(_("block %u/%u expected type %s got "
"%s\n"),
agno, agbno + i, typename[type],
typename[(dbm_t)*p]);
+ }
error++;
}
}
@@ -1286,7 +1301,7 @@ check_inomap(
return 0;
}
for (i = 0, rval = 1, idp = &inomap[agno][agbno]; i < len; i++, idp++) {
- if (*idp) {
+ if (*idp && !(*idp)->isreflink) {
if (!sflag || (*idp)->ilist ||
CHECK_BLISTA(agno, agbno + i))
dbprintf(_("block %u/%u claimed by inode %lld, "
@@ -1492,6 +1507,26 @@ check_rrange(
return 1;
}
+/*
+ * We don't check the accuracy of reference counts -- all we do is ensure
+ * that a data block never crosses with non-data blocks. repair can check
+ * those kinds of things.
+ *
+ * So with that in mind, if we're setting a block to be data or rldata,
+ * don't complain so long as the block is currently unknown, data, or rldata.
+ * Don't let blocks downgrade from rldata -> data.
+ */
+static bool
+is_reflink(
+ dbm_t type2)
+{
+ if (!xfs_sb_version_hasreflink(&mp->m_sb))
+ return false;
+ if (type2 == DBM_DATA || type2 == DBM_RLDATA)
+ return true;
+ return false;
+}
+
static void
check_set_dbmap(
xfs_agnumber_t agno,
@@ -1511,10 +1546,15 @@ check_set_dbmap(
agbno, agbno + len - 1, c_agno, c_agbno);
return;
}
- check_dbmap(agno, agbno, len, type1);
+ check_dbmap(agno, agbno, len, type1, is_reflink(type2));
mayprint = verbose | blist_size;
for (i = 0, p = &dbmap[agno][agbno]; i < len; i++, p++) {
- *p = (char)type2;
+ if (*p == DBM_RLDATA && type2 == DBM_DATA)
+ ; /* do nothing */
+ if (*p == DBM_DATA && type2 == DBM_DATA)
+ *p = (char)DBM_RLDATA;
+ else
+ *p = (char)type2;
if (mayprint && (verbose || CHECK_BLISTA(agno, agbno + i)))
dbprintf(_("setting block %u/%u to %s\n"), agno, agbno + i,
typename[type2]);
@@ -2756,6 +2796,7 @@ process_inode(
type = DBM_UNKNOWN;
break;
}
+ id->isreflink = !!(idic.di_flags & XFS_DIFLAG_REFLINK);
if (idic.di_version == 1)
setlink_inode(id, idic.di_onlink, type == DBM_DIR, security);
else {
@@ -3862,6 +3903,12 @@ scan_ag(
be32_to_cpu(agf->agf_roots[XFS_BTNUM_CNT]),
be32_to_cpu(agf->agf_levels[XFS_BTNUM_CNT]),
1, scanfunc_cnt, TYP_CNTBT);
+ if (agf->agf_reflink_root) {
+ scan_sbtree(agf,
+ be32_to_cpu(agf->agf_reflink_root),
+ be32_to_cpu(agf->agf_reflink_level),
+ 1, scanfunc_rl, TYP_RLBT);
+ }
scan_sbtree(agf,
be32_to_cpu(agi->agi_root),
be32_to_cpu(agi->agi_level),
@@ -4462,6 +4509,81 @@ scanfunc_fino(
}
static void
+scanfunc_rl(
+ struct xfs_btree_block *block,
+ int level,
+ xfs_agf_t *agf,
+ xfs_agblock_t bno,
+ int isroot)
+{
+ xfs_agnumber_t seqno = be32_to_cpu(agf->agf_seqno);
+ int i;
+ xfs_reflink_ptr_t *pp;
+ xfs_reflink_rec_t *rp;
+ xfs_agblock_t lastblock;
+
+ if (be32_to_cpu(block->bb_magic) != XFS_RLBT_CRC_MAGIC) {
+ dbprintf(_("bad magic # %#x in rlbt block %u/%u\n"),
+ be32_to_cpu(block->bb_magic), seqno, bno);
+ serious_error++;
+ return;
+ }
+ if (!isroot) {
+ fdblocks++;
+ agfbtreeblks++;
+ }
+ if (be16_to_cpu(block->bb_level) != level) {
+ if (!sflag)
+ dbprintf(_("expected level %d got %d in rlbt block "
+ "%u/%u\n"),
+ level, be16_to_cpu(block->bb_level), seqno, bno);
+ error++;
+ }
+ set_dbmap(seqno, bno, 1, DBM_BTRL, seqno, bno);
+ if (level == 0) {
+ if (be16_to_cpu(block->bb_numrecs) > mp->m_rlbt_mxr[0] ||
+ (isroot == 0 && be16_to_cpu(block->bb_numrecs) < mp->m_rlbt_mnr[0])) {
+ dbprintf(_("bad btree nrecs (%u, min=%u, max=%u) in "
+ "rlbt block %u/%u\n"),
+ be16_to_cpu(block->bb_numrecs), mp->m_rlbt_mnr[0],
+ mp->m_rlbt_mxr[0], seqno, bno);
+ serious_error++;
+ return;
+ }
+ rp = XFS_REFLINK_REC_ADDR(block, 1);
+ lastblock = 0;
+ for (i = 0; i < be16_to_cpu(block->bb_numrecs); i++) {
+ set_dbmap(seqno, be32_to_cpu(rp[i].rr_startblock),
+ be32_to_cpu(rp[i].rr_blockcount), DBM_RLDATA,
+ seqno, bno);
+ if (be32_to_cpu(rp[i].rr_startblock) < lastblock) {
+ dbprintf(_(
+ "out-of-order rl btree record %d (%u %u) block %u/%u\n"),
+ i, be32_to_cpu(rp[i].rr_startblock),
+ be32_to_cpu(rp[i].rr_startblock),
+ be32_to_cpu(agf->agf_seqno), bno);
+ } else {
+ lastblock = be32_to_cpu(rp[i].rr_startblock) +
+ be32_to_cpu(rp[i].rr_blockcount);
+ }
+ }
+ return;
+ }
+ if (be16_to_cpu(block->bb_numrecs) > mp->m_rlbt_mxr[1] ||
+ (isroot == 0 && be16_to_cpu(block->bb_numrecs) < mp->m_rlbt_mnr[1])) {
+ dbprintf(_("bad btree nrecs (%u, min=%u, max=%u) in rlbt block "
+ "%u/%u\n"),
+ be16_to_cpu(block->bb_numrecs), mp->m_rlbt_mnr[1],
+ mp->m_rlbt_mxr[1], seqno, bno);
+ serious_error++;
+ return;
+ }
+ pp = XFS_REFLINK_PTR_ADDR(block, 1, mp->m_rlbt_mxr[1]);
+ for (i = 0; i < be16_to_cpu(block->bb_numrecs); i++)
+ scan_sbtree(agf, be32_to_cpu(pp[i]), level, 0, scanfunc_rl, TYP_RLBT);
+}
+
+static void
set_dbmap(
xfs_agnumber_t agno,
xfs_agblock_t agbno,
_______________________________________________
xfs mailing list
xfs@xxxxxxxxxxx
http://oss.sgi.com/mailman/listinfo/xfs
