fstests.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] common/rc: use _try_scratch_mount for scratch_remount
@ 2019-03-28 11:52 XiaoLi Feng
  2019-03-30 11:54 ` Eryu Guan
  0 siblings, 1 reply; 2+ messages in thread
From: XiaoLi Feng @ 2019-03-28 11:52 UTC (permalink / raw)
  To: fstests; +Cc: smfrench, Xiaoli Feng

From: Xiaoli Feng <fengxiaoli0714@gmail.com>

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

Signed-off-by: Xiaoli Feng <fengxiaoli0714@gmail.com>
---
 common/rc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/rc b/common/rc
index 1c42515f..6c262e32 100644
--- a/common/rc
+++ b/common/rc
@@ -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
 }
 
-- 
2.18.1

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] common/rc: use _try_scratch_mount for scratch_remount
  2019-03-28 11:52 [PATCH] common/rc: use _try_scratch_mount for scratch_remount XiaoLi Feng
@ 2019-03-30 11:54 ` Eryu Guan
  0 siblings, 0 replies; 2+ messages in thread
From: Eryu Guan @ 2019-03-30 11:54 UTC (permalink / raw)
  To: XiaoLi Feng; +Cc: fstests, smfrench, Xiaoli Feng

On Thu, Mar 28, 2019 at 07:52:33PM +0800, Xiaoli Feng wrote:
> From: Xiaoli Feng <fengxiaoli0714@gmail.com>
> 
> When use scratch_remount, it always gives up the global mounted
> options. Then will make cifs mount failed for generic/306
> generic/452.
> 
> Signed-off-by: Xiaoli Feng <fengxiaoli0714@gmail.com>
> ---
>  common/rc | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/common/rc b/common/rc
> index 1c42515f..6c262e32 100644
> --- a/common/rc
> +++ b/common/rc
> @@ -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

>      fi
>  }
>  
> -- 
> 2.18.1
> 

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2019-03-30 11:54 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-03-28 11:52 [PATCH] common/rc: use _try_scratch_mount for scratch_remount XiaoLi Feng
2019-03-30 11:54 ` Eryu Guan

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).