| Message ID | 20250317-rpc-shutdown-v1-2-85ba8e20b75d@kernel.org (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | nfs/sunrpc: stop holding netns references in client-side NFS and RPC objects | expand |
diff --git a/fs/lockd/host.c b/fs/lockd/host.c index 5e6877c37f7303e7141fbb96bc278a207c8e5ddc..ed88c102eca0f999a9c5351467d823b806c30962 100644 --- a/fs/lockd/host.c +++ b/fs/lockd/host.c @@ -692,3 +692,10 @@ nlm_gc_hosts(struct net *net) ln->next_gc = jiffies + NLM_HOST_COLLECT; } } + +void +nlm_host_shutdown_rpc(struct nlm_host *host) +{ + rpc_clnt_shutdown(host->h_rpcclnt); +} +EXPORT_SYMBOL_GPL(nlm_host_shutdown_rpc); diff --git a/fs/nfs/sysfs.c b/fs/nfs/sysfs.c index c29c5fd639554461bdcd9ff612726194910d85b5..c0bfe6df53b51c0fcc541c33ab7590813114d7ec 100644 --- a/fs/nfs/sysfs.c +++ b/fs/nfs/sysfs.c @@ -254,7 +254,7 @@ shutdown_store(struct kobject *kobj, struct kobj_attribute *attr, rpc_clnt_shutdown(server->client_acl); if (server->nlm_host) - rpc_clnt_shutdown(server->nlm_host->h_rpcclnt); + nlm_host_shutdown_rpc(server->nlm_host); out: return count; } diff --git a/include/linux/lockd/lockd.h b/include/linux/lockd/lockd.h index c8f0f9458f2cc035fd9161f8f2486ba76084abf1..6b8c912f443c3b4130f49b8170070d0b794abb94 100644 --- a/include/linux/lockd/lockd.h +++ b/include/linux/lockd/lockd.h @@ -248,6 +248,7 @@ void nlm_shutdown_hosts(void); void nlm_shutdown_hosts_net(struct net *net); void nlm_host_rebooted(const struct net *net, const struct nlm_reboot *); +void nlm_host_shutdown_rpc(struct nlm_host *host); /* * Host monitoring
NFS reaching into struct nlm_host is at least a minor layering violation. Make an exported helper function and have nfs call that instead. Signed-off-by: Jeff Layton <jlayton@kernel.org> --- fs/lockd/host.c | 7 +++++++ fs/nfs/sysfs.c | 2 +- include/linux/lockd/lockd.h | 1 + 3 files changed, 9 insertions(+), 1 deletion(-)