leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

svc: Move close processing to a single place

Browse Source 
Close handling was duplicated in the UDP and TCP recvfrom
methods. This code has been moved to the transport independent
svc_recv function.

Signed-off-by: Tom Tucker <tom@opengridcomputing.com>
Acked-by: Neil Brown <neilb@suse.de>
Reviewed-by: Chuck Lever <chuck.lever@oracle.com>
Reviewed-by: Greg Banks <gnb@sgi.com>
Signed-off-by: J. Bruce Fields <bfields@citi.umich.edu>
This commit is contained in:
Tom Tucker 2007-12-30 21:07:34 -06:00 committed by J. Bruce Fields
parent 323bee32e9
commit d7979ae4a0
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
net/sunrpc/svcsock.c
View File

@ -776,11 +776,6 @@ svc_udp_recvfrom(struct svc_rqst *rqstp)
return svc_deferred_recv(rqstp); return svc_deferred_recv(rqstp);
} }
if (test_bit(SK_CLOSE, &svsk->sk_flags)) {
svc_delete_socket(svsk);
return 0;
}
clear_bit(SK_DATA, &svsk->sk_flags); clear_bit(SK_DATA, &svsk->sk_flags);
skb = NULL; skb = NULL;
err = kernel_recvmsg(svsk->sk_sock, &msg, NULL, err = kernel_recvmsg(svsk->sk_sock, &msg, NULL,
@ -1181,11 +1176,6 @@ svc_tcp_recvfrom(struct svc_rqst *rqstp)
return svc_deferred_recv(rqstp); return svc_deferred_recv(rqstp);
} }
if (test_bit(SK_CLOSE, &svsk->sk_flags)) {
svc_delete_socket(svsk);
return 0;
}
if (svsk->sk_sk->sk_state == TCP_LISTEN) { if (svsk->sk_sk->sk_state == TCP_LISTEN) {
svc_tcp_accept(svsk); svc_tcp_accept(svsk);
svc_sock_received(svsk); svc_sock_received(svsk);
@ -1311,7 +1301,7 @@ svc_tcp_recvfrom(struct svc_rqst *rqstp)
return len; return len;
err_delete: err_delete:
svc_delete_socket(svsk); set_bit(SK_CLOSE, &svsk->sk_flags);
return -EAGAIN; return -EAGAIN;
error: error:
@ -1575,10 +1565,16 @@ svc_recv(struct svc_rqst *rqstp, long timeout)
} }
spin_unlock_bh(&pool->sp_lock); spin_unlock_bh(&pool->sp_lock);
dprintk("svc: server %p, pool %u, socket %p, inuse=%d\n", len = 0;
rqstp, pool->sp_id, svsk, atomic_read(&svsk->sk_inuse)); if (test_bit(SK_CLOSE, &svsk->sk_flags)) {
len = svsk->sk_xprt.xpt_ops->xpo_recvfrom(rqstp); dprintk("svc_recv: found SK_CLOSE\n");
dprintk("svc: got len=%d\n", len); svc_delete_socket(svsk);
} else {
dprintk("svc: server %p, pool %u, socket %p, inuse=%d\n",
rqstp, pool->sp_id, svsk, atomic_read(&svsk->sk_inuse));
len = svsk->sk_xprt.xpt_ops->xpo_recvfrom(rqstp);
dprintk("svc: got len=%d\n", len);
}
/* No data, incomplete (TCP) read, or accept() */ /* No data, incomplete (TCP) read, or accept() */
if (len == 0 || len == -EAGAIN) { if (len == 0 || len == -EAGAIN) {