Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 29373913 authored by Chuck Lever's avatar Chuck Lever Committed by J. Bruce Fields
Browse files

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: default avatarChuck Lever <chuck.lever@oracle.com>
Cc: Neil Brown <neilb@suse.de>
Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
parent 26a41409

fs/nfsd/nfsctl.c

+1 −1
Original line number Diff line number Diff line
@@ -614,7 +614,7 @@ static ssize_t __write_ports(struct file *file, char *buf, size_t size) 
			return -EINVAL;

		err = nfsd_create_serv();

		if (!err) {

			err = svc_addsock(nfsd_serv, fd, buf, NULL);

			err = svc_addsock(nfsd_serv, fd, buf);

			if (err >= 0) {

				err = lockd_up();

				if (err < 0)

include/linux/sunrpc/svcsock.h

+1 −4
Original line number Diff line number Diff line
@@ -39,10 +39,7 @@ int svc_send(struct svc_rqst *); 
void		svc_drop(struct svc_rqst *);

void		svc_sock_update_bufs(struct svc_serv *serv);

int		svc_sock_names(char *buf, struct svc_serv *serv, char *toclose);

int		svc_addsock(struct svc_serv *serv,

			    int fd,

			    char *name_return,

			    int *proto);

int		svc_addsock(struct svc_serv *serv, int fd, char *name_return);

void		svc_init_xprt_sock(void);

void		svc_cleanup_xprt_sock(void);

net/sunrpc/svcsock.c

+1 −3
Original line number Diff line number Diff line
@@ -1167,8 +1167,7 @@ static struct svc_sock *svc_setup_socket(struct svc_serv *serv, 


int svc_addsock(struct svc_serv *serv,

		int fd,

		char *name_return,

		int *proto)

		char *name_return)

{

	int err = 0;

	struct socket *so = sockfd_lookup(fd, &err);
@@ -1203,7 +1202,6 @@ int svc_addsock(struct svc_serv *serv, 
		sockfd_put(so);

		return err;

	}

	if (proto) *proto = so->sk->sk_protocol;

	return one_sock_name(name_return, svsk);

}

EXPORT_SYMBOL_GPL(svc_addsock);