Commit 75cc9c47 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'nfs-for-6.2-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs 

Pull NFS client fix from Trond Myklebust:
 "Unfortunately, we found another bug in the NFSv4.2 READ_PLUS code.

  Since it has not been possible to fix the bug in time for the 6.2
  release, let's just revert the Kconfig change that enables it:

   - Revert 'NFSv4.2: Change the default KConfig value for READ_PLUS'"

* tag 'nfs-for-6.2-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
  Revert "NFSv4.2: Change the default KConfig value for READ_PLUS"
parents 03dad2f0 896e090e

fs/nfs/Kconfig

+4 −4
Original line number Original line Diff line number Diff line
@@ -209,8 +209,8 @@ config NFS_DISABLE_UDP_SUPPORT 
config NFS_V4_2_READ_PLUS

config NFS_V4_2_READ_PLUS

	bool "NFS: Enable support for the NFSv4.2 READ_PLUS operation"

	bool "NFS: Enable support for the NFSv4.2 READ_PLUS operation"

	depends on NFS_V4_2

	depends on NFS_V4_2

	default y

	default n

	help

	help

	 Choose Y here to enable the use of READ_PLUS over NFS v4.2. READ_PLUS

	 This is intended for developers only. The READ_PLUS operation has

	 attempts to improve read performance by compressing out sparse holes

	 been shown to have issues under specific conditions and should not

	 in the file contents.
 
	 be used in production.