From: Stefan Ring <stefanrin@gmail.com>
Date: Fri, 11 Jan 2019 22:57:51 +0000 (-0600)
Subject: xfs_metadump: Zap unused space in inode btrees
X-Git-Tag: v4.20.0-rc1~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=07b75e31cbbfd653966d8110f50869f6c6ac7cad;p=thirdparty%2Fxfsprogs-dev.git

xfs_metadump: Zap unused space in inode btrees

Signed-off-by: Stefan Ring <stefanrin@gmail.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
---

diff --git a/db/metadump.c b/db/metadump.c
index b3cace99b..69e260375 100644
--- a/db/metadump.c
+++ b/db/metadump.c
@@ -2177,6 +2177,19 @@ process_btinode(
 	}
 
 	pp = XFS_BMDR_PTR_ADDR(dib, 1, maxrecs);
+
+	if (zero_stale_data) {
+		char	*top;
+
+		/* Unused btree key space */
+		top = (char*)XFS_BMDR_KEY_ADDR(dib, nrecs + 1);
+		memset(top, 0, (char*)pp - top);
+
+		/* Unused btree ptr space */
+		top = (char*)&pp[nrecs];
+		memset(top, 0, (char*)dib + XFS_DFORK_SIZE(dip, mp, whichfork) - top);
+	}
+
 	for (i = 0; i < nrecs; i++) {
 		xfs_agnumber_t	ag;
 		xfs_agblock_t	bno;