summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2026-11-15 13:48:31 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2026-11-15 13:48:31 -0800
commitf70886e5a510cd7fc2c3aef91c46a14f4485fe63 (patch)
treeffc6034fb2d6fa15cabe1e8ee8a2b93684c583ff /include
parent87aecd24f58e15256870befed777bbffc5d4a9d5 (diff)
parent151d95a1e696979a7d54b23c96338754be2fcc1f (diff)
Merge tag 'nfs-for-7.4-2' of git://git.linux-nfs.org/projects/anna/linux-nfs
Pull NFS client fixes from Anna Schumaker: - Various NFS and SunRPC fixes from Avi Weiss - Various localio fixes from Mike Snitzer - Delegated timestamp fixes from Jeff Layton - CB_NOTIFY_LOCK fixes from Olga Kornievskaia - Various sunrpc, flexfiles, and xprtrdma fixes from Tim Menninger * tag 'nfs-for-7.4-2' of git://git.linux-nfs.org/projects/anna/linux-nfs: (26 commits) NFSv4: Prevent indefinite waits for out-of-order OPEN stateids NFSv4/flexfiles: limit transport disconnects when cancelling I/O SUNRPC: add request-scoped disconnects when cancelling tasks pNFS: avoid repeatedly cancelling I/O for the same lseg xprtrdma: serialize unmap_sync with xprt_disconnect NFSv4: remember that the server may send CB_NOTIFY_LOCK NFSv4: wake blocking lock waiters when a delegated lock is released NFS: stamp after the server's ctime following a CLONE NFS: stamp after the server's ctime when truncating under delegated times NFS: don't let delegated c/mtime stamps go backward NFS/localio: give the LOCALIO probe a short timeout of its own NFS/localio: probe again for LOCALIO when localio_enabled is set to Y NFS/localio: hold the client across an asynchronous LOCALIO probe SUNRPC: Balance queue accounting when relocating a task SUNRPC: Balance switch queue length on transport removal SUNRPC: Fix TCP-with-TLS transport class identification SUNRPC: preserve transport security policy when cloning clients SUNRPC: preserve timeout policy when cloning clients SUNRPC: preserve fatal network errors during RPC binding sunrpc: instantiate rpc_pipefs dentry before publishing it ...
Diffstat (limited to 'include')
-rw-r--r--include/linux/nfs_fs_sb.h1
-rw-r--r--include/linux/sunrpc/sched.h4
-rw-r--r--include/linux/sunrpc/xprt.h5
3 files changed, 10 insertions, 0 deletions
diff --git a/include/linux/nfs_fs_sb.h b/include/linux/nfs_fs_sb.h
index 416c6f39f31d..6e1b0332f2de 100644
--- a/include/linux/nfs_fs_sb.h
+++ b/include/linux/nfs_fs_sb.h
@@ -120,6 +120,7 @@ struct nfs_client {
#define NFS_SP4_MACH_CRED_COMMIT 6 /* COMMIT */
#define NFS_SP4_MACH_CRED_PNFS_CLEANUP 7 /* LAYOUTRETURN */
wait_queue_head_t cl_lock_waitq;
+ bool cl_may_notify_lock;
#endif /* CONFIG_NFS_V4 */
/* Our own IP address, as a null-terminated string.
diff --git a/include/linux/sunrpc/sched.h b/include/linux/sunrpc/sched.h
index 0dbdf3722537..dbaad8b5f181 100644
--- a/include/linux/sunrpc/sched.h
+++ b/include/linux/sunrpc/sched.h
@@ -230,6 +230,10 @@ unsigned long rpc_cancel_tasks(struct rpc_clnt *clnt, int error,
bool (*fnmatch)(const struct rpc_task *,
const void *),
const void *data);
+unsigned long rpc_cancel_tasks_and_disconnect(struct rpc_clnt *clnt, int error,
+ bool (*fnmatch)(const struct rpc_task *,
+ const void *),
+ const void *data);
void rpc_execute(struct rpc_task *);
void rpc_init_priority_wait_queue(struct rpc_wait_queue *, const char *);
void rpc_init_wait_queue(struct rpc_wait_queue *, const char *);
diff --git a/include/linux/sunrpc/xprt.h b/include/linux/sunrpc/xprt.h
index 005730623f3b..780eaa157a9f 100644
--- a/include/linux/sunrpc/xprt.h
+++ b/include/linux/sunrpc/xprt.h
@@ -112,6 +112,11 @@ struct rpc_rqst {
ktime_t rq_xtime; /* transmit time stamp */
int rq_ntrans;
+ bool rq_disconnect_on_release;
+ /*
+ * protected by rq_xprt->transport_lock
+ * while the request is active
+ */
#if defined(CONFIG_SUNRPC_BACKCHANNEL)
struct lwq_node rq_bc_list; /* Callback service list */