Skip to content

Commit 14705fd

Browse files
torvaldstorvalds
committed
Merge tag 'nfsd-5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux
Pull nfsd updates from Chuck Lever: "New features: - NFSv3 support in NFSD is now always built - Added NFSD support for the NFSv4 birth-time file attribute - Added support for storing and displaying sockaddrs in trace points - NFSD now recognizes RPC_AUTH_TLS probes Performance improvements: - Optimized the svc transport enqueuing mechanism - Added micro-optimizations for the duplicate reply cache Notable bug fixes: - Allocation of the NFSD file cache hash table is more reliable" * tag 'nfsd-5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux: (30 commits) nfsd: fix using the correct variable for sizeof() nfsd: use correct format characters NFSD: prevent integer overflow on 32 bit systems NFSD: prevent underflow in nfssvc_decode_writeargs() fs/lock: documentation cleanup. Replace inode->i_lock with flc_lock. NFSD: Fix nfsd_breaker_owns_lease() return values NFSD: Clean up _lm_ operation names arch: Remove references to CONFIG_NFSD_V3 in the default configs NFSD: Remove CONFIG_NFSD_V3 nfsd: more robust allocation failure handling in nfsd_file_cache_init SUNRPC: Teach server to recognize RPC_AUTH_TLS NFSD: Move svc_serv_ops::svo_function into struct svc_serv NFSD: Remove svc_serv_ops::svo_module SUNRPC: Remove svc_shutdown_net() SUNRPC: Rename svc_close_xprt() SUNRPC: Rename svc_create_xprt() SUNRPC: Remove svo_shutdown method SUNRPC: Merge svc_do_enqueue_xprt() into svc_enqueue_xprt() SUNRPC: Remove the .svo_enqueue_xprt method SUNRPC: Record endpoint information in trace log ...
2 parents 105b6c0 + 4fc5f53 commit 14705fd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+512
-450
lines changed

‎Documentation/filesystems/locking.rst

Lines changed: 3 additions & 3 deletions

‎arch/alpha/configs/defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ CONFIG_TMPFS=y
6262
CONFIG_NFS_FS=m
6363
CONFIG_NFS_V3=y
6464
CONFIG_NFSD=m
65-
CONFIG_NFSD_V3=y
6665
CONFIG_NLS_CODEPAGE_437=y
6766
CONFIG_MAGIC_SYSRQ=y
6867
CONFIG_DEBUG_KERNEL=y

‎arch/arm/configs/davinci_all_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,6 @@ CONFIG_MINIX_FS=m
258258
CONFIG_NFS_FS=y
259259
CONFIG_ROOT_NFS=y
260260
CONFIG_NFSD=m
261-
CONFIG_NFSD_V3=y
262261
CONFIG_NLS_CODEPAGE_437=y
263262
CONFIG_NLS_ASCII=m
264263
CONFIG_NLS_ISO8859_1=y

‎arch/arm/configs/ezx_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,6 @@ CONFIG_NFS_FS=y
309309
CONFIG_NFS_V3=y
310310
CONFIG_NFS_V3_ACL=y
311311
CONFIG_NFSD=m
312-
CONFIG_NFSD_V3=y
313312
CONFIG_NFSD_V3_ACL=y
314313
CONFIG_SMB_FS=m
315314
CONFIG_CIFS=m

‎arch/arm/configs/imote2_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,6 @@ CONFIG_NFS_FS=y
283283
CONFIG_NFS_V3=y
284284
CONFIG_NFS_V3_ACL=y
285285
CONFIG_NFSD=m
286-
CONFIG_NFSD_V3=y
287286
CONFIG_NFSD_V3_ACL=y
288287
CONFIG_SMB_FS=m
289288
CONFIG_CIFS=m

‎arch/arm/configs/integrator_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ CONFIG_CRAMFS=y
7979
CONFIG_NFS_FS=y
8080
CONFIG_ROOT_NFS=y
8181
CONFIG_NFSD=y
82-
CONFIG_NFSD_V3=y
8382
CONFIG_NLS_CODEPAGE_437=y
8483
CONFIG_NLS_ISO8859_1=y
8584
CONFIG_MAGIC_SYSRQ=y

‎arch/arm/configs/iop32x_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ CONFIG_NFS_FS=y
9494
CONFIG_NFS_V3=y
9595
CONFIG_ROOT_NFS=y
9696
CONFIG_NFSD=y
97-
CONFIG_NFSD_V3=y
9897
CONFIG_PARTITION_ADVANCED=y
9998
CONFIG_MAGIC_SYSRQ=y
10099
CONFIG_DEBUG_KERNEL=y

‎arch/arm/configs/keystone_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,6 @@ CONFIG_NFS_FS=y
213213
CONFIG_NFS_V3_ACL=y
214214
CONFIG_ROOT_NFS=y
215215
CONFIG_NFSD=y
216-
CONFIG_NFSD_V3=y
217216
CONFIG_NFSD_V3_ACL=y
218217
CONFIG_NLS_CODEPAGE_437=y
219218
CONFIG_NLS_ISO8859_1=y

‎arch/arm/configs/lart_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ CONFIG_CRAMFS=m
5959
CONFIG_NFS_FS=m
6060
CONFIG_NFS_V3=y
6161
CONFIG_NFSD=m
62-
CONFIG_NFSD_V3=y
6362
CONFIG_NLS=y
6463
CONFIG_NLS_CODEPAGE_437=m
6564
CONFIG_NLS_CODEPAGE_850=m

‎arch/arm/configs/netwinder_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ CONFIG_NFS_V3=y
7171
CONFIG_NFS_V4=y
7272
CONFIG_ROOT_NFS=y
7373
CONFIG_NFSD=y
74-
CONFIG_NFSD_V3=y
7574
CONFIG_SMB_FS=y
7675
CONFIG_PARTITION_ADVANCED=y
7776
CONFIG_NLS_CODEPAGE_437=y

0 commit comments

Comments
 (0)