From owner-svn-src-stable@freebsd.org Thu Apr 30 05:28:49 2020 Return-Path: Delivered-To: svn-src-stable@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 943602B0CCB; Thu, 30 Apr 2020 05:28:49 +0000 (UTC) (envelope-from delphij@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49CP7P2Vpxz4JWw; Thu, 30 Apr 2020 05:28:49 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 50F6C19E1D; Thu, 30 Apr 2020 05:28:49 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 03U5Sn78007277; Thu, 30 Apr 2020 05:28:49 GMT (envelope-from delphij@FreeBSD.org) Received: (from delphij@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 03U5Snsp007276; Thu, 30 Apr 2020 05:28:49 GMT (envelope-from delphij@FreeBSD.org) Message-Id: <202004300528.03U5Snsp007276@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: delphij set sender to delphij@FreeBSD.org using -f From: Xin LI Date: Thu, 30 Apr 2020 05:28:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r360489 - stable/12/sys/sys X-SVN-Group: stable-12 X-SVN-Commit-Author: delphij X-SVN-Commit-Paths: stable/12/sys/sys X-SVN-Commit-Revision: 360489 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Apr 2020 05:28:49 -0000 Author: delphij Date: Thu Apr 30 05:28:48 2020 New Revision: 360489 URL: https://svnweb.freebsd.org/changeset/base/360489 Log: Fix build: redo MFC r360059 and revert unwanted portion. Modified: stable/12/sys/sys/socketvar.h Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/sys/socketvar.h ============================================================================== --- stable/12/sys/sys/socketvar.h Thu Apr 30 04:00:53 2020 (r360488) +++ stable/12/sys/sys/socketvar.h Thu Apr 30 05:28:48 2020 (r360489) @@ -173,10 +173,6 @@ struct socket { short sol_sbsnd_flags; sbintime_t sol_sbrcv_timeo; sbintime_t sol_sbsnd_timeo; - - /* Information tracking listen queue overflows. */ - struct timeval sol_lastover; /* (e) */ - int sol_overcount; /* (e) */ }; }; }; @@ -185,13 +181,13 @@ struct socket { /* * Socket state bits. * - * Historically, these bits were all kept in the so_state field. - * They are now split into separate, lock-specific fields. - * so_state maintains basic socket state protected by the socket lock. - * so_qstate holds information about the socket accept queues. - * Each socket buffer also has a state field holding information - * relevant to that socket buffer (can't send, rcv). - * Many fields will be read without locks to improve performance and avoid + * Historically, this bits were all kept in the so_state field. For + * locking reasons, they are now in multiple fields, as they are + * locked differently. so_state maintains basic socket state protected + * by the socket lock. so_qstate holds information about the socket + * accept queues. Each socket buffer also has a state field holding + * information relevant to that socket buffer (can't send, rcv). Many + * fields will be read without locks to improve performance and avoid * lock order issues. However, this approach must be used with caution. */ #define SS_NOFDREF 0x0001 /* no file table ref any more */ @@ -384,8 +380,7 @@ struct uio; /* * From uipc_socket and friends */ -int getsockaddr(struct sockaddr **namp, const struct sockaddr *uaddr, - size_t len); +int getsockaddr(struct sockaddr **namp, caddr_t uaddr, size_t len); int getsock_cap(struct thread *td, int fd, cap_rights_t *rightsp, struct file **fpp, u_int *fflagp, struct filecaps *havecaps); void soabort(struct socket *so);