Skip to content

Commit d7900da

Browse files
committed
SUNRPC: Improve observability in svc_tcp_accept()
The -ENOMEM arm could fire repeatedly if the system runs low on memory, so remove it. Don't bother to trace -EAGAIN error events, since those fire after a listener is created (with no work done) and once again after an accept has been handled successfully (again, with no work done). Reviewed-by: Jeff Layton <[email protected]> Signed-off-by: Chuck Lever <[email protected]>
1 parent cce4ee9 commit d7900da

File tree

1 file changed

+2
-7
lines changed

1 file changed

+2
-7
lines changed

net/sunrpc/svcsock.c

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -886,13 +886,8 @@ static struct svc_xprt *svc_tcp_accept(struct svc_xprt *xprt)
886886
clear_bit(XPT_CONN, &svsk->sk_xprt.xpt_flags);
887887
err = kernel_accept(sock, &newsock, O_NONBLOCK);
888888
if (err < 0) {
889-
if (err == -ENOMEM)
890-
printk(KERN_WARNING "%s: no more sockets!\n",
891-
serv->sv_name);
892-
else if (err != -EAGAIN)
893-
net_warn_ratelimited("%s: accept failed (err %d)!\n",
894-
serv->sv_name, -err);
895-
trace_svcsock_accept_err(xprt, serv->sv_name, err);
889+
if (err != -EAGAIN)
890+
trace_svcsock_accept_err(xprt, serv->sv_name, err);
896891
return NULL;
897892
}
898893
if (IS_ERR(sock_alloc_file(newsock, O_NONBLOCK, NULL)))

0 commit comments

Comments
 (0)