[PATCH] common/rc: fix fsmap check

[PATCH] common/rc: fix fsmap check

[Xiao Yang]

I got an error about $TEST_DIR being a directory when xfs/273 ran, because
xfs_io tried to open the directory first before it parsed the -T options.
So fix it by checking this error.

Signed-off-by: Xiao Yang <yangx.jy@cn.fujitsu.com>
---
 common/rc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/rc b/common/rc
index 13afc6a..1be803b 100644
--- a/common/rc
+++ b/common/rc
@@ -2051,7 +2051,7 @@ _require_xfs_io_command()
 	"fsmap" )
 		testio=`$XFS_IO_PROG -T -F -c "fsmap" \
 			$TEST_DIR 2>&1`
-		echo $testio | egrep -q "Inappropriate ioctl" && \
+		echo $testio | egrep -q "Inappropriate ioctl|Is a directory" && \
 			_notrun "xfs_io $command support is missing"
 		;;
 	*)
-- 
1.8.3.1

Re: [PATCH] common/rc: fix fsmap check

[Dave Chinner]

On Mon, Sep 19, 2016 at 04:26:15PM +0800, Xiao Yang wrote:
> I got an error about $TEST_DIR being a directory when xfs/273 ran, because
> xfs_io tried to open the directory first before it parsed the -T options.
> So fix it by checking this error.

Can I suggest that you read the man page and understand how the
command is supposed to work before posting patches to change the
test? i.e the -T option /requires/ a directory to be supplied to it:

    -T  create a temporary file not linked into the filesystem
	namespace (O_TMPFILE).  The pathname passed must refer to a
	directory which is  treated as virtual parent for the newly
	created invisible file.  Can not be used together with the
	-r option.

IOWs, there is nothing wrong with the test code - if you if
you are getting an EISDIR error here then something is broken with
the xfs_io binary you are using.

And, because I haven't merged fsmap support into xfs_io yet, it's
very likely there is a problem in the prototype patchset you are
running. Perhaps that's worth reporting to the patchset author....

Cheers,

Dave.
-- 
Dave Chinner
david@fromorbit.com

Re: [PATCH] common/rc: fix fsmap check

[Xiao Yang]

On 2016/09/20 6:31, Dave Chinner wrote:
> On Mon, Sep 19, 2016 at 04:26:15PM +0800, Xiao Yang wrote:
>> I got an error about $TEST_DIR being a directory when xfs/273 ran, because
>> xfs_io tried to open the directory first before it parsed the -T options.
>> So fix it by checking this error.
> Can I suggest that you read the man page and understand how the
> command is supposed to work before posting patches to change the
> test? i.e the -T option /requires/ a directory to be supplied to it:
>
>      -T  create a temporary file not linked into the filesystem
> 	namespace (O_TMPFILE).  The pathname passed must refer to a
> 	directory which is  treated as virtual parent for the newly
> 	created invisible file.  Can not be used together with the
> 	-r option.
>
> IOWs, there is nothing wrong with the test code - if you if
> you are getting an EISDIR error here then something is broken with
> the xfs_io binary you are using.
>
> And, because I haven't merged fsmap support into xfs_io yet, it's
> very likely there is a problem in the prototype patchset you are
> running. Perhaps that's worth reporting to the patchset author....
>
> Cheers,
>
> Dave.
Hi Dave

In xfstests/common/rc:2045
"flink" )
     testio=`$XFS_IO_PROG -T -F -c "flink $testfile" \
     $TEST_DIR 2>&1`
    echo $testio | egrep -q "invalid option|Is a directory" && \
   _notrun "xfs_io $command support is missing"
;;

I found that someone has met the same error and sent a patch to fix 
flink check.
Please see the following patch:
https://git.kernel.org/cgit/fs/xfs/xfstests-dev.git/commit/common/rc?id=0fd4705782c3748b2f83a10ce7cb7f33ffc8ad77

Thanks
Xiao Yang

