diff options
Diffstat (limited to 'net/sunrpc/svcsock.c')
| -rw-r--r-- | net/sunrpc/svcsock.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c index 12ff5da8160e..036ab520df21 100644 --- a/net/sunrpc/svcsock.c +++ b/net/sunrpc/svcsock.c | |||
| @@ -1110,7 +1110,8 @@ svc_tcp_accept(struct svc_sock *svsk) | |||
| 1110 | serv->sv_name); | 1110 | serv->sv_name); |
| 1111 | printk(KERN_NOTICE | 1111 | printk(KERN_NOTICE |
| 1112 | "%s: last TCP connect from %s\n", | 1112 | "%s: last TCP connect from %s\n", |
| 1113 | serv->sv_name, buf); | 1113 | serv->sv_name, __svc_print_addr(sin, |
| 1114 | buf, sizeof(buf))); | ||
| 1114 | } | 1115 | } |
| 1115 | /* | 1116 | /* |
| 1116 | * Always select the oldest socket. It's not fair, | 1117 | * Always select the oldest socket. It's not fair, |
| @@ -1592,7 +1593,7 @@ svc_age_temp_sockets(unsigned long closure) | |||
| 1592 | 1593 | ||
| 1593 | if (!test_and_set_bit(SK_OLD, &svsk->sk_flags)) | 1594 | if (!test_and_set_bit(SK_OLD, &svsk->sk_flags)) |
| 1594 | continue; | 1595 | continue; |
| 1595 | if (atomic_read(&svsk->sk_inuse) || test_bit(SK_BUSY, &svsk->sk_flags)) | 1596 | if (atomic_read(&svsk->sk_inuse) > 1 || test_bit(SK_BUSY, &svsk->sk_flags)) |
| 1596 | continue; | 1597 | continue; |
| 1597 | atomic_inc(&svsk->sk_inuse); | 1598 | atomic_inc(&svsk->sk_inuse); |
| 1598 | list_move(le, &to_be_aged); | 1599 | list_move(le, &to_be_aged); |