From nobody Thu May 12 18:03:06 2022 X-Original-To: dev-commits-src-all@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 4FC431AC5003; Thu, 12 May 2022 18:03:07 +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 4KzflG748xz3k91; Thu, 12 May 2022 18:03:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652378587; 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=2rTzhkoJcVzU9s5LVAwNvTm4cMasPEgqouoVL7B92a4=; b=eXPRYxO4zmxaYtLYh57HUT/cLHWrJx03lFUJFHnBMO4JnHfzRV2Ysm0aE1ItbR7EjQrpo8 lgkj4sVFSKwGZ2acOaEgBW/4U0ukPfGGHTJTJrb/5z9OQidS8yudx3U2LQds7pK7mpuZIM 6lzqgsgDW0Mvu/ieQM5tPklw47Vx5OEDK6ED3ZeI8MQsHVB3TYgMy3oGjf7rKyVsdBLSGa 4gspMsngdZ2U8xk+gnUlOurFGTekMkG4VcG7G4iNtR6Ng1A48aimPDZzODyuCrhdfk2k1a uiWMZeTvmP/PjO3cc0ah7F8u5YVmOwgN2XTpK3oT0uROpPnMn3nJTa+aUOEViA== 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 2DE0613301; Thu, 12 May 2022 18:03:06 +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 24CI36kE028023; Thu, 12 May 2022 18:03:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24CI36ug028022; Thu, 12 May 2022 18:03:06 GMT (envelope-from git) Date: Thu, 12 May 2022 18:03:06 GMT Message-Id: <202205121803.24CI36ug028022@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: 2e4e5ee23ffb - main - sockets: delete stale comment from sofree() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 2e4e5ee23ffb6d159140d740499f17530e696865 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652378587; 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=2rTzhkoJcVzU9s5LVAwNvTm4cMasPEgqouoVL7B92a4=; b=G4fBT1CC+u5Kk64NI6/BDJnW1Vl/T+bOjjTO6f1AVs4TN6baRO18/0nSsybmbuE284737P 9fLJwWtlEA1/Y1QLW2sNv8J6b8BYWa+Y9fbDfqp6dMHaetaG2eXsS5tEY4WWCj5rLLYhYF LR7TniirZLAQjeBR7VdRpN6kIG8Pt5VJm0KCGQI90FvbBw3UHvVdE8xdHwL8vdi0ZfLPV+ GAPiBJJQqAOhKG2IJR6TUDYcw7wbobnJ2cnTkyvxKIFVnQTHxTre4vBHBmvT4uBlLjaDfO PoHJJktkzmVWATIK0TYFCuAd+VrHE3mgV0MlEAkkGrfTTiFnAnTtygR9EQeukQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652378587; a=rsa-sha256; cv=none; b=dL0jBkA3/dgJHAqEEXNlc9mBiRgIg3FX6/znAebf1snEau+iT86atqkp0ksRjXbcK6v111 yv9wvfx5noJLE+L4Kg2PqdJnfd/sbKv8nYyMEk5HA5MtG6hHZNmKnEdiFzJpgtThBDBnup YAwK2I9MO+/0HVPeMAeE/IgmE4Thw18ic4ZDbd/f8iotRnF5ibptONi42aRFRAl/Orrq/C rRa3PFD+nv6bObvYarfD3FKZTQbuxIoWIghkWGBYXJfi1HfxwRaFgJ09tqZ9LvHgSt/4/e 4CQqVPSpfTCfYcjiDLwL/A+UgTQU/J6/nKrXJLUnERaQBHqAtPLui68mOQKgpg== 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=2e4e5ee23ffb6d159140d740499f17530e696865 commit 2e4e5ee23ffb6d159140d740499f17530e696865 Author: Gleb Smirnoff AuthorDate: 2022-05-12 18:02:50 +0000 Commit: Gleb Smirnoff CommitDate: 2022-05-12 18:02:50 +0000 sockets: delete stale comment from sofree() First paragraph refers to old past "we used to" and is no longer important today. Second paragraph has just a wrong statement that socket buffer is destroyed before pru_detach. --- sys/kern/uipc_socket.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index 2989d53c223e..628730171715 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -1206,15 +1206,6 @@ sofree(struct socket *so) * From this point on, we assume that no other references to this * socket exist anywhere else in the stack. Therefore, no locks need * to be acquired or held. - * - * We used to do a lot of socket buffer and socket locking here, as - * well as invoke sorflush() and perform wakeups. The direct call to - * dom_dispose() and sbdestroy() are an inlining of what was - * necessary from sorflush(). - * - * Notice that the socket buffer and kqueue state are torn down - * before calling pru_detach. This means that protocols shold not - * assume they can perform socket wakeups, etc, in their detach code. */ if (!SOLISTENING(so)) { sbdestroy(&so->so_snd, so);