fstests.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] generic/{569,570}: Filter pwrite64
@ 2019-10-25  8:34 Yang Xu
  2019-10-25  8:54 ` Eryu Guan
  0 siblings, 1 reply; 4+ messages in thread
From: Yang Xu @ 2019-10-25  8:34 UTC (permalink / raw)
  To: fstests; +Cc: Yang Xu

When I backport fix commits into old kernel, pwrite action will report
"pwrite64: Text file busy". Since xfsprogs without commit 2f9a125c3a39 
("xfsprogs: replace pread64/pwrite64 by equivalent pread/pwrite"),
it will report pwrite64. I think these kernel patchs are simple, old kernel
with lower version xfsprogs may backport these commits. So filter it.

Signed-off-by: Yang Xu <xuyang2018.jy@cn.fujitsu.com>
---
 tests/generic/569 | 4 ++--
 tests/generic/570 | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/generic/569 b/tests/generic/569
index 02fd8574..651af02f 100755
--- a/tests/generic/569
+++ b/tests/generic/569
@@ -52,8 +52,8 @@ done
 swapon $testfile 2>&1 | _filter_scratch
 
 # Can we write to it?
-$XFS_IO_PROG -c 'pwrite -S 0x59 64k 64k' $testfile
-$XFS_IO_PROG -d -c 'pwrite -S 0x60 64k 64k' $testfile
+$XFS_IO_PROG -c 'pwrite -S 0x59 64k 64k' $testfile 2>&1 | sed -e "s/pwrite64/pwrite/"
+$XFS_IO_PROG -d -c 'pwrite -S 0x60 64k 64k' $testfile 2>&1 | sed -e "s/pwrite64/pwrite/"
 $XFS_IO_PROG -c 'mmap -rw 64k 64k' -c 'mwrite -S 0x61 64k 64k' $testfile
 
 # Can we change the file size?
diff --git a/tests/generic/570 b/tests/generic/570
index 1c5f39f1..43ca5c0b 100755
--- a/tests/generic/570
+++ b/tests/generic/570
@@ -47,8 +47,8 @@ done
 swapon $SCRATCH_DEV 2>&1 | _filter_scratch
 
 # Can we write to it?
-$XFS_IO_PROG -c 'pwrite -S 0x59 64k 64k' $SCRATCH_DEV
-$XFS_IO_PROG -d -c 'pwrite -S 0x60 64k 64k' $SCRATCH_DEV
+$XFS_IO_PROG -c 'pwrite -S 0x59 64k 64k' $SCRATCH_DEV 2>&1 | sed -e "s/pwrite64/pwrite/"
+$XFS_IO_PROG -d -c 'pwrite -S 0x60 64k 64k' $SCRATCH_DEV 2>&1 | sed -e "s/pwrite64/pwrite/"
 $XFS_IO_PROG -c 'mmap -rw 64k 64k' -c 'mwrite -S 0x61 64k 64k' $SCRATCH_DEV
 
 # success, all done
-- 
2.18.0




^ permalink raw reply related	[flat|nested] 4+ messages in thread
* Re: [PATCH] generic/{569,570}: Filter pwrite64
  2019-10-25  8:34 [PATCH] generic/{569,570}: Filter pwrite64 Yang Xu
@ 2019-10-25  8:54 ` Eryu Guan
  2019-10-25  9:02   ` Yang Xu
  2019-10-25  9:19   ` [PATCH v2] generic/{569,570}: use _filter_xfs_io_error to filter pwrite64 Yang Xu
  0 siblings, 2 replies; 4+ messages in thread
From: Eryu Guan @ 2019-10-25  8:54 UTC (permalink / raw)
  To: Yang Xu; +Cc: fstests

On Fri, Oct 25, 2019 at 04:34:30PM +0800, Yang Xu wrote:
> When I backport fix commits into old kernel, pwrite action will report
> "pwrite64: Text file busy". Since xfsprogs without commit 2f9a125c3a39 
> ("xfsprogs: replace pread64/pwrite64 by equivalent pread/pwrite"),
> it will report pwrite64. I think these kernel patchs are simple, old kernel
> with lower version xfsprogs may backport these commits. So filter it.
> 
> Signed-off-by: Yang Xu <xuyang2018.jy@cn.fujitsu.com>
> ---
>  tests/generic/569 | 4 ++--
>  tests/generic/570 | 4 ++--
>  2 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/tests/generic/569 b/tests/generic/569
> index 02fd8574..651af02f 100755
> --- a/tests/generic/569
> +++ b/tests/generic/569
> @@ -52,8 +52,8 @@ done
>  swapon $testfile 2>&1 | _filter_scratch
>  
>  # Can we write to it?
> -$XFS_IO_PROG -c 'pwrite -S 0x59 64k 64k' $testfile
> -$XFS_IO_PROG -d -c 'pwrite -S 0x60 64k 64k' $testfile
> +$XFS_IO_PROG -c 'pwrite -S 0x59 64k 64k' $testfile 2>&1 | sed -e "s/pwrite64/pwrite/"
> +$XFS_IO_PROG -d -c 'pwrite -S 0x60 64k 64k' $testfile 2>&1 | sed -e "s/pwrite64/pwrite/"

