[PATCH v1] common/rc: not run swapfile test for DAX

[Date Prev] [Date Next] [Thread Prev] [Thread Next] [Date Index] [Thread Index]



From: root <root@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>

DAX doesn't support swapfile. Without this patch,
_require_scratch_swapfile always returns fail for fsdax. Now
change to notrun.

Signed-off-by: root <root@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>
---
 common/rc | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/common/rc b/common/rc
index 23f86ce6..d02b9f72 100644
--- a/common/rc
+++ b/common/rc
@@ -2384,7 +2384,11 @@ _require_scratch_swapfile()
 	ext2|ext3|ext4|xfs)
 		if ! swapon "$SCRATCH_MNT/swap" >/dev/null 2>&1; then
 			_scratch_unmount
-			_fail "swapon failed for $FSTYP"
+			if _normalize_mount_options | egrep -q "dax(=always| |$)"; then
+				_notrun "swapfiles are not supported"
+			else
+				_fail "swapon failed for $FSTYP"
+			fi
 		fi
 		;;
 	*)
-- 
2.27.0




[Index of Archives]     [Linux Filesystems Development]     [Linux NFS]     [Linux NILFS]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux