Skip to contentSkip to conversation

common/rc: use _try_scratch_mount for scratch_remount

PATCH Superseded XiaoLi Feng 3 participants 3 messages Apr 8, 2019 – Apr 9, 2019 1 message not in the archive

lore
Share & tools
lore
#0 lore raw

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

From: Xiaoli Feng <[email protected]>

When call _scratch_remount for cifs , it always requires to input password. This will make generic/306 generic/452 failed because cifs remount failed.

---
 common/rc         | 2 +-
 tests/overlay/035 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
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
 }
 
tests/overlay/035 +1 -1
index f36c1e10..c0aae935 100755
@@ -55,7 +55,7 @@ mkdir -p $lowerdir1 $lowerdir2 $upperdir $workdir
 $MOUNT_PROG -t overlay -o"lowerdir=$lowerdir2:$lowerdir1" \
 			$OVL_BASE_SCRATCH_MNT $SCRATCH_MNT
 touch $SCRATCH_MNT/foo 2>&1 | _filter_scratch
-_scratch_remount rw 2>&1 | _filter_ro_mount
+$MOUNT_PROG -o remount,rw $SCRATCH_MNT 2>&1 | _filter_ro_mount
 $UMOUNT_PROG $SCRATCH_MNT
 
 # Make workdir immutable to prevent workdir re-create on mount
Signature · 1 line
2.18.1
#1 lore raw
Quoted 5 lines · Xiaoli Feng

From: Xiaoli Feng <[email protected]>

When call _scratch_remount for cifs , it always requires to input password. This will make generic/306 generic/452 failed because cifs remount failed.

You're missing Signed-off-by tag, would you please resend?

And many thanks to Steve French for helping test the patch! May I add your Tested-by tag?

Thanks,
Eryu

Quoted 34 lines
---
 common/rc         | 2 +-
 tests/overlay/035 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
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
 }
 
tests/overlay/035 +1 -1
index f36c1e10..c0aae935 100755
@@ -55,7 +55,7 @@ mkdir -p $lowerdir1 $lowerdir2 $upperdir $workdir
 $MOUNT_PROG -t overlay -o"lowerdir=$lowerdir2:$lowerdir1" \
 			$OVL_BASE_SCRATCH_MNT $SCRATCH_MNT
 touch $SCRATCH_MNT/foo 2>&1 | _filter_scratch
-_scratch_remount rw 2>&1 | _filter_ro_mount
+$MOUNT_PROG -o remount,rw $SCRATCH_MNT 2>&1 | _filter_ro_mount
 $UMOUNT_PROG $SCRATCH_MNT
 
 # Make workdir immutable to prevent workdir re-create on mount
Signature · 1 line
2.18.1

A message that is not in the archive (sent off-list or not yet received): CAH2r5mtbjLomReukHw8xO_mm8R0MgVBo7GzZWFxC8i+6X-JeeA@mail.gmail.com

#3 lore raw

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

---------- Forwarded message ---------
From: Steve French <[email protected]>
Date: Mon, Apr 8, 2019 at 8:59 PM
Subject: Re: [PATCH v3] common/rc: use _try_scratch_mount for scratch_remount
To: Eryu Guan <[email protected]>
Cc: Xiaoli Feng <[email protected]>, <[email protected]>

Quoted 4 lines · On Mon, Apr 8, 2019, 20:50 Eryu Guan <[email protected]> wrote:
Quoted 2 lines · Xiaoli Feng

From: Xiaoli Feng <[email protected]>

Quoted 9 lines
Quoted 3 lines

When call _scratch_remount for cifs , it always requires to input password. This will make generic/306 generic/452 failed because cifs remount failed.

You're missing Signed-off-by tag, would you please resend?

And many thanks to Steve French for helping test the patch! May I add your Tested-by tag?

Yes - no problem

Reviewed-and-tested-by Steve French <[email protected]>

I am very excited about the improved automation of various xfstests for build verification testing for cifs.ko with various SMB3 server targets (Various Samba/Linux, Azure (cloud), Windows etc.) and using various common mount options - so any additional tests we can add is of significant benefit (we have found dozens of bugs and missing features as a result of these testing improvements in the last five months).

Quoted 37 lines

Thanks,
Eryu

Quoted 34 lines
---
 common/rc         | 2 +-
 tests/overlay/035 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
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
 }
 
tests/overlay/035 +1 -2
index f36c1e10..c0aae935 100755
@@ -55,7 +55,7 @@ mkdir -p $lowerdir1 $lowerdir2 $upperdir $workdir
 $MOUNT_PROG -t overlay -o"lowerdir=$lowerdir2:$lowerdir1" \
                      $OVL_BASE_SCRATCH_MNT $SCRATCH_MNT
 touch $SCRATCH_MNT/foo 2>&1 | _filter_scratch
-_scratch_remount rw 2>&1 | _filter_ro_mount
+$MOUNT_PROG -o remount,rw $SCRATCH_MNT 2>&1 | _filter_ro_mount
 $UMOUNT_PROG $SCRATCH_MNT
 
 # Make workdir immutable to prevent workdir re-create on mount
--

2.18.1

Signature · 3 lines
Thanks,

Steve