overlay: remove stale implementation of _scratch_mount_options
authorAmir Goldstein <amir73il@gmail.com>
Wed, 27 Sep 2017 07:04:09 +0000 (10:04 +0300)
committerEryu Guan <eguan@redhat.com>
Tue, 10 Oct 2017 07:44:18 +0000 (15:44 +0800)
_scratch_mount_options() was not implemented correctly for
overlayfs and wasn't used by any overlay tests.

Signed-off-by: Amir Goldstein <amir73il@gmail.com>
Reviewed-by: Eryu Guan <eguan@redhat.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>
common/rc

index 95d4306eb611339e5ece117d19d2117fb4ff2613..5ba502f8f1fc07821aa44577c5ea08ab78dc9e4d 100644 (file)
--- a/common/rc
+++ b/common/rc
@@ -300,26 +300,10 @@ _common_dev_mount_options()
        echo $MOUNT_OPTIONS $SELINUX_MOUNT_OPTIONS $*
 }
 
-_overlay_basic_mount_options()
-{
-       echo "-o lowerdir=$1/$OVL_LOWER,upperdir=$1/$OVL_UPPER,workdir=$1/$OVL_WORK"
-}
-
-_overlay_mount_options()
-{
-       echo `_common_dev_mount_options` \
-            `_overlay_basic_mount_options $1` \
-            $OVERLAY_MOUNT_OPTIONS
-}
-
 _scratch_mount_options()
 {
        _scratch_options mount
 
-       if [ "$FSTYP" == "overlay" ]; then
-               echo `_overlay_mount_options $OVL_BASE_SCRATCH_MNT`
-               return 0
-       fi
        echo `_common_dev_mount_options $*` $SCRATCH_OPTIONS \
                                        $SCRATCH_DEV $SCRATCH_MNT
 }