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/xfs: refactor xfs_scrub presence testing

Browse Source 
Move all the requirements checking for xfs_scrub into a helper function.
Make sure the helper properly detects the presence of the scrub ioctl
and situations where we can't run scrub (e.g. norecovery).

Refactor the existing three xfs_scrub call sites to use the helper to
check if it's appropriate to run scrub.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Eryu Guan <eguan@redhat.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>
This commit is contained in:
Darrick J. Wong
2017-10-27 13:21:46 -07:00
committed by Eryu Guan
parent 4b69106b60
commit 5cd65cb761
5 changed files with 42 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/xfs
+34 -7
View File
@@ -298,6 +298,30 @@ _require_xfs_db_command()
_notrun "xfs_db $command support is missing"
}
# Does the filesystem mounted from a particular device support scrub?
_supports_xfs_scrub()
{
local mountpoint="$1"
local device="$2"
if [ ! -b "$device" ] || [ ! -e "$mountpoint" ]; then
echo "Usage: _supports_xfs_scrub mountpoint device"
exit 1
fi
test "$FSTYP" = "xfs" || return 1
test -x "$XFS_SCRUB_PROG" || return 1
# Probe for kernel support...
$XFS_IO_PROG -c 'help scrub' 2>&1 | grep -q 'types are:.*probe' || return 1
$XFS_IO_PROG -c "scrub probe 0" "$mountpoint" 2>&1 | grep -q "Inappropriate ioctl" && return 1
# Scrub can't run on norecovery mounts
_fs_options "$device" | grep -q "norecovery" && return 1
return 0
}
# run xfs_check and friends on a FS.
_check_xfs_filesystem()
{
@@ -330,14 +354,17 @@ _check_xfs_filesystem()
type=`_fs_type $device`
ok=1
if [ "$type" = "xfs" ]; then
if [ -n "$TEST_XFS_SCRUB" ] && [ -x "$XFS_SCRUB_PROG" ]; then
"$XFS_SCRUB_PROG" $scrubflag -v -d -n $device >>$seqres.full
if [ $? -ne 0 ]; then
_log_err "filesystem on $device failed scrub"
ok=0
fi
# Run online scrub if we can.
mntpt="$(_is_mounted $device)"
if [ -n "$mntpt" ] && _supports_xfs_scrub "$mntpt" "$device"; then
"$XFS_SCRUB_PROG" $scrubflag -v -d -n $device >>$seqres.full 2>&1
if [ $? -ne 0 ]; then
_log_err "filesystem on $device failed scrub"
ok=0
fi
fi
if [ "$type" = "xfs" ]; then
# mounted ...
mountpoint=`_umount_or_remount_ro $device`
fi