Re: [PATCH] common/rc: fix fsmap check

[Darrick J. Wong]

On Tue, Sep 20, 2016 at 10:45:17AM +0800, Xiao Yang wrote:
> On 2016/09/20 6:31, Dave Chinner wrote:
> >On Mon, Sep 19, 2016 at 04:26:15PM +0800, Xiao Yang wrote:
> >>I got an error about $TEST_DIR being a directory when xfs/273 ran, because
> >>xfs_io tried to open the directory first before it parsed the -T options.
> >>So fix it by checking this error.
> >Can I suggest that you read the man page and understand how the
> >command is supposed to work before posting patches to change the
> >test? i.e the -T option /requires/ a directory to be supplied to it:
> >
> >     -T  create a temporary file not linked into the filesystem
> >	namespace (O_TMPFILE).  The pathname passed must refer to a
> >	directory which is  treated as virtual parent for the newly
> >	created invisible file.  Can not be used together with the
> >	-r option.
> >
> >IOWs, there is nothing wrong with the test code - if you if
> >you are getting an EISDIR error here then something is broken with
> >the xfs_io binary you are using.
> >
> >And, because I haven't merged fsmap support into xfs_io yet, it's
> >very likely there is a problem in the prototype patchset you are
> >running. Perhaps that's worth reporting to the patchset author....

Just get rid of -T, getfsmap doesn't care if it's run against a file
or a directory.

Yes sorry that was my fault for cut-and-paste coding. :(

--D

> >
> >Cheers,
> >
> >Dave.
> Hi Dave
> 
> In xfstests/common/rc:2045
> "flink" )
>     testio=`$XFS_IO_PROG -T -F -c "flink $testfile" \
>     $TEST_DIR 2>&1`
>    echo $testio | egrep -q "invalid option|Is a directory" && \
>   _notrun "xfs_io $command support is missing"
> ;;
> 
> I found that someone has met the same error and sent a patch to fix flink
> check.
> Please see the following patch:
> https://git.kernel.org/cgit/fs/xfs/xfstests-dev.git/commit/common/rc?id=0fd4705782c3748b2f83a10ce7cb7f33ffc8ad77
> 
> Thanks
> Xiao Yang
> 
> 
> 

Re: [PATCH] common/rc: fix fsmap check

[Xiao Yang]

On 2016/09/20 11:03, Darrick J. Wong wrote:
> On Tue, Sep 20, 2016 at 10:45:17AM +0800, Xiao Yang wrote:
>> On 2016/09/20 6:31, Dave Chinner wrote:
>>> On Mon, Sep 19, 2016 at 04:26:15PM +0800, Xiao Yang wrote:
>>>> I got an error about $TEST_DIR being a directory when xfs/273 ran, because
>>>> xfs_io tried to open the directory first before it parsed the -T options.
>>>> So fix it by checking this error.
>>> Can I suggest that you read the man page and understand how the
>>> command is supposed to work before posting patches to change the
>>> test? i.e the -T option /requires/ a directory to be supplied to it:
>>>
>>>      -T  create a temporary file not linked into the filesystem
>>> 	namespace (O_TMPFILE).  The pathname passed must refer to a
>>> 	directory which is  treated as virtual parent for the newly
>>> 	created invisible file.  Can not be used together with the
>>> 	-r option.
>>>
>>> IOWs, there is nothing wrong with the test code - if you if
>>> you are getting an EISDIR error here then something is broken with
>>> the xfs_io binary you are using.
>>>
>>> And, because I haven't merged fsmap support into xfs_io yet, it's
>>> very likely there is a problem in the prototype patchset you are
>>> running. Perhaps that's worth reporting to the patchset author....
> Just get rid of -T, getfsmap doesn't care if it's run against a file
> or a directory.
>
> Yes sorry that was my fault for cut-and-paste coding. :(
>
> --D
>
Hi Darrick

Thanks for your suggestion, so i will rewrite it. :-)

