Skip to content

Commit 08dffcc

Browse files
committed
Merge tag 'nfsd-5.6' of git://linux-nfs.org/~bfields/linux
Pull nfsd updates from Bruce Fields: "Highlights: - Server-to-server copy code from Olga. To use it, client and both servers must have support, the target server must be able to access the source server over NFSv4.2, and the target server must have the inter_copy_offload_enable module parameter set. - Improvements and bugfixes for the new filehandle cache, especially in the container case, from Trond - Also from Trond, better reporting of write errors. - Y2038 work from Arnd" * tag 'nfsd-5.6' of git://linux-nfs.org/~bfields/linux: (55 commits) sunrpc: expiry_time should be seconds not timeval nfsd: make nfsd_filecache_wq variable static nfsd4: fix double free in nfsd4_do_async_copy() nfsd: convert file cache to use over/underflow safe refcount nfsd: Define the file access mode enum for tracing nfsd: Fix a perf warning nfsd: Ensure sampling of the write verifier is atomic with the write nfsd: Ensure sampling of the commit verifier is atomic with the commit sunrpc: clean up cache entry add/remove from hashtable sunrpc: Fix potential leaks in sunrpc_cache_unhash() nfsd: Ensure exclusion between CLONE and WRITE errors nfsd: Pass the nfsd_file as arguments to nfsd4_clone_file_range() nfsd: Update the boot verifier on stable writes too. nfsd: Fix stable writes nfsd: Allow nfsd_vfs_write() to take the nfsd_file as an argument nfsd: Fix a soft lockup race in nfsd_file_mark_find_or_create() nfsd: Reduce the number of calls to nfsd_file_gc() nfsd: Schedule the laundrette regularly irrespective of file errors nfsd: Remove unused constant NFSD_FILE_LRU_RESCAN nfsd: Containerise filecache laundrette ...
2 parents f43574d + 3d96208 commit 08dffcc

25 files changed

+1322
-327
lines changed

fs/nfsd/Kconfig

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,16 @@ config NFSD_FLEXFILELAYOUT
134134

135135
If unsure, say N.
136136

137+
config NFSD_V4_2_INTER_SSC
138+
bool "NFSv4.2 inter server to server COPY"
139+
depends on NFSD_V4 && NFS_V4_1 && NFS_V4_2
140+
help
141+
This option enables support for NFSv4.2 inter server to
142+
server copy where the destination server calls the NFSv4.2
143+
client to read the data to copy from the source server.
144+
145+
If unsure, say N.
146+
137147
config NFSD_V4_SECURITY_LABEL
138148
bool "Provide Security Label support for NFSv4 server"
139149
depends on NFSD_V4 && SECURITY

0 commit comments

Comments
 (0)