History

Merge tag 'nfs-for-5.18-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

Pull NFS client updates from Trond Myklebust: "Highlights include: Features: - Switch NFS to use readahead instead of the obsolete readpages. - Readdir fixes to improve cacheability of large directories when there are multiple readers and writers. - Readdir performance improvements when doing a seekdir() immediately after opening the directory (common when re-exporting NFS). - NFS swap improvements from Neil Brown. - Loosen up memory allocation to permit direct reclaim and write back in cases where there is no danger of deadlocking the writeback code or NFS swap. - Avoid sillyrename when the NFSv4 server claims to support the necessary features to recover the unlinked but open file after reboot. Bugfixes: - Patch from Olga to add a mount option to control NFSv4.1 session trunking discovery, and default it to being off. - Fix a lockup in nfs_do_recoalesce(). - Two fixes for list iterator variables being used when pointing to the list head. - Fix a kernel memory scribble when reading from a non-socket transport in /sys/kernel/sunrpc. - Fix a race where reconnecting to a server could leave the TCP socket stuck forever in the connecting state. - Patch from Neil to fix a shutdown race which can leave the SUNRPC transport timer primed after we free the struct xprt itself. - Patch from Xin Xiong to fix reference count leaks in the NFSv4.2 copy offload. - Sunrpc patch from Olga to avoid resending a task on an offlined transport. Cleanups: - Patches from Dave Wysochanski to clean up the fscache code" * tag 'nfs-for-5.18-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs: (91 commits) NFSv4/pNFS: Fix another issue with a list iterator pointing to the head NFS: Don't loop forever in nfs_do_recoalesce() SUNRPC: Don't return error values in sysfs read of closed files SUNRPC: Do not dereference non-socket transports in sysfs NFSv4.1: don't retry BIND_CONN_TO_SESSION on session error SUNRPC don't resend a task on an offlined transport NFS: replace usage of found with dedicated list iterator variable SUNRPC: avoid race between mod_timer() and del_timer_sync() pNFS/files: Ensure pNFS allocation modes are consistent with nfsiod pNFS/flexfiles: Ensure pNFS allocation modes are consistent with nfsiod NFSv4/pnfs: Ensure pNFS allocation modes are consistent with nfsiod NFS: Avoid writeback threads getting stuck in mempool_alloc() NFS: nfsiod should not block forever in mempool_alloc() SUNRPC: Make the rpciod and xprtiod slab allocation modes consistent SUNRPC: Fix unx_lookup_cred() allocation NFS: Fix memory allocation in rpc_alloc_task() NFS: Fix memory allocation in rpc_malloc() SUNRPC: Improve accuracy of socket ENOBUFS determination SUNRPC: Replace internal use of SOCKWQ_ASYNC_NOSPACE SUNRPC: Fix socket waits for write buffer space ...

Linus Torvalds committed 4 years ago

Commit 965181d2 parents 1ec48f9 7c9d84560 files · +1317 −813Browse files

Showing the changes to include/uapi/linux (2 of 60 files). Show all

Unified · Split

2 files
  1. include/uapi/linux/nfs4.h +1 −0
  2. include/uapi/linux/nfs_fs.h +1 −1
include/uapi/linux/nfs4.h+1−0
@@ -45,6 +45,7 @@ · 44 unmodified lines
4545
4646 #define NFS4_OPEN_RESULT_CONFIRM 0x0002
4747 #define NFS4_OPEN_RESULT_LOCKTYPE_POSIX 0x0004
48+#define NFS4_OPEN_RESULT_PRESERVE_UNLINKED 0x0008
4849 #define NFS4_OPEN_RESULT_MAY_NOTIFY_LOCK 0x0020
4950
5051 #define NFS4_SHARE_ACCESS_MASK 0x000F
include/uapi/linux/nfs_fs.h+1−1
@@ -52,7 +52,7 @@ · 51 unmodified lines
5252 #define NFSDBG_CALLBACK 0x0100
5353 #define NFSDBG_CLIENT 0x0200
5454 #define NFSDBG_MOUNT 0x0400
55−#define NFSDBG_FSCACHE 0x0800
55+#define NFSDBG_FSCACHE 0x0800 /* unused */
5656 #define NFSDBG_PNFS 0x1000
5757 #define NFSDBG_PNFS_LD 0x2000
5858 #define NFSDBG_STATE 0x4000