common/rc: improve _fstyp_has_non_default_seek_data_hole()
PATCH v2 1/1 common/rc: improve _fstyp_has_non_default_seek_data_hole()
commit 34081087 adds more sanity to seek_sanity_test() to prevent a lseek() implementation regression from being ignored, and a hardcoded whitelist is maintained to distinguish whether a filesystem type only supports non-default behavior of SEEK_HOLE or not.
In commit 34081087, NFS is listed in this whitelist, that is, NFS is thought supporting non-default behavior only. However as far as I know, nfsv2 and nfsv3 only support default behavior of SEEK_HOLE (that is, always returning EOF) in linux.
On the other hand, xfstests uses "mount -t nfs ..." to mount a NFS mount point. Normally the mount point is mounted as nfsv4, but it can be mounted mandatorily as nfsv3 if we specify "Nfsvers=3" in /etc/nfsmount.conf. In this case, a series of tests fail (including generic/285, generic/448, generic/490, etc.) with error message "Default behavior is not allowed. Aborting."
So I just make some special handling for NFS in _fstyp_has_non_default_seek_data_hole(), that is, default behavior of SEEK_HOLE is acceptable for nfsv2 and nfsv3.
Thanks.
--- common/rc | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
common/rc +8 -1
@@ -2315,9 +2315,16 @@ _fstyp_has_non_default_seek_data_hole() fi case "$fstyp" in - btrfs|ext4|xfs|ceph|cifs|f2fs|gfs2|nfs*|ocfs2|tmpfs) + btrfs|ext4|xfs|ceph|cifs|f2fs|gfs2|ocfs2|tmpfs) return 0 ;; + nfs*) + # NFSv2 and NFSv3 only support default behavior of SEEK_HOLE, + # while NFSv4 supports non-default behavior + local nfsvers=`_df_device $TEST_DEV | $AWK_PROG '{ print $2 }'` + [ "$nfsvers" = "nfs4" ] + return $? + ;; overlay) if [ ! -z $OVL_BASE_FSTYP -a $OVL_BASE_FSTYP != "overlay" ]; then _fstyp_has_non_default_seek_data_hole $OVL_BASE_FSTYP
Signature · 1 line
1.8.3.1
Quoted 19 lines · Jeffle Xu
commit 34081087 adds more sanity to
seek_sanity_test()to prevent alseek()implementation regression from being ignored, and a hardcoded whitelist is maintained to distinguish whether a filesystem type only supports non-default behavior ofSEEK_HOLEor not.In commit 34081087, NFS is listed in this whitelist, that is, NFS is thought supporting non-default behavior only. However as far as I know, nfsv2 and nfsv3 only support default behavior of
SEEK_HOLE(that is, always returning EOF) in linux.On the other hand, xfstests uses "mount -t nfs ..." to mount a NFS mount point. Normally the mount point is mounted as nfsv4, but it can be mounted mandatorily as nfsv3 if we specify "Nfsvers=3" in
/etc/nfsmount.conf. In this case, a series of tests fail (including generic/285, generic/448, generic/490, etc.) with error message "Default behavior is not allowed. Aborting."
Quoted 7 lines
So I just make some special handling for NFS in
_fstyp_has_non_default_seek_data_hole(), that is, default behavior ofSEEK_HOLEis acceptable for nfsv2 and nfsv3.Thanks.
Signed-off-by Jeffle Xu <[email protected]>
Quoted 29 lines
--- common/rc | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)common/rc +8
-2@@ -2315,9 +2315,16 @@ _fstyp_has_non_default_seek_data_hole() fi case "$fstyp" in - btrfs|ext4|xfs|ceph|cifs|f2fs|gfs2|nfs*|ocfs2|tmpfs) + btrfs|ext4|xfs|ceph|cifs|f2fs|gfs2|ocfs2|tmpfs) return 0 ;; + nfs*) + # NFSv2 and NFSv3 only support default behavior of SEEK_HOLE, + # while NFSv4 supports non-default behavior + local nfsvers=`_df_device $TEST_DEV | $AWK_PROG '{ print $2 }'` + [ "$nfsvers" = "nfs4" ] + return $? + ;; overlay) if [ ! -z $OVL_BASE_FSTYP -a $OVL_BASE_FSTYP != "overlay" ]; then _fstyp_has_non_default_seek_data_hole $OVL_BASE_FSTYP --1.8.3.1