Ah, I forgot about this error message inconsistency in review.. thanks
for the fix!

But there's already a filter to do this, _filter_xfs_io_error, you could
use it directly.

Thanks,
Eryu

>  $XFS_IO_PROG -c 'mmap -rw 64k 64k' -c 'mwrite -S 0x61 64k 64k' $testfile
>  
>  # Can we change the file size?
> diff --git a/tests/generic/570 b/tests/generic/570
> index 1c5f39f1..43ca5c0b 100755
> --- a/tests/generic/570
> +++ b/tests/generic/570
> @@ -47,8 +47,8 @@ done
>  swapon $SCRATCH_DEV 2>&1 | _filter_scratch
>  
>  # Can we write to it?
> -$XFS_IO_PROG -c 'pwrite -S 0x59 64k 64k' $SCRATCH_DEV
> -$XFS_IO_PROG -d -c 'pwrite -S 0x60 64k 64k' $SCRATCH_DEV
> +$XFS_IO_PROG -c 'pwrite -S 0x59 64k 64k' $SCRATCH_DEV 2>&1 | sed -e "s/pwrite64/pwrite/"
> +$XFS_IO_PROG -d -c 'pwrite -S 0x60 64k 64k' $SCRATCH_DEV 2>&1 | sed -e "s/pwrite64/pwrite/"
>  $XFS_IO_PROG -c 'mmap -rw 64k 64k' -c 'mwrite -S 0x61 64k 64k' $SCRATCH_DEV
>  
>  # success, all done
> -- 
> 2.18.0
> 
> 

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [PATCH] generic/{569,570}: Filter pwrite64
  2019-10-25  8:54 ` Eryu Guan
@ 2019-10-25  9:02   ` Yang Xu
  2019-10-25  9:19   ` [PATCH v2] generic/{569,570}: use _filter_xfs_io_error to filter pwrite64 Yang Xu
  1 sibling, 0 replies; 4+ messages in thread
From: Yang Xu @ 2019-10-25  9:02 UTC (permalink / raw)
  To: Eryu Guan; +Cc: fstests



on 2019/10/25 16:54, Eryu Guan wrote:
> On Fri, Oct 25, 2019 at 04:34:30PM +0800, Yang Xu wrote:
>> When I backport fix commits into old kernel, pwrite action will report
>> "pwrite64: Text file busy". Since xfsprogs without commit 2f9a125c3a39
>> ("xfsprogs: replace pread64/pwrite64 by equivalent pread/pwrite"),
>> it will report pwrite64. I think these kernel patchs are simple, old kernel
>> with lower version xfsprogs may backport these commits. So filter it.
>>
>> Signed-off-by: Yang Xu <xuyang2018.jy@cn.fujitsu.com>
>> ---
>>   tests/generic/569 | 4 ++--
>>   tests/generic/570 | 4 ++--
>>   2 files changed, 4 insertions(+), 4 deletions(-)
>>
>> diff --git a/tests/generic/569 b/tests/generic/569
>> index 02fd8574..651af02f 100755
>> --- a/tests/generic/569
>> +++ b/tests/generic/569
>> @@ -52,8 +52,8 @@ done
>>   swapon $testfile 2>&1 | _filter_scratch
>>   
>>   # Can we write to it?
>> -$XFS_IO_PROG -c 'pwrite -S 0x59 64k 64k' $testfile
>> -$XFS_IO_PROG -d -c 'pwrite -S 0x60 64k 64k' $testfile
>> +$XFS_IO_PROG -c 'pwrite -S 0x59 64k 64k' $testfile 2>&1 | sed -e "s/pwrite64/pwrite/"
>> +$XFS_IO_PROG -d -c 'pwrite -S 0x60 64k 64k' $testfile 2>&1 | sed -e "s/pwrite64/pwrite/"
> 
> Ah, I forgot about this error message inconsistency in review.. thanks
> for the fix!
> 
> But there's already a filter to do this, _filter_xfs_io_error, you could
> use it directly.
OK. I will use _filter_xfs_io_error in my v2 patch.
> 
> Thanks,
> Eryu
> 
>>   $XFS_IO_PROG -c 'mmap -rw 64k 64k' -c 'mwrite -S 0x61 64k 64k' $testfile
>>   
>>   # Can we change the file size?
>> diff --git a/tests/generic/570 b/tests/generic/570
>> index 1c5f39f1..43ca5c0b 100755
>> --- a/tests/generic/570
>> +++ b/tests/generic/570
>> @@ -47,8 +47,8 @@ done
>>   swapon $SCRATCH_DEV 2>&1 | _filter_scratch
>>   
>>   # Can we write to it?
>> -$XFS_IO_PROG -c 'pwrite -S 0x59 64k 64k' $SCRATCH_DEV
>> -$XFS_IO_PROG -d -c 'pwrite -S 0x60 64k 64k' $SCRATCH_DEV
>> +$XFS_IO_PROG -c 'pwrite -S 0x59 64k 64k' $SCRATCH_DEV 2>&1 | sed -e "s/pwrite64/pwrite/"
>> +$XFS_IO_PROG -d -c 'pwrite -S 0x60 64k 64k' $SCRATCH_DEV 2>&1 | sed -e "s/pwrite64/pwrite/"
>>   $XFS_IO_PROG -c 'mmap -rw 64k 64k' -c 'mwrite -S 0x61 64k 64k' $SCRATCH_DEV
>>   
>>   # success, all done
>> -- 
>> 2.18.0
>>
>>
> 
> 



^ permalink raw reply	[flat|nested] 4+ messages in thread
* [PATCH v2] generic/{569,570}: use _filter_xfs_io_error to filter pwrite64
  2019-10-25  8:54 ` Eryu Guan
  2019-10-25  9:02   ` Yang Xu
@ 2019-10-25  9:19   ` Yang Xu
  1 sibling, 0 replies; 4+ messages in thread
