Skip to contentSkip to conversation

common/rc: use _try_scratch_mount for scratch_remount

PATCH Superseded XiaoLi Feng 2 participants 2 messages Mar 28, 2019 – Mar 30, 2019

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 common/rc: use _try_scratch_mount for scratch_remount

From: Xiaoli Feng <[email protected]>

When use scratch_remount, it always gives up the global mounted options. Then will make cifs mount failed for generic/306 generic/452.

---
 common/rc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
common/rc +1 -1
index 1c42515f..6c262e32 100644
@@ -357,7 +357,7 @@ _scratch_remount()
     local opts="$1"
 
     if test -n "$opts"; then
-	mount -o "remount,$opts" $SCRATCH_MNT
+	_try_scratch_mount "-o remount,$opts"
     fi
 }
 
Signature · 1 line
2.18.1
#1 lore raw
Quoted 16 lines · Xiaoli Feng

From: Xiaoli Feng <[email protected]>

When use scratch_remount, it always gives up the global mounted options. Then will make cifs mount failed for generic/306 generic/452.

---
 common/rc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
common/rc +0 -0
index 1c42515f..6c262e32 100644

common/rc _scratch_remount() · line 360

Quoted 5 lines
common/rc +1 -1
@@ -357,7 +357,7 @@ _scratch_remount()
     local opts="$1"
 
     if test -n "$opts"; then
-	mount -o "remount,$opts" $SCRATCH_MNT
+	_try_scratch_mount "-o remount,$opts"

This breaks overlay/035, in which the first overlay mount is done with only lowerdir, so a normal _try_scratch_mount won't work. Switch it to a bare $MOUNT_PROG would work.

Thanks,
Eryu

Quoted 6 lines
common/rc +0 -0
     fi
 }
 
Signature · 1 line
2.18.1