From 3ed4ce655d009dcb37f190ffd05d01387f94d97f Mon Sep 17 00:00:00 2001 From: "Darrick J. Wong" Date: Mon, 5 Nov 2018 09:25:47 -0800 Subject: [PATCH] populate: fix leafn creation test for v4 filesystems 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 Signed-off-by: Eryu Guan --- 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}" -- 2.25.1