From 8cbd341fb41d88a3b4fba16ca424b33744148fbe Mon Sep 17 00:00:00 2001 From: Amir Goldstein Date: Wed, 27 Sep 2017 10:04:09 +0300 Subject: [PATCH] overlay: remove stale implementation of _scratch_mount_options _scratch_mount_options() was not implemented correctly for overlayfs and wasn't used by any overlay tests. Signed-off-by: Amir Goldstein Reviewed-by: Eryu Guan Signed-off-by: Eryu Guan --- common/rc | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/common/rc b/common/rc index 95d4306e..5ba502f8 100644 --- 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 } -- 2.39.5