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 /fs | |
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 'fs')
-rw-r--r-- | fs/lockd/svc.c | 2 | ||||
-rw-r--r-- | fs/nfs/callback.c | 3 | ||||
-rw-r--r-- | fs/nfsd/nfssvc.c | 1 |
3 files changed, 2 insertions, 4 deletions
diff --git a/fs/lockd/svc.c b/fs/lockd/svc.c index 390c5593655c..d30920038cb6 100644 --- a/fs/lockd/svc.c +++ b/fs/lockd/svc.c | |||
@@ -275,7 +275,7 @@ int lockd_up(void) | |||
275 | "lockd_up: no pid, %d users??\n", nlmsvc_users); | 275 | "lockd_up: no pid, %d users??\n", nlmsvc_users); |
276 | 276 | ||
277 | error = -ENOMEM; | 277 | error = -ENOMEM; |
278 | serv = svc_create(&nlmsvc_program, LOCKD_BUFSIZE, nlmsvc_family, NULL); | 278 | serv = svc_create(&nlmsvc_program, LOCKD_BUFSIZE, NULL); |
279 | if (!serv) { | 279 | if (!serv) { |
280 | printk(KERN_WARNING "lockd_up: create service failed\n"); | 280 | printk(KERN_WARNING "lockd_up: create service failed\n"); |
281 | goto out; | 281 | goto out; |
diff --git a/fs/nfs/callback.c b/fs/nfs/callback.c index fb35cab63c8a..ddf4b4ae6967 100644 --- a/fs/nfs/callback.c +++ b/fs/nfs/callback.c | |||
@@ -116,8 +116,7 @@ int nfs_callback_up(void) | |||
116 | mutex_lock(&nfs_callback_mutex); | 116 | mutex_lock(&nfs_callback_mutex); |
117 | if (nfs_callback_info.users++ || nfs_callback_info.task != NULL) | 117 | if (nfs_callback_info.users++ || nfs_callback_info.task != NULL) |
118 | goto out; | 118 | goto out; |
119 | serv = svc_create(&nfs4_callback_program, NFS4_CALLBACK_BUFSIZE, | 119 | serv = svc_create(&nfs4_callback_program, NFS4_CALLBACK_BUFSIZE, NULL); |
120 | nfs_callback_family, NULL); | ||
121 | ret = -ENOMEM; | 120 | ret = -ENOMEM; |
122 | if (!serv) | 121 | if (!serv) |
123 | goto out_err; | 122 | goto out_err; |
diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c index ab7f249055b5..bc3567bab8c4 100644 --- a/fs/nfsd/nfssvc.c +++ b/fs/nfsd/nfssvc.c | |||
@@ -229,7 +229,6 @@ int nfsd_create_serv(void) | |||
229 | 229 | ||
230 | atomic_set(&nfsd_busy, 0); | 230 | atomic_set(&nfsd_busy, 0); |
231 | nfsd_serv = svc_create_pooled(&nfsd_program, nfsd_max_blksize, | 231 | nfsd_serv = svc_create_pooled(&nfsd_program, nfsd_max_blksize, |
232 | AF_INET, | ||
233 | nfsd_last_thread, nfsd, THIS_MODULE); | 232 | nfsd_last_thread, nfsd, THIS_MODULE); |
234 | if (nfsd_serv == NULL) | 233 | if (nfsd_serv == NULL) |
235 | err = -ENOMEM; | 234 | err = -ENOMEM; |