From owner-svn-src-stable-7@FreeBSD.ORG Fri Oct 10 11:40:00 2008 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 31B8B1065694; Fri, 10 Oct 2008 11:40:00 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 1AE718FC18; Fri, 10 Oct 2008 11:40:00 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id m9ABdxlk090805; Fri, 10 Oct 2008 11:39:59 GMT (envelope-from rwatson@svn.freebsd.org) Received: (from rwatson@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id m9ABdxfw090804; Fri, 10 Oct 2008 11:39:59 GMT (envelope-from rwatson@svn.freebsd.org) Message-Id: <200810101139.m9ABdxfw090804@svn.freebsd.org> From: Robert Watson Date: Fri, 10 Oct 2008 11:39:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r183743 - in stable/7/sys: . kern X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Oct 2008 11:40:00 -0000 Author: rwatson Date: Fri Oct 10 11:39:59 2008 New Revision: 183743 URL: http://svn.freebsd.org/changeset/base/183743 Log: Merge r183563 from head to stable/7: Remove or update several stale comments. A bit of whitespace/style cleanup. Approved by: re (kensmith) Modified: stable/7/sys/ (props changed) stable/7/sys/kern/uipc_usrreq.c Modified: stable/7/sys/kern/uipc_usrreq.c ============================================================================== --- stable/7/sys/kern/uipc_usrreq.c Fri Oct 10 07:16:44 2008 (r183742) +++ stable/7/sys/kern/uipc_usrreq.c Fri Oct 10 11:39:59 2008 (r183743) @@ -575,8 +575,8 @@ uipc_detach(struct socket *so) } /* - * We hold the global lock, so it's OK to acquire multiple pcb locks - * at a time. + * We hold the global lock exclusively, so it's OK to acquire + * multiple pcb locks at a time. */ while (!LIST_EMPTY(&unp->unp_refs)) { struct unpcb *ref = LIST_FIRST(&unp->unp_refs); @@ -741,8 +741,6 @@ uipc_rcvd(struct socket *so, int flags) return (0); } -/* pru_rcvoob is EOPNOTSUPP */ - static int uipc_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *nam, struct mbuf *control, struct thread *td) @@ -760,15 +758,12 @@ uipc_send(struct socket *so, int flags, error = EOPNOTSUPP; goto release; } - if (control != NULL && (error = unp_internalize(&control, td))) goto release; - if ((nam != NULL) || (flags & PRUS_EOF)) UNP_GLOBAL_WLOCK(); else UNP_GLOBAL_RLOCK(); - switch (so->so_type) { case SOCK_DGRAM: { @@ -786,6 +781,7 @@ uipc_send(struct socket *so, int flags, break; unp2 = unp->unp_conn; } + /* * Because connect() and send() are non-atomic in a sendto() * with a target address, it's possible that the socket will @@ -826,12 +822,6 @@ uipc_send(struct socket *so, int flags, } case SOCK_STREAM: - /* - * Connect if not connected yet. - * - * Note: A better implementation would complain if not equal - * to the peer's address. - */ if ((so->so_state & SS_ISCONNECTED) == 0) { if (nam != NULL) { UNP_GLOBAL_WLOCK_ASSERT(); @@ -849,6 +839,7 @@ uipc_send(struct socket *so, int flags, error = EPIPE; break; } + /* * Because connect() and send() are non-atomic in a sendto() * with a target address, it's possible that the socket will @@ -907,7 +898,7 @@ uipc_send(struct socket *so, int flags, } /* - * SEND_EOF is equivalent to a SEND followed by a SHUTDOWN. + * PRUS_EOF is equivalent to pru_send followed by pru_shutdown. */ if (flags & PRUS_EOF) { UNP_PCB_LOCK(unp); @@ -1256,7 +1247,7 @@ bad2: if (vfslocked) /* * Giant has been previously acquired. This means filesystem - * isn't MPSAFE. Do it once again. + * isn't MPSAFE. Do it once again. */ mtx_lock(&Giant); bad: @@ -1576,6 +1567,7 @@ unp_externalize(struct mbuf *control, st unp_freerights(rp, newfds); goto next; } + /* * Now change each pointer to an fd in the global * table to an integer that is the index to the local @@ -1888,6 +1880,7 @@ unp_gc(__unused void *arg, int pending) unp_taskcount++; unp_defer = 0; + /* * Before going through all this, set all FDs to be NOT deferred and * NOT externally accessible. @@ -1913,6 +1906,7 @@ unp_gc(__unused void *arg, int pending) FILE_UNLOCK(fp); continue; } + /* * If we already marked it as 'defer' in a * previous pass, then try to process it this @@ -1930,6 +1924,7 @@ unp_gc(__unused void *arg, int pending) FILE_UNLOCK(fp); continue; } + /* * If all references are from messages in * transit, then skip it. it's not externally @@ -1939,12 +1934,14 @@ unp_gc(__unused void *arg, int pending) FILE_UNLOCK(fp); continue; } + /* * If it got this far then it must be * externally accessible. */ fp->f_gcflag |= FMARK; } + /* * Either it was deferred, or it is externally * accessible and not already marked so. Now check @@ -1955,6 +1952,7 @@ unp_gc(__unused void *arg, int pending) FILE_UNLOCK(fp); continue; } + if (so->so_proto->pr_domain != &localdomain || (so->so_proto->pr_flags & PR_RIGHTS) == 0) { FILE_UNLOCK(fp); @@ -1990,6 +1988,7 @@ unp_gc(__unused void *arg, int pending) } } while (unp_defer); sx_sunlock(&filelist_lock); + /* * XXXRW: The following comments need updating for a post-SMPng and * deferred unp_gc() world, but are still generally accurate. @@ -2047,6 +2046,7 @@ again: fp != NULL; fp = nextfp) { nextfp = LIST_NEXT(fp, f_list); FILE_LOCK(fp); + /* * If it's not open, skip it */ @@ -2054,6 +2054,7 @@ again: FILE_UNLOCK(fp); continue; } + /* * If all refs are from msgs, and it's not marked accessible * then it must be referenced from some unreachable cycle of @@ -2068,6 +2069,7 @@ again: FILE_UNLOCK(fp); } sx_sunlock(&filelist_lock); + /* * For each FD on our hit list, do the following two things: */