From: Eryu Guan <eguan@redhat.com>
Date: Mon, 10 Nov 2014 07:06:23 +0000 (+1100)
Subject: common: use _scratch_mount helper in _require_relatime()
X-Git-Tag: v2022.05.01~3010
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=1bc9c1a06eb51cc8278dc4c2a24af9a00a20f017;p=users%2Fhch%2Fxfstests-dev.git

common: use _scratch_mount helper in _require_relatime()

Change the way how _require_relatime() mount $SCRATCH_DEV, use
_scratch_mount helper so $SCRATCH_DEV is mounted with selinux context,
to avoid "same superblock, different selinux context" failure.

Signed-off-by: Eryu Guan <eguan@redhat.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
---

diff --git a/common/rc b/common/rc
index fc18520da..d5e3aff0d 100644
--- a/common/rc
+++ b/common/rc
@@ -2399,7 +2399,7 @@ _require_atime()
 _require_relatime()
 {
         _scratch_mkfs > /dev/null 2>&1
-        _mount -t $FSTYP -o relatime $SCRATCH_DEV $SCRATCH_MNT || \
+        _scratch_mount -o relatime || \
                 _notrun "relatime not supported by the current kernel"
 	_scratch_unmount
 }