summaryrefslogtreecommitdiffstats
path: root/net/sunrpc
diff options
context:
space:
mode:
authorJeff Layton <jlayton@primarydata.com>2015-06-08 12:04:46 -0700
committerJ. Bruce Fields <bfields@redhat.com>2015-08-10 16:05:41 -0400
commitc369014f1776367269c8fbb5ea8932826d89ce2f (patch)
tree4abaee756d4e130e5b8c6cd637b981a73af3533b /net/sunrpc
parentea126e74353453d15fc0a181910ae1e25162f2a1 (diff)
downloadlinux-stable-c369014f1776367269c8fbb5ea8932826d89ce2f.tar.gz
linux-stable-c369014f1776367269c8fbb5ea8932826d89ce2f.tar.bz2
linux-stable-c369014f1776367269c8fbb5ea8932826d89ce2f.zip
nfsd/sunrpc: move sv_function into sv_ops
Since we now have a container for holding svc_serv operations, move the sv_function into it as well. Signed-off-by: Shirley Ma <shirley.ma@oracle.com> Acked-by: Jeff Layton <jlayton@primarydata.com> Tested-by: Shirley Ma <shirley.ma@oracle.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'net/sunrpc')
-rw-r--r--net/sunrpc/svc.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
index 36eee907696b..5b8726030c24 100644
--- a/net/sunrpc/svc.c
+++ b/net/sunrpc/svc.c
@@ -34,7 +34,7 @@
static void svc_unregister(const struct svc_serv *serv, struct net *net);
-#define svc_serv_is_pooled(serv) ((serv)->sv_function)
+#define svc_serv_is_pooled(serv) ((serv)->sv_ops->svo_function)
/*
* Mode for mapping cpus to pools.
@@ -494,8 +494,7 @@ EXPORT_SYMBOL_GPL(svc_create);
struct svc_serv *
svc_create_pooled(struct svc_program *prog, unsigned int bufsize,
- struct svc_serv_ops *ops, svc_thread_fn func,
- struct module *mod)
+ struct svc_serv_ops *ops, struct module *mod)
{
struct svc_serv *serv;
unsigned int npools = svc_pool_map_get();
@@ -504,7 +503,6 @@ svc_create_pooled(struct svc_program *prog, unsigned int bufsize,
if (!serv)
goto out_err;
- serv->sv_function = func;
serv->sv_module = mod;
return serv;
out_err:
@@ -740,7 +738,7 @@ svc_set_num_threads(struct svc_serv *serv, struct svc_pool *pool, int nrservs)
}
__module_get(serv->sv_module);
- task = kthread_create_on_node(serv->sv_function, rqstp,
+ task = kthread_create_on_node(serv->sv_ops->svo_function, rqstp,
node, "%s", serv->sv_name);
if (IS_ERR(task)) {
error = PTR_ERR(task);