* [PATCH] xfs_info: limit findmnt to find mounted xfs filesystems
@ 2019-06-17 9:54 Amir Goldstein
2019-06-17 18:22 ` Darrick J. Wong
2019-06-25 14:30 ` Christoph Hellwig
0 siblings, 2 replies; 4+ messages in thread
From: Amir Goldstein @ 2019-06-17 9:54 UTC (permalink / raw)
To: Darrick J . Wong; +Cc: Eric Sandeen, linux-xfs, fstests
When running xfstests with -overlay, the xfs mount point
(a.k.a $OVL_BASE_SCRATCH_MNT) is used as the $SCRATCH_DEV argument
to the overlay mount, like this:
/dev/vdf /vdf xfs rw,relatime,attr2,inode64,noquota 0 0
/vdf /vdf/ovl-mnt overlay rw,lowerdir=/vdf/lower,upperdir=/vdf/upper...
Ever since commit bbb43745, when xfs_info started using findmnt,
when calling the helper `_supports_filetype /vdf` it returns false,
and reports: "/vdf/ovl-mnt: Not on a mounted XFS filesystem".
Fix this ambiguity by preferring to query a mounted XFS filesystem,
if one can be found.
Fixes: bbb43745 ("xfs_info: use findmnt to handle mounted block devices")
Signed-off-by: Amir Goldstein <amir73il@gmail.com>
---
Eric,
FYI, I don't *need* to fix xfs_info in order to fix xfstests
and I do plan to send an independent fix to xfstests, but this
seems like a correct fix regardless of the specific xfstests
regression.
Thanks,
Amir.
spaceman/xfs_info.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/spaceman/xfs_info.sh b/spaceman/xfs_info.sh
index 1bf6d2c3..3b10dc14 100755
--- a/spaceman/xfs_info.sh
+++ b/spaceman/xfs_info.sh
@@ -40,7 +40,7 @@ case $# in
# If we find a mountpoint for the device, do a live query;
# otherwise try reading the fs with xfs_db.
- if mountpt="$(findmnt -f -n -o TARGET "${arg}" 2> /dev/null)"; then
+ if mountpt="$(findmnt -t xfs -f -n -o TARGET "${arg}" 2> /dev/null)"; then
xfs_spaceman -p xfs_info -c "info" $OPTS "${mountpt}"
status=$?
else
--
2.17.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] xfs_info: limit findmnt to find mounted xfs filesystems
2019-06-17 9:54 [PATCH] xfs_info: limit findmnt to find mounted xfs filesystems Amir Goldstein
@ 2019-06-17 18:22 ` Darrick J. Wong
2019-06-17 18:23 ` Eric Sandeen
2019-06-25 14:30 ` Christoph Hellwig
1 sibling, 1 reply; 4+ messages in thread
From: Darrick J. Wong @ 2019-06-17 18:22 UTC (permalink / raw)
To: Amir Goldstein; +Cc: Eric Sandeen, linux-xfs, fstests
On Mon, Jun 17, 2019 at 12:54:47PM +0300, Amir Goldstein wrote:
> When running xfstests with -overlay, the xfs mount point
> (a.k.a $OVL_BASE_SCRATCH_MNT) is used as the $SCRATCH_DEV argument
> to the overlay mount, like this:
>
> /dev/vdf /vdf xfs rw,relatime,attr2,inode64,noquota 0 0
> /vdf /vdf/ovl-mnt overlay rw,lowerdir=/vdf/lower,upperdir=/vdf/upper...
>
> Ever since commit bbb43745, when xfs_info started using findmnt,
> when calling the helper `_supports_filetype /vdf` it returns false,
> and reports: "/vdf/ovl-mnt: Not on a mounted XFS filesystem".
>
> Fix this ambiguity by preferring to query a mounted XFS filesystem,
> if one can be found.
>
> Fixes: bbb43745 ("xfs_info: use findmnt to handle mounted block devices")
> Signed-off-by: Amir Goldstein <amir73il@gmail.com>
Looks good to me, so long as findmnt /has/ a -t option in, uh, whatever
enterprise distro(s) for which the xfsprogs maintainer might be a
stakeholder. :)
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
--D
> ---
>
> Eric,
>
> FYI, I don't *need* to fix xfs_info in order to fix xfstests
> and I do plan to send an independent fix to xfstests, but this
> seems like a correct fix regardless of the specific xfstests
> regression.
>
> Thanks,
> Amir.
>
> spaceman/xfs_info.sh | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/spaceman/xfs_info.sh b/spaceman/xfs_info.sh
> index 1bf6d2c3..3b10dc14 100755
> --- a/spaceman/xfs_info.sh
> +++ b/spaceman/xfs_info.sh
> @@ -40,7 +40,7 @@ case $# in
>
> # If we find a mountpoint for the device, do a live query;
> # otherwise try reading the fs with xfs_db.
> - if mountpt="$(findmnt -f -n -o TARGET "${arg}" 2> /dev/null)"; then
> + if mountpt="$(findmnt -t xfs -f -n -o TARGET "${arg}" 2> /dev/null)"; then
> xfs_spaceman -p xfs_info -c "info" $OPTS "${mountpt}"
> status=$?
> else
> --
> 2.17.1
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] xfs_info: limit findmnt to find mounted xfs filesystems
2019-06-17 18:22 ` Darrick J. Wong
@ 2019-06-17 18:23 ` Eric Sandeen
0 siblings, 0 replies; 4+ messages in thread
From: Eric Sandeen @ 2019-06-17 18:23 UTC (permalink / raw)
To: Darrick J. Wong, Amir Goldstein; +Cc: linux-xfs, fstests
On 6/17/19 1:22 PM, Darrick J. Wong wrote:
> On Mon, Jun 17, 2019 at 12:54:47PM +0300, Amir Goldstein wrote:
>> When running xfstests with -overlay, the xfs mount point
>> (a.k.a $OVL_BASE_SCRATCH_MNT) is used as the $SCRATCH_DEV argument
>> to the overlay mount, like this:
>>
>> /dev/vdf /vdf xfs rw,relatime,attr2,inode64,noquota 0 0
>> /vdf /vdf/ovl-mnt overlay rw,lowerdir=/vdf/lower,upperdir=/vdf/upper...
>>
>> Ever since commit bbb43745, when xfs_info started using findmnt,
>> when calling the helper `_supports_filetype /vdf` it returns false,
>> and reports: "/vdf/ovl-mnt: Not on a mounted XFS filesystem".
>>
>> Fix this ambiguity by preferring to query a mounted XFS filesystem,
>> if one can be found.
>>
>> Fixes: bbb43745 ("xfs_info: use findmnt to handle mounted block devices")
>> Signed-off-by: Amir Goldstein <amir73il@gmail.com>
>
> Looks good to me, so long as findmnt /has/ a -t option in, uh, whatever
> enterprise distro(s) for which the xfsprogs maintainer might be a
> stakeholder. :)
:D
-t goes way back so this should be no problem.
Thanks, Amir.
-Eric
> Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
>
> --D
>
>> ---
>>
>> Eric,
>>
>> FYI, I don't *need* to fix xfs_info in order to fix xfstests
>> and I do plan to send an independent fix to xfstests, but this
>> seems like a correct fix regardless of the specific xfstests
>> regression.
>>
>> Thanks,
>> Amir.
>>
>> spaceman/xfs_info.sh | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/spaceman/xfs_info.sh b/spaceman/xfs_info.sh
>> index 1bf6d2c3..3b10dc14 100755
>> --- a/spaceman/xfs_info.sh
>> +++ b/spaceman/xfs_info.sh
>> @@ -40,7 +40,7 @@ case $# in
>>
>> # If we find a mountpoint for the device, do a live query;
>> # otherwise try reading the fs with xfs_db.
>> - if mountpt="$(findmnt -f -n -o TARGET "${arg}" 2> /dev/null)"; then
>> + if mountpt="$(findmnt -t xfs -f -n -o TARGET "${arg}" 2> /dev/null)"; then
>> xfs_spaceman -p xfs_info -c "info" $OPTS "${mountpt}"
>> status=$?
>> else
>> --
>> 2.17.1
>>
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] xfs_info: limit findmnt to find mounted xfs filesystems
2019-06-17 9:54 [PATCH] xfs_info: limit findmnt to find mounted xfs filesystems Amir Goldstein
2019-06-17 18:22 ` Darrick J. Wong
@ 2019-06-25 14:30 ` Christoph Hellwig
1 sibling, 0 replies; 4+ messages in thread
From: Christoph Hellwig @ 2019-06-25 14:30 UTC (permalink / raw)
To: Amir Goldstein; +Cc: Darrick J . Wong, Eric Sandeen, linux-xfs, fstests
Looks good,
Reviewed-by: Christoph Hellwig <hch@lst.de>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-06-25 14:30 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-06-17 9:54 [PATCH] xfs_info: limit findmnt to find mounted xfs filesystems Amir Goldstein
2019-06-17 18:22 ` Darrick J. Wong
2019-06-17 18:23 ` Eric Sandeen
2019-06-25 14:30 ` Christoph Hellwig
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).