From e69e16905f932437f5bf5ff3249280beef4d03d5 Mon Sep 17 00:00:00 2001
From: Chuck Lever <chuck.lever@oracle.com>
Date: Fri, 3 Oct 2008 17:15:38 -0400
Subject: [PATCH] --- yaml --- r: 114347 b: refs/heads/master c:
 2937391385807b3da9cd7a39345259caf550b032 h: refs/heads/master i:   114345:
 9a8b485977cdf0c9c55188051e6b0f3b4e2515af   114343:
 e9a2bfd5f05ce14640a32a043b9a265f6dd6ffd4 v: v3

---
 [refs]                               | 2 +-
 trunk/fs/nfsd/nfsctl.c               | 2 +-
 trunk/include/linux/sunrpc/svcsock.h | 5 +----
 trunk/net/sunrpc/svcsock.c           | 4 +---
 4 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 7d4c1d374888..d6f188192485 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 26a414092353590ceaa5955bcb53f863d6ea7549
+refs/heads/master: 2937391385807b3da9cd7a39345259caf550b032
diff --git a/trunk/fs/nfsd/nfsctl.c b/trunk/fs/nfsd/nfsctl.c
index 862dff5247f7..97543df58242 100644
--- a/trunk/fs/nfsd/nfsctl.c
+++ b/trunk/fs/nfsd/nfsctl.c
@@ -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)
diff --git a/trunk/include/linux/sunrpc/svcsock.h b/trunk/include/linux/sunrpc/svcsock.h
index 8cff696dedf5..483e10380aae 100644
--- a/trunk/include/linux/sunrpc/svcsock.h
+++ b/trunk/include/linux/sunrpc/svcsock.h
@@ -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);
 
diff --git a/trunk/net/sunrpc/svcsock.c b/trunk/net/sunrpc/svcsock.c
index f91377c14951..95293f549e9c 100644
--- a/trunk/net/sunrpc/svcsock.c
+++ b/trunk/net/sunrpc/svcsock.c
@@ -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);