[PATCH 1/6] fstests: Fix NFS mount options for fstests

[cel@kernel.org]

From: Chuck Lever <chuck.lever@oracle.com>

If the NFS mount command line does not specify an NFS version, the
client uses the default protocol version , which for recent versions
of nfs-utils, is NFSv4.2.

I noticed the NFS test sections in our nfs.config file specifies the
NFS version for the test partition, but not the scratch partition.
This is throwing off the feature test macros in fstests, so it is
testing, say, xattrs, on NFSv4.1 mounts, and failing 100% of the
time.

Ensure that the test and scratch partitions use the same NFS
version.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---
 playbooks/roles/fstests/templates/nfs/nfs.config | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/playbooks/roles/fstests/templates/nfs/nfs.config b/playbooks/roles/fstests/templates/nfs/nfs.config
index 3605e582b2d7..b26c45c11bc3 100644
--- a/playbooks/roles/fstests/templates/nfs/nfs.config
+++ b/playbooks/roles/fstests/templates/nfs/nfs.config
@@ -21,14 +21,14 @@ MOUNT_OPTIONS="-o vers=4.1"
 
 # Test over RDMA
 [nfs_rdma]
-TEST_FS_MOUNT_OPTS="-o rdma"
+TEST_FS_MOUNT_OPTS="-o rdma,vers=4.1"
 MOUNT_OPTIONS="-o rdma,vers=4.1"
 {% endif %}
 {% if fstests_nfs_section_tls -%}
 
 # Test NFS with RPC over TLS
 [nfs_tls]
-TEST_FS_MOUNT_OPTS="-o xprtsec=mtls"
+TEST_FS_MOUNT_OPTS="-o xprtsec=mtls,vers=4.1"
 MOUNT_OPTIONS="-o xprtsec=mtls,vers=4.1"
 {% endif %}
 {% if fstests_nfs_section_nfsd -%}
-- 
2.47.0