diff options
author | Chuck Lever <chuck.lever@oracle.com> | 2009-03-18 20:46:29 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2009-03-28 15:54:48 -0400 |
commit | 49a9072f29a1039f142ec98b44a72d7173651c02 (patch) | |
tree | d2a87541cb699fb6b1fbdef492f3dc6c305aa541 /net | |
parent | 9652ada3fb5914a67d8422114e8a76388330fa79 (diff) |
SUNRPC: Remove @family argument from svc_create() and svc_create_pooled()
Since an RPC service listener's protocol family is specified now via
svc_create_xprt(), it no longer needs to be passed to svc_create() or
svc_create_pooled(). Remove that argument from the synopsis of those
functions, and remove the sv_family field from the svc_serv struct.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'net')
-rw-r--r-- | net/sunrpc/svc.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c index 41bc36ea2224..d72ff44826d8 100644 --- a/net/sunrpc/svc.c +++ b/net/sunrpc/svc.c | |||
@@ -359,7 +359,7 @@ svc_pool_for_cpu(struct svc_serv *serv, int cpu) | |||
359 | */ | 359 | */ |
360 | static struct svc_serv * | 360 | static struct svc_serv * |
361 | __svc_create(struct svc_program *prog, unsigned int bufsize, int npools, | 361 | __svc_create(struct svc_program *prog, unsigned int bufsize, int npools, |
362 | sa_family_t family, void (*shutdown)(struct svc_serv *serv)) | 362 | void (*shutdown)(struct svc_serv *serv)) |
363 | { | 363 | { |
364 | struct svc_serv *serv; | 364 | struct svc_serv *serv; |
365 | unsigned int vers; | 365 | unsigned int vers; |
@@ -368,7 +368,6 @@ __svc_create(struct svc_program *prog, unsigned int bufsize, int npools, | |||
368 | 368 | ||
369 | if (!(serv = kzalloc(sizeof(*serv), GFP_KERNEL))) | 369 | if (!(serv = kzalloc(sizeof(*serv), GFP_KERNEL))) |
370 | return NULL; | 370 | return NULL; |
371 | serv->sv_family = family; | ||
372 | serv->sv_name = prog->pg_name; | 371 | serv->sv_name = prog->pg_name; |
373 | serv->sv_program = prog; | 372 | serv->sv_program = prog; |
374 | serv->sv_nrthreads = 1; | 373 | serv->sv_nrthreads = 1; |
@@ -427,21 +426,21 @@ __svc_create(struct svc_program *prog, unsigned int bufsize, int npools, | |||
427 | 426 | ||
428 | struct svc_serv * | 427 | struct svc_serv * |
429 | svc_create(struct svc_program *prog, unsigned int bufsize, | 428 | svc_create(struct svc_program *prog, unsigned int bufsize, |
430 | sa_family_t family, void (*shutdown)(struct svc_serv *serv)) | 429 | void (*shutdown)(struct svc_serv *serv)) |
431 | { | 430 | { |
432 | return __svc_create(prog, bufsize, /*npools*/1, family, shutdown); | 431 | return __svc_create(prog, bufsize, /*npools*/1, shutdown); |
433 | } | 432 | } |
434 | EXPORT_SYMBOL_GPL(svc_create); | 433 | EXPORT_SYMBOL_GPL(svc_create); |
435 | 434 | ||
436 | struct svc_serv * | 435 | struct svc_serv * |
437 | svc_create_pooled(struct svc_program *prog, unsigned int bufsize, | 436 | svc_create_pooled(struct svc_program *prog, unsigned int bufsize, |
438 | sa_family_t family, void (*shutdown)(struct svc_serv *serv), | 437 | void (*shutdown)(struct svc_serv *serv), |
439 | svc_thread_fn func, struct module *mod) | 438 | svc_thread_fn func, struct module *mod) |
440 | { | 439 | { |
441 | struct svc_serv *serv; | 440 | struct svc_serv *serv; |
442 | unsigned int npools = svc_pool_map_get(); | 441 | unsigned int npools = svc_pool_map_get(); |
443 | 442 | ||
444 | serv = __svc_create(prog, bufsize, npools, family, shutdown); | 443 | serv = __svc_create(prog, bufsize, npools, shutdown); |
445 | 444 | ||
446 | if (serv != NULL) { | 445 | if (serv != NULL) { |
447 | serv->sv_function = func; | 446 | serv->sv_function = func; |