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: fix various problems with _supports_xfs_scrub

Browse Source 
The _supports_xfs_scrub helper is called with a mountpoint (a working
mountpoint is required for scrub) and a block device (used to detect
norecovery mounts).  If either of these conditions aren't satisfied we
should return failure status to the caller, not unilaterally decide to
bail out of the test.  In particular, the -b test doesn't work if the
fs has already shutdown on us.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Eryu Guan <guaneryu@gmail.com>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>
This commit is contained in:
Darrick J. Wong
2018-03-21 19:48:09 -07:00
committed by Eryu Guan
parent 064c618989
commit 8aa212310d
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/xfs
+6 -2
View File
@@ -305,9 +305,13 @@ _supports_xfs_scrub()
local mountpoint="$1" local mountpoint="$1"
local device="$2" local device="$2"
if [ ! -b "$device" ] || [ ! -e "$mountpoint" ]; then if [ -z "$device" ] || [ -z "$mountpoint" ]; then
echo "Usage: _supports_xfs_scrub mountpoint device" echo "Usage: _supports_xfs_scrub mountpoint device"
exit 1 return 1
fi
if [ ! -b "$device" ] || [ ! -e "$mountpoint" ]; then
return 1
fi fi
test "$FSTYP" = "xfs" || return 1 test "$FSTYP" = "xfs" || return 1