From: Darrick J. Wong <darrick.wong@oracle.com>
Date: Thu, 4 Aug 2016 00:34:35 +0000 (-0700)
Subject: common/dmerror: fix mount option issues
X-Git-Tag: v2022.05.01~2402
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=27516d43f4d8a64cc36663e4516d33c0cd0208d1;p=users%2Fhch%2Fxfstests-dev.git

common/dmerror: fix mount option issues

Calling _mount doesn't work when we want to add mount options such
as realtime devices. Fix it by calling _scratch_options first then
mount with $SCRATCH_OPTIONS.

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>
---

diff --git a/common/dmerror b/common/dmerror
index 5ad999438..d46c5d0b7 100644
--- a/common/dmerror
+++ b/common/dmerror
@@ -41,14 +41,11 @@ _dmerror_init()
 	DMERROR_TABLE="0 $blk_dev_size error $dm_backing_dev 0"
 }
 
-_dmerror_mount_options()
-{
-	echo `_common_dev_mount_options $*` $DMERROR_DEV $SCRATCH_MNT
-}
-
 _dmerror_mount()
 {
-	_mount -t $FSTYP `_dmerror_mount_options $*`
+	_scratch_options mount
+	$MOUNT_PROG -t $FSTYP `_common_dev_mount_options $*` $SCRATCH_OPTIONS \
+		$DMERROR_DEV $SCRATCH_MNT
 }
 
 _dmerror_unmount()