[PATCH 1/8] fstests: remove the nfs_default guest

[Jeff Layton <jlayton@kernel.org>]

Chuck recently added an explicit v4.2 guest, which is really the same
thing. Remove the redundant nfs_default guest.

Signed-off-by: Jeff Layton <jlayton@kernel.org>
---
 playbooks/roles/fstests/templates/nfs/nfs.config |  5 -----
 workflows/fstests/nfs/Kconfig                    | 10 +---------
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/playbooks/roles/fstests/templates/nfs/nfs.config b/playbooks/roles/fstests/templates/nfs/nfs.config
index 3b30114cce62..f301075a8928 100644
--- a/playbooks/roles/fstests/templates/nfs/nfs.config
+++ b/playbooks/roles/fstests/templates/nfs/nfs.config
@@ -10,11 +10,6 @@ SCRATCH_DEV="{{ fstests_nfs_scratch_devpool }}"
 RESULT_BASE=$PWD/results/$HOST/$(uname -r)
 TEST_DEV={{ fstests_nfs_test_dev }}
 CANON_DEVS=yes
-{% if fstests_nfs_section_default -%}
-
-# Test with default mount options
-[nfs_default]
-{% endif %}
 {% if fstests_nfs_section_tls -%}
 
 # Test NFS with RPC over TLS
diff --git a/workflows/fstests/nfs/Kconfig b/workflows/fstests/nfs/Kconfig
index 86e930a69447..b6daeeb490c5 100644
--- a/workflows/fstests/nfs/Kconfig
+++ b/workflows/fstests/nfs/Kconfig
@@ -46,14 +46,6 @@ config FSTESTS_NFS_MANUAL_COVERAGE
 
 if FSTESTS_NFS_MANUAL_COVERAGE
 
-config FSTESTS_NFS_SECTION_DEFAULT
-	bool "Enable testing section: nfs_default"
-	default y
-	help
-	  Enabling this will test nfs with the default mount options. At the
-	  time of this writing, this makes the client autonegotiate an NFS
-	  version, starting with v4.2 if it's available.
-
 config FSTESTS_NFS_SECTION_TLS
 	bool "Enable testing section: nfs_tls"
 	default n
@@ -63,7 +55,7 @@ config FSTESTS_NFS_SECTION_TLS
 
 config FSTESTS_NFS_SECTION_V42
 	bool "Enable testing section: nfs_v42"
-	default n
+	default y
 	help
 	  Enabling this will test NFSv4.2.
 

-- 
2.44.0