apfs/apfstests
0
0
Fork 0
mirror of https://github.com/linux-apfs/apfstests.git synced 2026-05-01 15:01:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

common/rc: Fix _check_s_dax()

Browse Source 
There is a conflict with the user visible statx bits 'mount root' and
'dax'.  The kernel is changing the dax bit to correct this conflict.[1]

Adjust _check_s_dax() to use the new bit.  Because DAX tests do not run
on root mounts, STATX_ATTR_MOUNT_ROOT should always be 0.  Therefore,
check for the old flag and fail the test if that occurs.

[1] https://lore.kernel.org/lkml/3e28d2c7-fbe5-298a-13ba-dcd8fd504666@redhat.com/

Signed-off-by: Ira Weiny <ira.weiny@intel.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>
This commit is contained in:
Ira Weiny
2020-12-03 17:45:50 -08:00
committed by Eryu Guan
parent 8b4f7e207c
commit ee4281bfe3
1 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/rc
+19 -2
View File
@@ -3221,10 +3221,27 @@ _check_s_dax()
local exp_s_dax=$2
local attributes=$($XFS_IO_PROG -c 'statx -r' $target | awk '/stat.attributes / { print $3 }')
# The original attribute bit value, STATX_ATTR_DAX (0x2000), conflicted
# with STATX_ATTR_MOUNT_ROOT. Therefore, STATX_ATTR_DAX was changed to
# 0x00200000.
#
# Because DAX tests do not run on root mounts, STATX_ATTR_MOUNT_ROOT
# should always be 0. Check for the old flag and fail the test if that
# occurs.
if [ $(( attributes & 0x2000 )) -ne 0 ]; then
echo "$target has an unexpected STATX_ATTR_MOUNT_ROOT flag set"
echo "which used to be STATX_ATTR_DAX"
echo " This test should not be running on the root inode..."
echo " Does the kernel have the following patch?"
echo " 72d1249e2ffd uapi: fix statx attribute value overlap for DAX & MOUNT_ROOT"
fi
if [ $exp_s_dax -eq 0 ]; then
(( attributes & 0x2000 )) && echo "$target has unexpected S_DAX flag"
(( attributes & 0x00200000 )) && echo "$target has unexpected S_DAX flag"
else
(( attributes & 0x2000 )) || echo "$target doesn't have expected S_DAX flag"
(( attributes & 0x00200000 )) || echo "$target doesn't have expected S_DAX flag"
fi
}