Thanks
Xiao Yang

>>> Cheers,
>>>
>>> Dave.
>> Hi Dave
>>
>> In xfstests/common/rc:2045
>> "flink" )
>>      testio=`$XFS_IO_PROG -T -F -c "flink $testfile" \
>>      $TEST_DIR 2>&1`
>>     echo $testio | egrep -q "invalid option|Is a directory"&&  \
>>    _notrun "xfs_io $command support is missing"
>> ;;
>>
>> I found that someone has met the same error and sent a patch to fix flink
>> check.
>> Please see the following patch:
>> https://git.kernel.org/cgit/fs/xfs/xfstests-dev.git/commit/common/rc?id=0fd4705782c3748b2f83a10ce7cb7f33ffc8ad77
>>
>> Thanks
>> Xiao Yang
>>
>>
>>
>
> .
>

[PATCH v2] common/rc: fix fsmap check

[Xiao Yang]

I got an error about $TEST_DIR being a directory when running xfs/273,
because xfs_io tried to open the directory first before it parsed the -T
options.  I get rid of -T to fix it because getfsmap doesn't care if it's
run against a file or a directory.

Signed-off-by: Xiao Yang <yangx.jy@cn.fujitsu.com>
---
 common/rc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/rc b/common/rc
index 13afc6a..ec5d73e 100644
--- a/common/rc
+++ b/common/rc
@@ -2049,7 +2049,7 @@ _require_xfs_io_command()
 			_notrun "xfs_io $command support is missing"
 		;;
 	"fsmap" )
-		testio=`$XFS_IO_PROG -T -F -c "fsmap" \
+		testio=`$XFS_IO_PROG -F -c "fsmap" \
 			$TEST_DIR 2>&1`
 		echo $testio | egrep -q "Inappropriate ioctl" && \
 			_notrun "xfs_io $command support is missing"
-- 
1.8.3.1

Re: [PATCH v2] common/rc: fix fsmap check

[Eryu Guan]

On Tue, Sep 20, 2016 at 11:15:39AM +0800, Xiao Yang wrote:
> I got an error about $TEST_DIR being a directory when running xfs/273,
> because xfs_io tried to open the directory first before it parsed the -T

I think the problem here is your xfs_io binary doesn't have -T support
(O_TMPFILE). So the commit log doesn't seem correct to me.

Just curious, what's your xfsprogs version and what's the distrobution
you're running on? xfsprogs shipped with RHEL6 and RHEL7 both have
O_TMPFILE support.

> options.  I get rid of -T to fix it because getfsmap doesn't care if it's
> run against a file or a directory.
> 
> Signed-off-by: Xiao Yang <yangx.jy@cn.fujitsu.com>
> ---
>  common/rc | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/common/rc b/common/rc
> index 13afc6a..ec5d73e 100644
> --- a/common/rc
> +++ b/common/rc
> @@ -2049,7 +2049,7 @@ _require_xfs_io_command()
>  			_notrun "xfs_io $command support is missing"
>  		;;
>  	"fsmap" )
> -		testio=`$XFS_IO_PROG -T -F -c "fsmap" \
> +		testio=`$XFS_IO_PROG -F -c "fsmap" \
>  			$TEST_DIR 2>&1`

I think it's better to operate on a file in $TEST_DIR not $TEST_DIR
itself. Previously xfs_io creates a tmpfile under $TEST_DIR (-T does
this) and runs fsmap on it. Now without -T option, we have to create the
file ourselves. And the "-F" option is not needed. So it ends up with:

		testio=`$XFS_IO_PROG -f -c "fsmap" $testfile 2>&1`

Thanks,
Eryu

>  		echo $testio | egrep -q "Inappropriate ioctl" && \
>  			_notrun "xfs_io $command support is missing"
> -- 
> 1.8.3.1
> 
> 
> 
> --
> To unsubscribe from this list: send the line "unsubscribe fstests" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH v2] common/rc: fix fsmap check