From: Yang Xu @ 2019-10-25  9:19 UTC (permalink / raw)
  To: eguan; +Cc: fstests, Yang Xu

When I backport fix commits into old kernel, pwrite action will report
"pwrite64: Text file busy". Since xfsprogs without commit 2f9a125c3a39
("xfsprogs: replace pread64/pwrite64 by equivalent pread/pwrite"), it
will report pwrite64. I think these kernel patchs are simple, old kernel
with lower version xfsprogs may backport these commits. So filter it.

Signed-off-by: Yang Xu <xuyang2018.jy@cn.fujitsu.com>
---
 tests/generic/569 | 4 ++--
 tests/generic/570 | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/generic/569 b/tests/generic/569
index 02fd8574..4573be5a 100755
--- a/tests/generic/569
+++ b/tests/generic/569
@@ -52,8 +52,8 @@ done
 swapon $testfile 2>&1 | _filter_scratch
 
 # Can we write to it?
-$XFS_IO_PROG -c 'pwrite -S 0x59 64k 64k' $testfile
-$XFS_IO_PROG -d -c 'pwrite -S 0x60 64k 64k' $testfile
+$XFS_IO_PROG -c 'pwrite -S 0x59 64k 64k' $testfile 2>&1 | _filter_xfs_io_error
+$XFS_IO_PROG -d -c 'pwrite -S 0x60 64k 64k' $testfile 2>&1 | _filter_xfs_io_error
 $XFS_IO_PROG -c 'mmap -rw 64k 64k' -c 'mwrite -S 0x61 64k 64k' $testfile
 
 # Can we change the file size?
diff --git a/tests/generic/570 b/tests/generic/570
index 1c5f39f1..d574f4b7 100755
--- a/tests/generic/570
+++ b/tests/generic/570
@@ -47,8 +47,8 @@ done
 swapon $SCRATCH_DEV 2>&1 | _filter_scratch
 
 # Can we write to it?
-$XFS_IO_PROG -c 'pwrite -S 0x59 64k 64k' $SCRATCH_DEV
-$XFS_IO_PROG -d -c 'pwrite -S 0x60 64k 64k' $SCRATCH_DEV
+$XFS_IO_PROG -c 'pwrite -S 0x59 64k 64k' $SCRATCH_DEV 2>&1 | _filter_xfs_io_error
+$XFS_IO_PROG -d -c 'pwrite -S 0x60 64k 64k' $SCRATCH_DEV 2>&1 | _filter_xfs_io_error
 $XFS_IO_PROG -c 'mmap -rw 64k 64k' -c 'mwrite -S 0x61 64k 64k' $SCRATCH_DEV
 
 # success, all done
-- 
2.18.0




^ permalink raw reply related	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-10-25  9:18 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-25  8:34 [PATCH] generic/{569,570}: Filter pwrite64 Yang Xu
2019-10-25  8:54 ` Eryu Guan
2019-10-25  9:02   ` Yang Xu
2019-10-25  9:19   ` [PATCH v2] generic/{569,570}: use _filter_xfs_io_error to filter pwrite64 Yang Xu

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).