mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git
synced 2026-04-18 03:23:53 -04:00
Merge tag 'nfs-for-6.12-1' of git://git.linux-nfs.org/projects/anna/linux-nfs
Pull NFS client updates from Anna Schumaker: "New Features: - Add a 'noalignwrite' mount option for lock-less 'lost writes' prevention - Add support for the LOCALIO protocol extention Bugfixes: - Fix memory leak in error path of nfs4_do_reclaim() - Simplify and guarantee lock owner uniqueness - Fix -Wformat-truncation warning - Fix folio refcounts by using folio_attach_private() - Fix failing the mount system call when the server is down - Fix detection of "Proxying of Times" server support Cleanups: - Annotate struct nfs_cache_array with __counted_by() - Remove unnecessary NULL checks before kfree() - Convert RPC_TASK_* constants to an enum - Remove obsolete or misleading comments and declerations" * tag 'nfs-for-6.12-1' of git://git.linux-nfs.org/projects/anna/linux-nfs: (41 commits) nfs: Fix `make htmldocs` warnings in the localio documentation nfs: add "NFS Client and Server Interlock" section to localio.rst nfs: add FAQ section to Documentation/filesystems/nfs/localio.rst nfs: add Documentation/filesystems/nfs/localio.rst nfs: implement client support for NFS_LOCALIO_PROGRAM nfs/localio: use dedicated workqueues for filesystem read and write pnfs/flexfiles: enable localio support nfs: enable localio for non-pNFS IO nfs: add LOCALIO support nfs: pass struct nfsd_file to nfs_init_pgio and nfs_init_commit nfsd: implement server support for NFS_LOCALIO_PROGRAM nfsd: add LOCALIO support nfs_common: prepare for the NFS client to use nfsd_file for LOCALIO nfs_common: add NFS LOCALIO auxiliary protocol enablement SUNRPC: replace program list with program array SUNRPC: add svcauth_map_clnt_to_svc_cred_local SUNRPC: remove call_allocate() BUG_ONs nfsd: add nfsd_serv_try_get and nfsd_serv_put nfsd: add nfsd_file_acquire_local() nfsd: factor out __fh_verify to allow NULL rqstp to be passed ...
This commit is contained in:
23
fs/Kconfig
23
fs/Kconfig
@@ -386,6 +386,29 @@ config NFS_COMMON
|
||||
depends on NFSD || NFS_FS || LOCKD
|
||||
default y
|
||||
|
||||
config NFS_COMMON_LOCALIO_SUPPORT
|
||||
tristate
|
||||
default n
|
||||
default y if NFSD=y || NFS_FS=y
|
||||
default m if NFSD=m && NFS_FS=m
|
||||
select SUNRPC
|
||||
|
||||
config NFS_LOCALIO
|
||||
bool "NFS client and server support for LOCALIO auxiliary protocol"
|
||||
depends on NFSD && NFS_FS
|
||||
select NFS_COMMON_LOCALIO_SUPPORT
|
||||
default n
|
||||
help
|
||||
Some NFS servers support an auxiliary NFS LOCALIO protocol
|
||||
that is not an official part of the NFS protocol.
|
||||
|
||||
This option enables support for the LOCALIO protocol in the
|
||||
kernel's NFS server and client. Enable this to permit local
|
||||
NFS clients to bypass the network when issuing reads and
|
||||
writes to the local NFS server.
|
||||
|
||||
If unsure, say N.
|
||||
|
||||
config NFS_V4_2_SSC_HELPER
|
||||
bool
|
||||
default y if NFS_V4_2
|
||||
|
||||
Reference in New Issue
Block a user