[Xiao Yang]

On 2016/09/20 11:59, Eryu Guan wrote:
> On Tue, Sep 20, 2016 at 11:15:39AM +0800, Xiao Yang wrote:
>> I got an error about $TEST_DIR being a directory when running xfs/273,
>> because xfs_io tried to open the directory first before it parsed the -T
> I think the problem here is your xfs_io binary doesn't have -T support
> (O_TMPFILE). So the commit log doesn't seem correct to me.
>
> Just curious, what's your xfsprogs version and what's the distrobution
> you're running on? xfsprogs shipped with RHEL6 and RHEL7 both have
> O_TMPFILE support.
>
Hi Eryu
I ran this case with xfsprogs-4.5.0 on RHEL7.3Beta, I think that -T 
option has been supported.
Is there another reason lead to this issue?

Thanks
Xiao Yang
>> options.  I get rid of -T to fix it because getfsmap doesn't care if it's
>> run against a file or a directory.
>>
>> Signed-off-by: Xiao Yang<yangx.jy@cn.fujitsu.com>
>> ---
>>   common/rc | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/common/rc b/common/rc
>> index 13afc6a..ec5d73e 100644
>> --- a/common/rc
>> +++ b/common/rc
>> @@ -2049,7 +2049,7 @@ _require_xfs_io_command()
>>   			_notrun "xfs_io $command support is missing"
>>   		;;
>>   	"fsmap" )
>> -		testio=`$XFS_IO_PROG -T -F -c "fsmap" \
>> +		testio=`$XFS_IO_PROG -F -c "fsmap" \
>>   			$TEST_DIR 2>&1`
> I think it's better to operate on a file in $TEST_DIR not $TEST_DIR
> itself. Previously xfs_io creates a tmpfile under $TEST_DIR (-T does
> this) and runs fsmap on it. Now without -T option, we have to create the
> file ourselves. And the "-F" option is not needed. So it ends up with:
>
> 		testio=`$XFS_IO_PROG -f -c "fsmap" $testfile 2>&1`
>
> Thanks,
> Eryu
>
>>   		echo $testio | egrep -q "Inappropriate ioctl"&&  \
>>   			_notrun "xfs_io $command support is missing"
>> -- 
>> 1.8.3.1
>>
>>
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe fstests" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>
> .
>

Re: [PATCH v2] common/rc: fix fsmap check

[Darrick J. Wong]

On Tue, Sep 20, 2016 at 12:40:51PM +0800, Xiao Yang wrote:
> On 2016/09/20 11:59, Eryu Guan wrote:
> >On Tue, Sep 20, 2016 at 11:15:39AM +0800, Xiao Yang wrote:
> >>I got an error about $TEST_DIR being a directory when running xfs/273,
> >>because xfs_io tried to open the directory first before it parsed the -T
> >I think the problem here is your xfs_io binary doesn't have -T support
> >(O_TMPFILE). So the commit log doesn't seem correct to me.
> >
> >Just curious, what's your xfsprogs version and what's the distrobution
> >you're running on? xfsprogs shipped with RHEL6 and RHEL7 both have
> >O_TMPFILE support.
> >
> Hi Eryu
> I ran this case with xfsprogs-4.5.0 on RHEL7.3Beta, I think that -T option
> has been supported.
> Is there another reason lead to this issue?

How about "We don't need -T to detect GETFSMAP and the flag doesn't
exist on really old versions of xfs_io, so just get rid of it."

I'm sorta mystified why it was argued that we shouldn't be calling
xfs_io against $TEST_DIR directly; any process with CAP_SYS_ADMIN is
allowed to query the fs space map via any open file descriptor in the
XFS filesystem -- files or directories.

--D

> 
> Thanks
> Xiao Yang
> >>options.  I get rid of -T to fix it because getfsmap doesn't care if it's
> >>run against a file or a directory.
> >>
> >>Signed-off-by: Xiao Yang<yangx.jy@cn.fujitsu.com>
> >>---
> >>  common/rc | 2 +-
> >>  1 file changed, 1 insertion(+), 1 deletion(-)
> >>
> >>diff --git a/common/rc b/common/rc
> >>index 13afc6a..ec5d73e 100644
> >>--- a/common/rc
> >>+++ b/common/rc
> >>@@ -2049,7 +2049,7 @@ _require_xfs_io_command()
> >>  			_notrun "xfs_io $command support is missing"
> >>  		;;
> >>  	"fsmap" )
> >>-		testio=`$XFS_IO_PROG -T -F -c "fsmap" \
> >>+		testio=`$XFS_IO_PROG -F -c "fsmap" \
> >>  			$TEST_DIR 2>&1`
> >I think it's better to operate on a file in $TEST_DIR not $TEST_DIR
> >itself. Previously xfs_io creates a tmpfile under $TEST_DIR (-T does
> >this) and runs fsmap on it. Now without -T option, we have to create the
> >file ourselves. And the "-F" option is not needed. So it ends up with:
> >
> >		testio=`$XFS_IO_PROG -f -c "fsmap" $testfile 2>&1`
> >
> >Thanks,
> >Eryu
> >
> >>  		echo $testio | egrep -q "Inappropriate ioctl"&&  \
> >>  			_notrun "xfs_io $command support is missing"
> >>-- 
> >>1.8.3.1
> >>
> >>
> >>
> >>--
> >>To unsubscribe from this list: send the line "unsubscribe fstests" in
> >>the body of a message to majordomo@vger.kernel.org
> >>More majordomo info at  http://vger.kernel.org/majordomo-info.html
> >
> >.
> >
> 
> 
> 
> --
> To unsubscribe from this list: send the line "unsubscribe fstests" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH v3] common/rc: fix fsmap check

