From: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
The leafn creation test doesn't work on some v4 filesystems
because the field names change. Rearrange the code somewhat so that it
works properly.
Signed-off-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
---
common/populate | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/common/populate b/common/populate
index 610425f9..d49fbc29 100644
--- a/common/populate
+++ b/common/populate
@@ -444,7 +444,9 @@ __populate_check_xfs_dir() {
(test "${datab}" -eq 1 && test "${leafb}" -eq 1 && test "${freeb}" -eq 0) || _fail "failed to create ${dtype} dir ino ${inode} datab ${datab} leafb ${leafb} freeb ${freeb}"
;;
"leafn")
- _scratch_xfs_db -x -c "inode ${inode}" -c "dblock ${leaf_lblk}" -c "p lhdr.info.hdr.magic" | egrep -q '(0x3dff|0xd2ff)' || _fail "failed to create ${dtype} dir ino ${inode} datab ${datab} leafb ${leafb} freeb ${freeb}"
+ _scratch_xfs_db -x -c "inode ${inode}" -c "dblock ${leaf_lblk}" -c "p lhdr.info.hdr.magic" | grep -q '0x3dff' && return
+ _scratch_xfs_db -x -c "inode ${inode}" -c "dblock ${leaf_lblk}" -c "p lhdr.info.magic" | grep -q '0xd2ff' && return
+ _fail "failed to create ${dtype} dir ino ${inode} datab ${datab} leafb ${leafb} freeb ${freeb}"
;;
"node"|"btree")
(test "${datab}" -eq 1 && test "${leafb}" -eq 1 && test "${freeb}" -eq 1) || _fail "failed to create ${dtype} dir ino ${inode} datab ${datab} leafb ${leafb} freeb ${freeb}"
