summaryrefslogtreecommitdiffstats
path: root/net/sunrpc/svcsock.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1999-10-09 00:00:47 +0000
committerRalf Baechle <ralf@linux-mips.org>1999-10-09 00:00:47 +0000
commitd6434e1042f3b0a6dfe1b1f615af369486f9b1fa (patch)
treee2be02f33984c48ec019c654051d27964e42c441 /net/sunrpc/svcsock.c
parent609d1e803baf519487233b765eb487f9ec227a18 (diff)
Merge with 2.3.19.
Diffstat (limited to 'net/sunrpc/svcsock.c')
-rw-r--r--net/sunrpc/svcsock.c7
1 files changed, 1 insertions, 6 deletions
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);