From nobody Tue Oct 25 18:09:56 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Mxg2Y0J20z4gWhN; Tue, 25 Oct 2022 18:09:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Mxg2X5wWvz3HXZ; Tue, 25 Oct 2022 18:09:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666721396; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5XXnJeYk5t6Bw1YYO9qL1uI22aOQ8/4KGAcKllPEOBQ=; b=HRT4dzP4MqOUorbAxtV/WedEldm5uKa3WiTpBAghQ9ZpsdssTXJKXdNmvC1I2Q+33MEG6t 59CJ35zWo4MYRM4NHC6QL1kWCJf0WhEc88aD43swN4Z98yjVY2B3l3mwALiG1L8kdsEmqU 9Sg0C7KYAinU4YhXR4zo5EZBeHRHEVwyHK3PhHIOwe5xszdfkQ8U0ORKcAcj96zXRZYWh1 7s29I1IHm7CdUr5tXI6WI6ANlEoK2Cj096XcmTnyLXGlAPTA/sL/DFFaTdMiJ3ZjGfpQ8N mGy6MYCFi5F6yW95NEcAfFcESBj9nV0zx17FzWC0KlFgIHZPR6WDbn8/RjgaFA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Mxg2X51SSznB8; Tue, 25 Oct 2022 18:09:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29PI9uJd065322; Tue, 25 Oct 2022 18:09:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29PI9uYD065321; Tue, 25 Oct 2022 18:09:56 GMT (envelope-from git) Date: Tue, 25 Oct 2022 18:09:56 GMT Message-Id: <202210251809.29PI9uYD065321@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: eda633455a63 - main - tcp: remove useless today lock assertion in a middle of function List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eda633455a63421976d7d9fd093dc6b665de2c64 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666721396; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5XXnJeYk5t6Bw1YYO9qL1uI22aOQ8/4KGAcKllPEOBQ=; b=t9QVSZZJfEg35dqL3cBVQjhwiiBXvjtoGK2S991A4QX86zVMc0HOZlPJaff2sqBGlJG+vu 3j6+xAw/3E/Q9ZdwlJ1P6rJeH0wAUMM+Idf2WtBSXG+y1msjeNaBOBslql1GBKxCNiSJP0 KwfnmrzoUxiyNRLzygS819gn/1gy2c59efEacPrwS5Yd01guv0jWY/IBcc2vtqsVmVly9U fpRMIffBowxabE/3aYBN+dAOK4f277Z3iNT119C4LiTcWNooi3GvBicNzWpyHM79BgSYpz W+lGSOUYp2uwcYRUuAINAY3neXTwg/CHyMXnBVd/fKizMcN+7IVgYugDIAGoPA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666721396; a=rsa-sha256; cv=none; b=VhI6ORHIgCXNUGZ9tF85521MMT3g2AWzl3DjclW5RGZfdACkqfNPHUaB7Nz34UTbUeY2dJ UM3xv5HI4clF0/a1os84HwZN23JAuTXFqIBLnTdIVYhBSDM+EKN2YhH3/+mwOJNch98snT OtN8dQX2yWfyfMaQpVwXhp5Twop15OabVBUrRzERb9eLi06kZmxZPuLL+D+3bP31frWhCA QP7B3sVY+8/6LBbQb4BDsAMGBSoa6h6ix55nfQituo2FhzPEZw5HlaT/+zhoBVlDhXVcCe OotMUFgHc8h+KmbrQBPL2RDU/UTfHdW9rKUK/gqDlgTIlDoWFtu0ndMKnIbZVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=eda633455a63421976d7d9fd093dc6b665de2c64 commit eda633455a63421976d7d9fd093dc6b665de2c64 Author: Gleb Smirnoff AuthorDate: 2022-10-25 18:09:22 +0000 Commit: Gleb Smirnoff CommitDate: 2022-10-25 18:09:22 +0000 tcp: remove useless today lock assertion in a middle of function It was added back in 7cfc6904408b, when there was a jump label above and tcp_input() hadn't been locked all through. --- sys/netinet/tcp_input.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 672776e4e882..1ea3d72d9a9d 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -2131,8 +2131,6 @@ tcp_do_segment(struct mbuf *m, struct tcphdr *th, struct socket *so, tcp_state_change(tp, TCPS_SYN_RECEIVED); } - INP_WLOCK_ASSERT(tp->t_inpcb); - /* * Advance th->th_seq to correspond to first data byte. * If data, trim to stay within window,