svn commit: r319503 - in head/sys: kern sys

[Gleb Smirnoff]

Author: glebius
Date: Fri Jun  2 17:39:05 2017
New Revision: 319503
URL: https://svnweb.freebsd.org/changeset/base/319503

Log:
  Remove write only flag UNP_HAVEPCCACHED.

Modified:
  head/sys/kern/uipc_usrreq.c
  head/sys/sys/unpcb.h

Modified: head/sys/kern/uipc_usrreq.c
==============================================================================
--- head/sys/kern/uipc_usrreq.c	Fri Jun  2 17:31:25 2017	(r319502)
+++ head/sys/kern/uipc_usrreq.c	Fri Jun  2 17:39:05 2017	(r319503)
@@ -758,7 +758,6 @@ uipc_listen(struct socket *so, int backlog, struct thr
 	error = solisten_proto_check(so);
 	if (error == 0) {
 		cru2x(td->td_ucred, &unp->unp_peercred);
-		unp->unp_flags |= UNP_HAVEPCCACHED;
 		solisten_proto(so, backlog);
 	}
 	SOCK_UNLOCK(so);
@@ -1429,8 +1428,6 @@ unp_connectat(int fd, struct socket *so, struct sockad
 		 * listen(); uipc_listen() cached that process's credentials
 		 * at that time so we can use them now.
 		 */
-		KASSERT(unp2->unp_flags & UNP_HAVEPCCACHED,
-		    ("unp_connect: listener without cached peercred"));
 		memcpy(&unp->unp_peercred, &unp2->unp_peercred,
 		    sizeof(unp->unp_peercred));
 		unp->unp_flags |= UNP_HAVEPC;
@@ -2495,10 +2492,6 @@ db_print_unpflags(int unp_flags)
 	comma = 0;
 	if (unp_flags & UNP_HAVEPC) {
 		db_printf("%sUNP_HAVEPC", comma ? ", " : "");
-		comma = 1;
-	}
-	if (unp_flags & UNP_HAVEPCCACHED) {
-		db_printf("%sUNP_HAVEPCCACHED", comma ? ", " : "");
 		comma = 1;
 	}
 	if (unp_flags & UNP_WANTCRED) {

Modified: head/sys/sys/unpcb.h
==============================================================================
--- head/sys/sys/unpcb.h	Fri Jun  2 17:31:25 2017	(r319502)
+++ head/sys/sys/unpcb.h	Fri Jun  2 17:39:05 2017	(r319503)
@@ -92,14 +92,8 @@ struct unpcb {
  * and is really the credentials of the connected peer.  This is used
  * to determine whether the contents should be sent to the user or
  * not.
- *
- * UNP_HAVEPCCACHED - indicates that the unp_peercred member is filled
- * in, but does *not* contain the credentials of the connected peer
- * (there may not even be a peer).  This is set in unp_listen() when
- * it fills in unp_peercred for later consumption by unp_connect().
  */
 #define UNP_HAVEPC			0x001
-#define UNP_HAVEPCCACHED		0x002
 #define	UNP_WANTCRED			0x004	/* credentials wanted */
 #define	UNP_CONNWAIT			0x008	/* connect blocks until accepted */