summaryrefslogtreecommitdiffstats
path: root/net/sunrpc
diff options
context:
space:
mode:
Diffstat (limited to 'net/sunrpc')
-rw-r--r--net/sunrpc/.cvsignore2
-rw-r--r--net/sunrpc/svcsock.c7
2 files changed, 1 insertions, 8 deletions
diff --git a/net/sunrpc/.cvsignore b/net/sunrpc/.cvsignore
deleted file mode 100644
index 857dd22e9..000000000
--- a/net/sunrpc/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-.depend
-.*.flags
diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c
index 0fb992f47..25ac47242 100644
--- a/net/sunrpc/svcsock.c
+++ b/net/sunrpc/svcsock.c
@@ -523,13 +523,8 @@ svc_tcp_accept(struct svc_sock *svsk)
dprintk("svc: tcp_accept %p allocated\n", newsock);
newsock->type = sock->type;
- if ((err = sock->ops->dup(newsock, sock)) < 0) {
- printk(KERN_WARNING "%s: socket dup failed (err %d)!\n",
- serv->sv_name, -err);
- goto failed;
- }
+ newsock->ops = ops = sock->ops;
- ops = newsock->ops;
if ((err = ops->accept(sock, newsock, O_NONBLOCK)) < 0) {
printk(KERN_WARNING "%s: accept failed (err %d)!\n",
serv->sv_name, -err);