[PATCH 9/9] common/populate: make sure _scratch_xfs_populate puts its files on the data device

Darrick J. Wong
2020-10-27T19:02:34Z

From: Darrick J. Wong <darrick.wong@oracle.com>

Make sure that _scratch_xfs_populate always installs its files on the
data device even if the test config selects rt by default.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
common/populate | 5 +++++
1 file changed, 5 insertions(+)

diff --git a/common/populate b/common/populate
index 0b036051..75e6f499 100644
--- a/common/populate
+++ b/common/populate
@@ -154,6 +154,10 @@ _scratch_xfs_populate() {

_populate_xfs_qmount_option
_scratch_mount
+
+ # Make sure the new files always end up on the data device
+ $XFS_IO_PROG -c 'chattr -t' $SCRATCH_MNT
+
blksz="$(stat -f -c '%s' "${SCRATCH_MNT}")"
dblksz="$($XFS_INFO_PROG "${SCRATCH_MNT}" | grep naming.*bsize | sed -e 's/^.*bsize=//g' -e 's/\([0-9]*\).*$/\1/g')"
crc="$($XFS_INFO_PROG "${SCRATCH_MNT}" | grep crc= | sed -e 's/^.*crc=//g' -e 's/\([0-9]*\).*$/\1/g')"
@@ -306,6 +310,7 @@ _scratch_xfs_populate() {
if [ $is_rmapbt -gt 0 ] && [ $is_rt -gt 0 ]; then
echo "+ rtrmapbt btree"
nr="$((blksz * 2 / 32))"
+ $XFS_IO_PROG -R -f -c 'truncate 0' "${SCRATCH_MNT}/RTRMAPBT"
__populate_create_file $((blksz * nr)) "${SCRATCH_MNT}/RTRMAPBT"
fi