diff options
| author | Richard Scheffenegger <rscheff@FreeBSD.org> | 2021-04-02 18:26:48 +0000 |
|---|---|---|
| committer | Richard Scheffenegger <rscheff@FreeBSD.org> | 2021-04-16 21:35:29 +0000 |
| commit | 4d8601e916cd2a7dad0e6490a1b4a1a51b2e19c8 (patch) | |
| tree | 25f61853f96de3660dfbc6ba1a1c7a899eac2193 | |
| parent | cca0fba78e5f299a8a42aa9f5022274179b918ef (diff) | |
| download | src-4d8601e916cd2a7dad0e6490a1b4a1a51b2e19c8.tar.gz src-4d8601e916cd2a7dad0e6490a1b4a1a51b2e19c8.zip | |
tcp: Use sbuf_drain unconditionally
After making sbuf_drain safe for external use,
there is no need to protect the call.
MFC after: 2 weeks
Reviewed By: tuexen, #transport
Sponsored by: NetApp, Inc.
Differential Revision: https://reviews.freebsd.org/D29545
(cherry picked from commit 38ea2bd0698e434ec531b97fa94b24db24e16629)
(cherry picked from commit a04906f0273fa6d80eb3ebf22b9b84e53e6b21e0)
| -rw-r--r-- | sys/netinet/tcp_hostcache.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/sys/netinet/tcp_hostcache.c b/sys/netinet/tcp_hostcache.c index b3dbf0583cc9..47846040d9db 100644 --- a/sys/netinet/tcp_hostcache.c +++ b/sys/netinet/tcp_hostcache.c @@ -622,7 +622,6 @@ sysctl_tcp_hc_list(SYSCTL_HANDLER_ARGS) const int linesize = 128; struct sbuf sb; int i, error, len; - bool do_drain = false; struct hc_metrics *hc_entry; char ip4buf[INET_ADDRSTRLEN]; #ifdef INET6 @@ -680,16 +679,9 @@ sysctl_tcp_hc_list(SYSCTL_HANDLER_ARGS) hc_entry->rmx_hits, hc_entry->rmx_updates, hc_entry->rmx_expire); - do_drain = true; } THC_UNLOCK(&V_tcp_hostcache.hashbase[i].hch_mtx); - /* Need to track if sbuf has data, to avoid - * a KASSERT when calling sbuf_drain. - */ - if (do_drain) { - sbuf_drain(&sb); - do_drain = false; - } + sbuf_drain(&sb); } #undef msec error = sbuf_finish(&sb); |