Commit 21e31401 authored Dec 03, 2020 by Anna Schumaker

NFS: Disable READ_PLUS by default

We've been seeing failures with xfstests generic/091 and generic/263
when using READ_PLUS. I've made some progress on these issues, and the
tests fail later on but still don't pass. Let's disable READ_PLUS by
default until we can work out what is going on.

Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>

parent fe8eb820

fs/nfs/Kconfig

+9 −0

Original line number	Original line	Diff line number	Diff line
	@@ -205,3 +205,12 @@ config NFS_DISABLE_UDP_SUPPORT
	Choose Y here to disable the use of NFS over UDP. NFS over UDP		Choose Y here to disable the use of NFS over UDP. NFS over UDP
	on modern networks (1Gb+) can lead to data corruption caused by		on modern networks (1Gb+) can lead to data corruption caused by
	fragmentation during high loads.		fragmentation during high loads.

			config NFS_V4_2_READ_PLUS
			bool "NFS: Enable support for the NFSv4.2 READ_PLUS operation"
			depends on NFS_V4_2
			default n
			help
			This is intended for developers only. The READ_PLUS operation has
			been shown to have issues under specific conditions and should not
			be used in production.

fs/nfs/nfs4proc.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -5309,7 +5309,7 @@ static int nfs4_read_done(struct rpc_task task, struct nfs_pgio_header hdr)
	nfs4_read_done_cb(task, hdr);		nfs4_read_done_cb(task, hdr);
	}		}

	#ifdef CONFIG_NFS_V4_2		#if defined CONFIG_NFS_V4_2 && defined CONFIG_NFS_V4_2_READ_PLUS
	static void nfs42_read_plus_support(struct nfs_server server, struct rpc_message msg)		static void nfs42_read_plus_support(struct nfs_server server, struct rpc_message msg)
	{		{
	if (server->caps & NFS_CAP_READ_PLUS)		if (server->caps & NFS_CAP_READ_PLUS)