[Xiao Yang]

We don't need -T to detect GETFSMAP and the flag doesn't exist
on really old versions of xfs_io, so just get rid of it.

Signed-off-by: Xiao Yang <yangx.jy@cn.fujitsu.com>
---
 common/rc | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/common/rc b/common/rc
index 13afc6a..52a75c5 100644
--- a/common/rc
+++ b/common/rc
@@ -2049,8 +2049,7 @@ _require_xfs_io_command()
 			_notrun "xfs_io $command support is missing"
 		;;
 	"fsmap" )
-		testio=`$XFS_IO_PROG -T -F -c "fsmap" \
-			$TEST_DIR 2>&1`
+		testio=`$XFS_IO_PROG -f -c "fsmap" $testfile 2>&1`
 		echo $testio | egrep -q "Inappropriate ioctl" && \
 			_notrun "xfs_io $command support is missing"
 		;;
-- 
1.8.3.1

Re: [PATCH v3] common/rc: fix fsmap check

[Darrick J. Wong]

On Tue, Sep 20, 2016 at 01:23:12PM +0800, Xiao Yang wrote:
> We don't need -T to detect GETFSMAP and the flag doesn't exist
> on really old versions of xfs_io, so just get rid of it.
> 
> Signed-off-by: Xiao Yang <yangx.jy@cn.fujitsu.com>
> ---
>  common/rc | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/common/rc b/common/rc
> index 13afc6a..52a75c5 100644
> --- a/common/rc
> +++ b/common/rc
> @@ -2049,8 +2049,7 @@ _require_xfs_io_command()
>  			_notrun "xfs_io $command support is missing"
>  		;;
>  	"fsmap" )
> -		testio=`$XFS_IO_PROG -T -F -c "fsmap" \
> -			$TEST_DIR 2>&1`
> +		testio=`$XFS_IO_PROG -f -c "fsmap" $testfile 2>&1`

Seems fine to me,
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>

>  		echo $testio | egrep -q "Inappropriate ioctl" && \
>  			_notrun "xfs_io $command support is missing"
>  		;;
> -- 
> 1.8.3.1
> 
> 
>