Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

NLM: Remove "proto" argument from lockd_up()

Browse source 
Clean up: Now that lockd_up() starts listeners for both transports, the
"proto" argument is no longer needed.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Cc: Neil Brown <neilb@suse.de>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
This commit is contained in:
Chuck Lever 2008-10-03 17:15:30 -04:00 committed by J. Bruce Fields
parent 8c3916f4bd
commit 26a4140923
5 changed files with 13 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
fs/lockd/clntlock.c
View file

@ -54,7 +54,7 @@ struct nlm_host *nlmclnt_init(const struct nlmclnt_initdata *nlm_init)
u32 nlm_version = (nlm_init->nfs_version == 2) ? 1 : 4; u32 nlm_version = (nlm_init->nfs_version == 2) ? 1 : 4;
int status; int status;
status = lockd_up(nlm_init->protocol); status = lockd_up();
if (status < 0) if (status < 0)
return ERR_PTR(status); return ERR_PTR(status);
@ -215,7 +215,7 @@ reclaimer(void *ptr)
/* This one ensures that our parent doesn't terminate while the /* This one ensures that our parent doesn't terminate while the
* reclaim is in progress */ * reclaim is in progress */
lock_kernel(); lock_kernel();
lockd_up(0); /* note: this cannot fail as lockd is already running */ lockd_up(); /* note: this cannot fail as lockd is already running */
dprintk("lockd: reclaiming locks for host %s\n", host->h_name); dprintk("lockd: reclaiming locks for host %s\n", host->h_name);

3
fs/lockd/svc.c
View file

@ -230,8 +230,7 @@ static int make_socks(struct svc_serv *serv)
/* /*
* Bring up the lockd process if it's not already up. * Bring up the lockd process if it's not already up.
*/ */
int int lockd_up(void)
lockd_up(int proto) /* Maybe add a 'family' option when IPv6 is supported ?? */
{ {
struct svc_serv *serv; struct svc_serv *serv;
int error = 0; int error = 0;

5
fs/nfsd/nfsctl.c
View file

@ -614,10 +614,9 @@ static ssize_t __write_ports(struct file *file, char *buf, size_t size)
return -EINVAL; return -EINVAL;
err = nfsd_create_serv(); err = nfsd_create_serv();
if (!err) { if (!err) {
int proto = 0; err = svc_addsock(nfsd_serv, fd, buf, NULL);
err = svc_addsock(nfsd_serv, fd, buf, &proto);
if (err >= 0) { if (err >= 0) {
err = lockd_up(proto); err = lockd_up();
if (err < 0) if (err < 0)
svc_sock_names(buf+strlen(buf)+1, nfsd_serv, buf); svc_sock_names(buf+strlen(buf)+1, nfsd_serv, buf);
} }

19
fs/nfsd/nfssvc.c
View file

@ -244,25 +244,20 @@ static int nfsd_init_socks(int port)
if (!list_empty(&nfsd_serv->sv_permsocks)) if (!list_empty(&nfsd_serv->sv_permsocks))
return 0; return 0;
error = lockd_up(IPPROTO_UDP); error = svc_create_xprt(nfsd_serv, "udp", port,
if (error >= 0) {
error = svc_create_xprt(nfsd_serv, "udp", port,
SVC_SOCK_DEFAULTS); SVC_SOCK_DEFAULTS);
if (error < 0)
lockd_down();
}
if (error < 0) if (error < 0)
return error; return error;
error = lockd_up(IPPROTO_TCP); error = svc_create_xprt(nfsd_serv, "tcp", port,
if (error >= 0) {
error = svc_create_xprt(nfsd_serv, "tcp", port,
SVC_SOCK_DEFAULTS); SVC_SOCK_DEFAULTS);
if (error < 0)
lockd_down();
}
if (error < 0) if (error < 0)
return error; return error;
error = lockd_up();
if (error < 0)
return error;
return 0; return 0;
} }

2
include/linux/lockd/bind.h
View file

@ -52,7 +52,7 @@ extern void nlmclnt_done(struct nlm_host *host);
extern int nlmclnt_proc(struct nlm_host *host, int cmd, extern int nlmclnt_proc(struct nlm_host *host, int cmd,
struct file_lock *fl); struct file_lock *fl);
extern int lockd_up(int proto); extern int lockd_up(void);
extern void lockd_down(void); extern void lockd_down(void);
#endif /* LINUX_LOCKD_BIND_H */ #endif /* LINUX_LOCKD_BIND_H */