From e5e45ea615a13edac86d6f84bbd5fc1c5d532a10 Mon Sep 17 00:00:00 2001 From: Anna Schumaker Date: Fri, 7 Nov 2025 16:30:51 -0500 Subject: [PATCH] NFS: Move nfs40_call_sync_ops into nfs40proc.c This is the first step in extracting NFS v4.0 into its own set of files that can be disabled through Kconfig. Signed-off-by: Anna Schumaker --- fs/nfs/Makefile | 2 +- fs/nfs/nfs40.h | 8 ++++++++ fs/nfs/nfs40proc.c | 24 ++++++++++++++++++++++++ fs/nfs/nfs4_fs.h | 6 ++++++ fs/nfs/nfs4proc.c | 25 +------------------------ 5 files changed, 40 insertions(+), 25 deletions(-) create mode 100644 fs/nfs/nfs40.h create mode 100644 fs/nfs/nfs40proc.c diff --git a/fs/nfs/Makefile b/fs/nfs/Makefile index 9fb2f2cac87e3..937c775a04a3d 100644 --- a/fs/nfs/Makefile +++ b/fs/nfs/Makefile @@ -27,7 +27,7 @@ CFLAGS_nfs4trace.o += -I$(src) nfsv4-y := nfs4proc.o nfs4xdr.o nfs4state.o nfs4renewd.o nfs4super.o nfs4file.o \ delegation.o nfs4idmap.o callback.o callback_xdr.o callback_proc.o \ nfs4namespace.o nfs4getroot.o nfs4client.o nfs4session.o \ - dns_resolve.o nfs4trace.o + dns_resolve.o nfs4trace.o nfs40proc.o nfsv4-$(CONFIG_NFS_USE_LEGACY_DNS) += cache_lib.o nfsv4-$(CONFIG_SYSCTL) += nfs4sysctl.o nfsv4-$(CONFIG_NFS_V4_1) += pnfs.o pnfs_dev.o pnfs_nfs.o diff --git a/fs/nfs/nfs40.h b/fs/nfs/nfs40.h new file mode 100644 index 0000000000000..58a59109987a9 --- /dev/null +++ b/fs/nfs/nfs40.h @@ -0,0 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __LINUX_FS_NFS_NFS4_0_H +#define __LINUX_FS_NFS_NFS4_0_H + + +extern const struct rpc_call_ops nfs40_call_sync_ops; + +#endif /* __LINUX_FS_NFS_NFS4_0_H */ diff --git a/fs/nfs/nfs40proc.c b/fs/nfs/nfs40proc.c new file mode 100644 index 0000000000000..6d27dedad0556 --- /dev/null +++ b/fs/nfs/nfs40proc.c @@ -0,0 +1,24 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#include +#include +#include +#include +#include "nfs4_fs.h" + +static void nfs40_call_sync_prepare(struct rpc_task *task, void *calldata) +{ + struct nfs4_call_sync_data *data = calldata; + nfs4_setup_sequence(data->seq_server->nfs_client, + data->seq_args, data->seq_res, task); +} + +static void nfs40_call_sync_done(struct rpc_task *task, void *calldata) +{ + struct nfs4_call_sync_data *data = calldata; + nfs4_sequence_done(task, data->seq_res); +} + +const struct rpc_call_ops nfs40_call_sync_ops = { + .rpc_call_prepare = nfs40_call_sync_prepare, + .rpc_call_done = nfs40_call_sync_done, +}; diff --git a/fs/nfs/nfs4_fs.h b/fs/nfs/nfs4_fs.h index c34c89af9c7d5..575343261c9a8 100644 --- a/fs/nfs/nfs4_fs.h +++ b/fs/nfs/nfs4_fs.h @@ -286,6 +286,12 @@ int nfs4_replace_transport(struct nfs_server *server, size_t nfs_parse_server_name(char *string, size_t len, struct sockaddr_storage *ss, size_t salen, struct net *net, int port); /* nfs4proc.c */ +struct nfs4_call_sync_data { + const struct nfs_server *seq_server; + struct nfs4_sequence_args *seq_args; + struct nfs4_sequence_res *seq_res; +}; + extern int nfs4_handle_exception(struct nfs_server *, int, struct nfs4_exception *); extern int nfs4_async_handle_error(struct rpc_task *task, struct nfs_server *server, diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 9d43016d9aa14..fbbc4e37b4b16 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -67,6 +67,7 @@ #include "nfs4idmap.h" #include "nfs4session.h" #include "fscache.h" +#include "nfs40.h" #include "nfs42.h" #include "nfs4trace.h" @@ -769,12 +770,6 @@ static void renew_lease(const struct nfs_server *server, unsigned long timestamp do_renew_lease(clp, timestamp); } -struct nfs4_call_sync_data { - const struct nfs_server *seq_server; - struct nfs4_sequence_args *seq_args; - struct nfs4_sequence_res *seq_res; -}; - void nfs4_init_sequence(struct nfs4_sequence_args *args, struct nfs4_sequence_res *res, int cache_reply, int privileged) @@ -1174,24 +1169,6 @@ out_sleep: } EXPORT_SYMBOL_GPL(nfs4_setup_sequence); -static void nfs40_call_sync_prepare(struct rpc_task *task, void *calldata) -{ - struct nfs4_call_sync_data *data = calldata; - nfs4_setup_sequence(data->seq_server->nfs_client, - data->seq_args, data->seq_res, task); -} - -static void nfs40_call_sync_done(struct rpc_task *task, void *calldata) -{ - struct nfs4_call_sync_data *data = calldata; - nfs4_sequence_done(task, data->seq_res); -} - -static const struct rpc_call_ops nfs40_call_sync_ops = { - .rpc_call_prepare = nfs40_call_sync_prepare, - .rpc_call_done = nfs40_call_sync_done, -}; - static int nfs4_call_sync_custom(struct rpc_task_setup *task_setup) { int ret; -- 2.47.3