Complain about leftover CoW allocations that are hanging off the
refcount btree. These are cleaned out at mount time, but we could be
louder about flagging down evidence of trouble.
Since these extents aren't "owned" by anything, we'll free them up by
reconstructing the free space btrees.
Signed-off-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
---
db/check.c | 21 +++++++++++++++++----
repair/incore.h | 3 ++-
repair/scan.c | 25 ++++++++++++++++++++++++-
3 files changed, 43 insertions(+), 6 deletions(-)
diff --git a/db/check.c b/db/check.c
index 3b17585..841a605 100644
--- a/db/check.c
+++ b/db/check.c
@@ -45,7 +45,7 @@ typedef enum {
DBM_LOG, DBM_MISSING, DBM_QUOTA, DBM_RTBITMAP,
DBM_RTDATA, DBM_RTFREE, DBM_RTSUM, DBM_SB,
DBM_SYMLINK, DBM_BTFINO, DBM_BTRMAP, DBM_BTREFC,
- DBM_RLDATA,
+ DBM_RLDATA, DBM_COWDATA,
DBM_NDBM
} dbm_t;
@@ -4821,9 +4821,22 @@ scanfunc_refcnt(
rp = XFS_REFCOUNT_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].rc_startblock),
- be32_to_cpu(rp[i].rc_blockcount), DBM_RLDATA,
- seqno, bno);
+ if (be32_to_cpu(rp[i].rc_refcount) == 1) {
+ dbprintf(_(
+ "leftover CoW extent (%u/%u) len %u\n"),
+ seqno,
+ be32_to_cpu(rp[i].rc_startblock),
+ be32_to_cpu(rp[i].rc_blockcount));
+ set_dbmap(seqno,
+ be32_to_cpu(rp[i].rc_startblock),
+ be32_to_cpu(rp[i].rc_blockcount),
+ DBM_COWDATA, seqno, bno);
+ } else {
+ set_dbmap(seqno,
+ be32_to_cpu(rp[i].rc_startblock),
+ be32_to_cpu(rp[i].rc_blockcount),
+ DBM_RLDATA, seqno, bno);
+ }
if (be32_to_cpu(rp[i].rc_startblock) < lastblock) {
dbprintf(_(
"out-of-order refcnt btree record %d (%u %u) block %u/%u\n"),
diff --git a/repair/incore.h b/repair/incore.h
index bcd2f4b..c23a3a3 100644
--- a/repair/incore.h
+++ b/repair/incore.h
@@ -107,7 +107,8 @@ typedef struct rt_extent_tree_node {
#define XR_E_INO1 10 /* used by inodes (marked by rmap btree) */
#define XR_E_FS_MAP1 11 /* used by fs space/inode maps (rmap btree) */
#define XR_E_REFC 12 /* used by fs ag reference count btree */
-#define XR_E_BAD_STATE 13
+#define XR_E_COW 13 /* leftover cow extent */
+#define XR_E_BAD_STATE 14
/* separate state bit, OR'ed into high (4th) bit of ex_state field */
diff --git a/repair/scan.c b/repair/scan.c
index 4e78335..1c2afb6 100644
--- a/repair/scan.c
+++ b/repair/scan.c
@@ -1293,7 +1293,30 @@ _("%s btree block claimed (state %d), agno %d, bno %d,
suspect %d\n"),
continue;
}
- if (nr < 2 || nr > MAXREFCOUNT) {
+ if (nr == 1) {
+ xfs_agblock_t c;
+ xfs_extlen_t cnr;
+
+ for (c = b; c < end; c += cnr) {
+ state = get_bmap_ext(agno, c, end,
&cnr);
+ switch (state) {
+ case XR_E_COW:
+ break;
+ case XR_E_UNKNOWN:
+ do_warn(
+_("leftover CoW extent (%u/%u) len %u\n"),
+ agno, c, cnr);
+ set_bmap_ext(agno, c, cnr,
XR_E_FREE);
+ break;
+ default:
+ do_warn(
+_("extent (%u/%u) len %u claimed, state is %d\n"),
+ agno, c, cnr, state);
+ set_bmap_ext(agno, c, cnr,
XR_E_FREE);
+ break;
+ }
+ }
+ } else if (nr < 2 || nr > MAXREFCOUNT) {
do_warn(
_("invalid reference count %u in record %u of %s btree block %u/%u\n"),
nr, i, name, agno, bno);
|