openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

NLM: Remove unused argument from svc_addsock() function 

Clean up: The svc_addsock() function no longer uses its "proto"
argument, so remove it.

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:38 -04:00 committed by J. Bruce Fields
parent 26a4140923
commit 2937391385
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/nfsd/nfsctl.c
View File

@ -614,7 +614,7 @@ 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) {
err = svc_addsock(nfsd_serv, fd, buf, NULL); err = svc_addsock(nfsd_serv, fd, buf);
if (err >= 0) { if (err >= 0) {
err = lockd_up(); err = lockd_up();
if (err < 0) if (err < 0)

5
include/linux/sunrpc/svcsock.h
View File

@ -39,10 +39,7 @@ int svc_send(struct svc_rqst *);
void svc_drop(struct svc_rqst *); void svc_drop(struct svc_rqst *);
void svc_sock_update_bufs(struct svc_serv *serv); void svc_sock_update_bufs(struct svc_serv *serv);
int svc_sock_names(char *buf, struct svc_serv *serv, char *toclose); int svc_sock_names(char *buf, struct svc_serv *serv, char *toclose);
int svc_addsock(struct svc_serv *serv, int svc_addsock(struct svc_serv *serv, int fd, char *name_return);
int fd,
char *name_return,
int *proto);
void svc_init_xprt_sock(void); void svc_init_xprt_sock(void);
void svc_cleanup_xprt_sock(void); void svc_cleanup_xprt_sock(void);

4
net/sunrpc/svcsock.c
View File

@ -1167,8 +1167,7 @@ static struct svc_sock *svc_setup_socket(struct svc_serv *serv,
int svc_addsock(struct svc_serv *serv, int svc_addsock(struct svc_serv *serv,
int fd, int fd,
char *name_return, char *name_return)
int *proto)
{ {
int err = 0; int err = 0;
struct socket *so = sockfd_lookup(fd, &err); struct socket *so = sockfd_lookup(fd, &err);
@ -1203,7 +1202,6 @@ int svc_addsock(struct svc_serv *serv,
sockfd_put(so); sockfd_put(so);
return err; return err;
} }
if (proto) *proto = so->sk->sk_protocol;
return one_sock_name(name_return, svsk); return one_sock_name(name_return, svsk);
} }
EXPORT_SYMBOL_GPL(svc_addsock); EXPORT_SYMBOL_GPL(svc_addsock);