[PATCH] tmpfs: don't require TEST_DEV

[PATCH] tmpfs: don't require TEST_DEV

[Miklos Szeredi]

tmpfs doesn't require a device and the source argument of the mount is ignored.
If TEST_DEV is not given then set it to "none".

Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
---
 common/config | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/common/config b/common/config
index 2f1f27206776..40c2b399a3c7 100644
--- a/common/config
+++ b/common/config
@@ -456,8 +456,9 @@ _check_device()
 	fi
 
 	case "$FSTYP" in
-	9p)
+	9p|tmpfs)
 		# 9p mount tags are just plain strings, so anything is allowed
+		# tmpfs doesn't use mount source, ignore
 		;;
 	overlay)
 		if [ ! -d "$dev" ]; then
@@ -657,6 +658,10 @@ get_next_config() {
 		export RESULT_BASE="$here/results/"
 	fi
 
+	if [ "$FSTYP" == tmpfs -a -z "$TEST_DEV" ]; then
+		export TEST_DEV=none
+	fi
+
 	#  Mandatory Config values.
 	MC=""
 	[ -z "$EMAIL" ]          && MC="$MC EMAIL"
-- 
2.14.3

Re: [PATCH] tmpfs: don't require TEST_DEV

[Eryu Guan]

On Mon, Sep 03, 2018 at 02:27:28PM +0200, Miklos Szeredi wrote:
> tmpfs doesn't require a device and the source argument of the mount is ignored.
> If TEST_DEV is not given then set it to "none".
> 
> Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
> ---
>  common/config | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/common/config b/common/config
> index 2f1f27206776..40c2b399a3c7 100644
> --- a/common/config
> +++ b/common/config
> @@ -456,8 +456,9 @@ _check_device()
>  	fi
>  
>  	case "$FSTYP" in
> -	9p)
> +	9p|tmpfs)
>  		# 9p mount tags are just plain strings, so anything is allowed
> +		# tmpfs doesn't use mount source, ignore
>  		;;
>  	overlay)
>  		if [ ! -d "$dev" ]; then
> @@ -657,6 +658,10 @@ get_next_config() {
>  		export RESULT_BASE="$here/results/"
>  	fi
>  
> +	if [ "$FSTYP" == tmpfs -a -z "$TEST_DEV" ]; then
> +		export TEST_DEV=none
> +	fi
> +

Looks like we could ignore SCRATCH_DEV as well, just set it to a
different name. I'll just update it on commit.

Thanks,
Eryu

>  	#  Mandatory Config values.
>  	MC=""
>  	[ -z "$EMAIL" ]          && MC="$MC EMAIL"
> -- 
> 2.14.3
> 

Re: [PATCH] tmpfs: don't require TEST_DEV

[Miklos Szeredi]

On Sun, Sep 9, 2018 at 4:56 PM, Eryu Guan <guaneryu@gmail.com> wrote:
> On Mon, Sep 03, 2018 at 02:27:28PM +0200, Miklos Szeredi wrote:
>> tmpfs doesn't require a device and the source argument of the mount is ignored.
>> If TEST_DEV is not given then set it to "none".
>>
>> Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
>> ---
>>  common/config | 7 ++++++-
>>  1 file changed, 6 insertions(+), 1 deletion(-)
>>
>> diff --git a/common/config b/common/config
>> index 2f1f27206776..40c2b399a3c7 100644
>> --- a/common/config
>> +++ b/common/config
>> @@ -456,8 +456,9 @@ _check_device()
>>       fi
>>
>>       case "$FSTYP" in
>> -     9p)
>> +     9p|tmpfs)
>>               # 9p mount tags are just plain strings, so anything is allowed
>> +             # tmpfs doesn't use mount source, ignore
>>               ;;
>>       overlay)
>>               if [ ! -d "$dev" ]; then
>> @@ -657,6 +658,10 @@ get_next_config() {
>>               export RESULT_BASE="$here/results/"
>>       fi
>>
>> +     if [ "$FSTYP" == tmpfs -a -z "$TEST_DEV" ]; then
>> +             export TEST_DEV=none
>> +     fi
>> +
>
> Looks like we could ignore SCRATCH_DEV as well, just set it to a
> different name. I'll just update it on commit.

Actually, no need to set it to a different name, since the $DEV
argument of tmpfs is completely ignored (just like proc, sys, etc).

Thanks,
Miklos

Re: [PATCH] tmpfs: don't require TEST_DEV

[Eryu Guan]

On Sun, Sep 09, 2018 at 09:07:52PM +0200, Miklos Szeredi wrote:
> On Sun, Sep 9, 2018 at 4:56 PM, Eryu Guan <guaneryu@gmail.com> wrote:
> > On Mon, Sep 03, 2018 at 02:27:28PM +0200, Miklos Szeredi wrote:
> >> tmpfs doesn't require a device and the source argument of the mount is ignored.
> >> If TEST_DEV is not given then set it to "none".
> >>
> >> Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
> >> ---
> >>  common/config | 7 ++++++-
> >>  1 file changed, 6 insertions(+), 1 deletion(-)
> >>
> >> diff --git a/common/config b/common/config
> >> index 2f1f27206776..40c2b399a3c7 100644
> >> --- a/common/config
> >> +++ b/common/config
> >> @@ -456,8 +456,9 @@ _check_device()
> >>       fi
> >>
> >>       case "$FSTYP" in
> >> -     9p)
> >> +     9p|tmpfs)
> >>               # 9p mount tags are just plain strings, so anything is allowed
> >> +             # tmpfs doesn't use mount source, ignore
> >>               ;;
> >>       overlay)
> >>               if [ ! -d "$dev" ]; then
> >> @@ -657,6 +658,10 @@ get_next_config() {
> >>               export RESULT_BASE="$here/results/"
> >>       fi
> >>
> >> +     if [ "$FSTYP" == tmpfs -a -z "$TEST_DEV" ]; then
> >> +             export TEST_DEV=none
> >> +     fi
> >> +
> >
> > Looks like we could ignore SCRATCH_DEV as well, just set it to a
> > different name. I'll just update it on commit.
> 
> Actually, no need to set it to a different name, since the $DEV
> argument of tmpfs is completely ignored (just like proc, sys, etc).

That's true. But fstests will check if the device is mounted or not
based on the device name, so if TEST_DEV is already mounted with "none"
and SCRATCH_DEV shares the same name, fstests will find SCRATCH_DEV
already mounted at a wrong path and exit.

Thanks,
Eryu