From owner-svn-src-head@FreeBSD.ORG Sun Jul 18 20:57:54 2010 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8DC261065672; Sun, 18 Jul 2010 20:57:54 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 7B04E8FC0A; Sun, 18 Jul 2010 20:57:54 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o6IKvsFG059975; Sun, 18 Jul 2010 20:57:54 GMT (envelope-from trasz@svn.freebsd.org) Received: (from trasz@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o6IKvsJ4059925; Sun, 18 Jul 2010 20:57:54 GMT (envelope-from trasz@svn.freebsd.org) Message-Id: <201007182057.o6IKvsJ4059925@svn.freebsd.org> From: Edward Tomasz Napierala Date: Sun, 18 Jul 2010 20:57:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r210226 - in head/sys: kern sys X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Jul 2010 20:57:54 -0000 Author: trasz Date: Sun Jul 18 20:57:53 2010 New Revision: 210226 URL: http://svn.freebsd.org/changeset/base/210226 Log: Revert r210225 - turns out I was wrong; the "/*-" is not license-only thing; it's also used to indicate that the comment should not be automatically rewrapped. Explained by: cperciva@ Modified: head/sys/kern/init_main.c head/sys/kern/kern_prot.c head/sys/kern/kern_resource.c head/sys/kern/kern_tc.c head/sys/kern/subr_disk.c head/sys/kern/subr_prof.c head/sys/kern/uipc_mbuf.c head/sys/kern/uipc_usrreq.c head/sys/kern/vfs_extattr.c head/sys/sys/cdefs.h head/sys/sys/disk.h head/sys/sys/kthread.h head/sys/sys/mbuf.h head/sys/sys/proc.h head/sys/sys/resourcevar.h head/sys/sys/signal.h head/sys/sys/socketvar.h head/sys/sys/time.h head/sys/sys/timetc.h head/sys/sys/types.h Modified: head/sys/kern/init_main.c ============================================================================== --- head/sys/kern/init_main.c Sun Jul 18 20:23:10 2010 (r210225) +++ head/sys/kern/init_main.c Sun Jul 18 20:57:53 2010 (r210226) @@ -539,7 +539,7 @@ proc0_init(void *dummy __unused) vm_map_init(&vmspace0.vm_map, vmspace_pmap(&vmspace0), p->p_sysent->sv_minuser, p->p_sysent->sv_maxuser); - /* + /*- * call the init and ctor for the new thread and proc * we wait to do this until all other structures * are fairly sane. Modified: head/sys/kern/kern_prot.c ============================================================================== --- head/sys/kern/kern_prot.c Sun Jul 18 20:23:10 2010 (r210225) +++ head/sys/kern/kern_prot.c Sun Jul 18 20:57:53 2010 (r210226) @@ -1316,7 +1316,7 @@ SYSCTL_INT(_security_bsd, OID_AUTO, see_ &see_other_uids, 0, "Unprivileged processes may see subjects/objects with different real uid"); -/* +/*- * Determine if u1 "can see" the subject specified by u2, according to the * 'see_other_uids' policy. * Returns: 0 for permitted, ESRCH otherwise @@ -1375,7 +1375,7 @@ cr_seeothergids(struct ucred *u1, struct return (0); } -/* +/*- * Determine if u1 "can see" the subject specified by u2. * Returns: 0 for permitted, an errno value otherwise * Locks: none @@ -1400,7 +1400,7 @@ cr_cansee(struct ucred *u1, struct ucred return (0); } -/* +/*- * Determine if td "can see" the subject specified by p. * Returns: 0 for permitted, an errno value otherwise * Locks: Sufficient locks to protect p->p_ucred must be held. td really @@ -1431,7 +1431,7 @@ static int conservative_signals = 1; SYSCTL_INT(_security_bsd, OID_AUTO, conservative_signals, CTLFLAG_RW, &conservative_signals, 0, "Unprivileged processes prevented from " "sending certain signals to processes whose credentials have changed"); -/* +/*- * Determine whether cred may deliver the specified signal to proc. * Returns: 0 for permitted, an errno value otherwise. * Locks: A lock must be held for proc. @@ -1507,7 +1507,7 @@ cr_cansignal(struct ucred *cred, struct return (0); } -/* +/*- * Determine whether td may deliver the specified signal to p. * Returns: 0 for permitted, an errno value otherwise * Locks: Sufficient locks to protect various components of td and p @@ -1548,7 +1548,7 @@ p_cansignal(struct thread *td, struct pr return (cr_cansignal(td->td_ucred, p, signum)); } -/* +/*- * Determine whether td may reschedule p. * Returns: 0 for permitted, an errno value otherwise * Locks: Sufficient locks to protect various components of td and p @@ -1600,7 +1600,7 @@ SYSCTL_INT(_security_bsd, OID_AUTO, unpr &unprivileged_proc_debug, 0, "Unprivileged processes may use process debugging facilities"); -/* +/*- * Determine whether td may debug p. * Returns: 0 for permitted, an errno value otherwise * Locks: Sufficient locks to protect various components of td and p @@ -1698,7 +1698,7 @@ p_candebug(struct thread *td, struct pro return (0); } -/* +/*- * Determine whether the subject represented by cred can "see" a socket. * Returns: 0 for permitted, ENOENT otherwise. */ @@ -1724,7 +1724,7 @@ cr_canseesocket(struct ucred *cred, stru } #if defined(INET) || defined(INET6) -/* +/*- * Determine whether the subject represented by cred can "see" a socket. * Returns: 0 for permitted, ENOENT otherwise. */ @@ -1751,7 +1751,7 @@ cr_canseeinpcb(struct ucred *cred, struc } #endif -/* +/*- * Determine whether td can wait for the exit of p. * Returns: 0 for permitted, an errno value otherwise * Locks: Sufficient locks to protect various components of td and p @@ -2112,7 +2112,7 @@ setsugid(struct proc *p) p->p_stops = 0; } -/* +/*- * Change a process's effective uid. * Side effects: newcred->cr_uid and newcred->cr_uidinfo will be modified. * References: newcred must be an exclusive credential reference for the @@ -2128,7 +2128,7 @@ change_euid(struct ucred *newcred, struc newcred->cr_uidinfo = euip; } -/* +/*- * Change a process's effective gid. * Side effects: newcred->cr_gid will be modified. * References: newcred must be an exclusive credential reference for the @@ -2141,7 +2141,7 @@ change_egid(struct ucred *newcred, gid_t newcred->cr_groups[0] = egid; } -/* +/*- * Change a process's real uid. * Side effects: newcred->cr_ruid will be updated, newcred->cr_ruidinfo * will be updated, and the old and new cr_ruidinfo proc @@ -2161,7 +2161,7 @@ change_ruid(struct ucred *newcred, struc (void)chgproccnt(newcred->cr_ruidinfo, 1, 0); } -/* +/*- * Change a process's real gid. * Side effects: newcred->cr_rgid will be updated. * References: newcred must be an exclusive credential reference for the @@ -2174,7 +2174,7 @@ change_rgid(struct ucred *newcred, gid_t newcred->cr_rgid = rgid; } -/* +/*- * Change a process's saved uid. * Side effects: newcred->cr_svuid will be updated. * References: newcred must be an exclusive credential reference for the @@ -2187,7 +2187,7 @@ change_svuid(struct ucred *newcred, uid_ newcred->cr_svuid = svuid; } -/* +/*- * Change a process's saved gid. * Side effects: newcred->cr_svgid will be updated. * References: newcred must be an exclusive credential reference for the Modified: head/sys/kern/kern_resource.c ============================================================================== --- head/sys/kern/kern_resource.c Sun Jul 18 20:23:10 2010 (r210225) +++ head/sys/kern/kern_resource.c Sun Jul 18 20:57:53 2010 (r210226) @@ -1247,7 +1247,7 @@ uihold(uip) refcount_acquire(&uip->ui_ref); } -/* +/*- * Since uidinfo structs have a long lifetime, we use an * opportunistic refcounting scheme to avoid locking the lookup hash * for each release. Modified: head/sys/kern/kern_tc.c ============================================================================== --- head/sys/kern/kern_tc.c Sun Jul 18 20:23:10 2010 (r210225) +++ head/sys/kern/kern_tc.c Sun Jul 18 20:57:53 2010 (r210226) @@ -484,7 +484,7 @@ tc_windup(void) th->th_offset_count = ncount; } - /* + /*- * Recalculate the scaling factor. We want the number of 1/2^64 * fractions of a second per period of the hardware counter, taking * into account the th_adjustment factor which the NTP PLL/adjtime(2) Modified: head/sys/kern/subr_disk.c ============================================================================== --- head/sys/kern/subr_disk.c Sun Jul 18 20:23:10 2010 (r210225) +++ head/sys/kern/subr_disk.c Sun Jul 18 20:57:53 2010 (r210226) @@ -23,7 +23,7 @@ __FBSDID("$FreeBSD$"); #include #include -/* +/*- * Disk error is the preface to plaintive error messages * about failing disk transfers. It prints messages of the form * "hp0g: BLABLABLA cmd=read fsbn 12345 of 12344-12347" Modified: head/sys/kern/subr_prof.c ============================================================================== --- head/sys/kern/subr_prof.c Sun Jul 18 20:23:10 2010 (r210225) +++ head/sys/kern/subr_prof.c Sun Jul 18 20:57:53 2010 (r210226) @@ -254,7 +254,7 @@ kmstartup(dummy) mcount_overhead -= empty_loop_time; mexitcount_overhead -= empty_loop_time; - /* + /*- * Profiling overheads are determined by the times between the * following events: * MC1: mcount() is called Modified: head/sys/kern/uipc_mbuf.c ============================================================================== --- head/sys/kern/uipc_mbuf.c Sun Jul 18 20:23:10 2010 (r210225) +++ head/sys/kern/uipc_mbuf.c Sun Jul 18 20:57:53 2010 (r210226) @@ -161,7 +161,7 @@ m_freem(struct mbuf *mb) mb = m_free(mb); } -/* +/*- * Configure a provided mbuf to refer to the provided external storage * buffer and setup a reference count for said buffer. If the setting * up of the reference count fails, the M_EXT bit will not be set. If Modified: head/sys/kern/uipc_usrreq.c ============================================================================== --- head/sys/kern/uipc_usrreq.c Sun Jul 18 20:23:10 2010 (r210225) +++ head/sys/kern/uipc_usrreq.c Sun Jul 18 20:57:53 2010 (r210226) @@ -165,7 +165,7 @@ SYSCTL_ULONG(_net_local_seqpacket, OID_A SYSCTL_INT(_net_local, OID_AUTO, inflight, CTLFLAG_RD, &unp_rights, 0, "File descriptors in flight."); -/* +/*- * Locking and synchronization: * * Three types of locks exit in the local domain socket implementation: a Modified: head/sys/kern/vfs_extattr.c ============================================================================== --- head/sys/kern/vfs_extattr.c Sun Jul 18 20:23:10 2010 (r210225) +++ head/sys/kern/vfs_extattr.c Sun Jul 18 20:57:53 2010 (r210226) @@ -149,7 +149,7 @@ out: return (error); } -/* +/*- * Set a named extended attribute on a file or directory * * Arguments: unlocked vnode "vp", attribute namespace "attrnamespace", @@ -317,7 +317,7 @@ extattr_set_link(td, uap) return (error); } -/* +/*- * Get a named extended attribute on a file or directory * * Arguments: unlocked vnode "vp", attribute namespace "attrnamespace", @@ -638,7 +638,7 @@ extattr_delete_link(td, uap) return(error); } -/* +/*- * Retrieve a list of extended attributes on a file or directory. * * Arguments: unlocked vnode "vp", attribute namespace 'attrnamespace", Modified: head/sys/sys/cdefs.h ============================================================================== --- head/sys/sys/cdefs.h Sun Jul 18 20:23:10 2010 (r210225) +++ head/sys/sys/cdefs.h Sun Jul 18 20:57:53 2010 (r210226) @@ -463,7 +463,7 @@ #define __DEQUALIFY(type, var) ((type)(uintptr_t)(const volatile void *)(var)) #endif -/* +/*- * The following definitions are an extension of the behavior originally * implemented in , but with a different level of granularity. * POSIX.1 requires that the macros we test be defined before any standard @@ -546,7 +546,7 @@ #define __ISO_C_VISIBLE 0 #endif /* _POSIX_C_SOURCE */ #else -/* +/*- * Deal with _ANSI_SOURCE: * If it is defined, and no other compilation environment is explicitly * requested, then define our internal feature-test macros to zero. This Modified: head/sys/sys/disk.h ============================================================================== --- head/sys/sys/disk.h Sun Jul 18 20:23:10 2010 (r210225) +++ head/sys/sys/disk.h Sun Jul 18 20:57:53 2010 (r210226) @@ -26,40 +26,40 @@ void disk_err(struct bio *bp, const char #endif #define DIOCGSECTORSIZE _IOR('d', 128, u_int) - /* + /*- * Get the sectorsize of the device in bytes. The sectorsize is the * smallest unit of data which can be transfered from this device. * Usually this is a power of two but it may not be. (ie: CDROM audio) */ #define DIOCGMEDIASIZE _IOR('d', 129, off_t) /* Get media size in bytes */ - /* + /*- * Get the size of the entire device in bytes. This should be a * multiple of the sectorsize. */ #define DIOCGFWSECTORS _IOR('d', 130, u_int) /* Get firmware sectorcount */ - /* + /*- * Get the firmwares notion of number of sectors per track. This * value is mostly used for compatibility with various ill designed * disk label formats. Don't use it unless you have to. */ #define DIOCGFWHEADS _IOR('d', 131, u_int) /* Get firmware headcount */ - /* + /*- * Get the firmwares notion of number of heads per cylinder. This * value is mostly used for compatibility with various ill designed * disk label formats. Don't use it unless you have to. */ #define DIOCSKERNELDUMP _IOW('d', 133, u_int) /* Set/Clear kernel dumps */ - /* + /*- * Enable/Disable (the argument is boolean) the device for kernel * core dumps. */ #define DIOCGFRONTSTUFF _IOR('d', 134, off_t) - /* + /*- * Many disk formats have some amount of space reserved at the * start of the disk to hold bootblocks, various disklabels and * similar stuff. This ioctl returns the number of such bytes @@ -67,18 +67,18 @@ void disk_err(struct bio *bp, const char */ #define DIOCGFLUSH _IO('d', 135) /* Flush write cache */ - /* + /*- * Flush write cache of the device. */ #define DIOCGDELETE _IOW('d', 136, off_t[2]) /* Delete data */ - /* + /*- * Mark data on the device as unused. */ #define DISK_IDENT_SIZE 256 #define DIOCGIDENT _IOR('d', 137, char[DISK_IDENT_SIZE]) - /* + /*- * Get the ident of the given provider. Ident is (most of the time) * a uniqe and fixed provider's identifier. Ident's properties are as * follow: @@ -99,19 +99,19 @@ void disk_err(struct bio *bp, const char */ #define DIOCGPROVIDERNAME _IOR('d', 138, char[MAXPATHLEN]) - /* + /*- * Store the provider name, given a device path, in a buffer. The buffer * must be at least MAXPATHLEN bytes long. */ #define DIOCGSTRIPESIZE _IOR('d', 139, off_t) /* Get stripe size in bytes */ - /* + /*- * Get the size of the device's optimal access block in bytes. * This should be a multiple of the sectorsize. */ #define DIOCGSTRIPEOFFSET _IOR('d', 140, off_t) /* Get stripe offset in bytes */ - /* + /*- * Get the offset of the first device's optimal access block in bytes. * This should be a multiple of the sectorsize. */ Modified: head/sys/sys/kthread.h ============================================================================== --- head/sys/sys/kthread.h Sun Jul 18 20:23:10 2010 (r210225) +++ head/sys/sys/kthread.h Sun Jul 18 20:57:53 2010 (r210226) @@ -31,7 +31,7 @@ #include -/* +/*- * A kernel process descriptor; used to start "internal" daemons. * * Note: global_procpp may be NULL for no global save area. Modified: head/sys/sys/mbuf.h ============================================================================== --- head/sys/sys/mbuf.h Sun Jul 18 20:23:10 2010 (r210225) +++ head/sys/sys/mbuf.h Sun Jul 18 20:57:53 2010 (r210226) @@ -59,7 +59,7 @@ #define M_MAXCOMPRESS (MHLEN / 2) /* max amount to copy for compression */ #ifdef _KERNEL -/* +/*- * Macro for type conversion: convert mbuf pointer to data pointer of correct * type: * @@ -827,7 +827,7 @@ struct mbuf *m_split(struct mbuf *, int, struct mbuf *m_uiotombuf(struct uio *, int, int, int, int); struct mbuf *m_unshare(struct mbuf *, int how); -/* +/*- * Network packets may have annotations attached by affixing a list of * "packet tags" to the pkthdr structure. Packet tags are dynamically * allocated semi-opaque data structures that have a fixed header Modified: head/sys/sys/proc.h ============================================================================== --- head/sys/sys/proc.h Sun Jul 18 20:23:10 2010 (r210225) +++ head/sys/sys/proc.h Sun Jul 18 20:57:53 2010 (r210226) @@ -112,7 +112,7 @@ struct pargs { u_char ar_args[1]; /* Arguments. */ }; -/* +/*- * Description of a process. * * This structure contains the information needed to manage a thread of Modified: head/sys/sys/resourcevar.h ============================================================================== --- head/sys/sys/resourcevar.h Sun Jul 18 20:23:10 2010 (r210225) +++ head/sys/sys/resourcevar.h Sun Jul 18 20:57:53 2010 (r210226) @@ -79,7 +79,7 @@ struct plimit { int pl_refcnt; /* number of references */ }; -/* +/*- * Per uid resource consumption. This structure is used to track * the total resource consumption (process count, socket buffer size, * etc) for the uid and impose limits. Modified: head/sys/sys/signal.h ============================================================================== --- head/sys/sys/signal.h Sun Jul 18 20:23:10 2010 (r210225) +++ head/sys/sys/signal.h Sun Jul 18 20:57:53 2010 (r210226) @@ -122,7 +122,7 @@ /* #define SIG_CATCH ((__sighandler_t *)2) See signalvar.h */ #define SIG_HOLD ((__sighandler_t *)3) -/* +/*- * Type of a signal handling function. * * Language spec sez signal handlers take exactly one arg, even though we Modified: head/sys/sys/socketvar.h ============================================================================== --- head/sys/sys/socketvar.h Sun Jul 18 20:23:10 2010 (r210225) +++ head/sys/sys/socketvar.h Sun Jul 18 20:57:53 2010 (r210226) @@ -57,7 +57,7 @@ typedef u_quad_t so_gen_t; struct socket; -/* +/*- * Locking key to struct socket: * (a) constant after allocation, no locking required. * (b) locked by SOCK_LOCK(so). Modified: head/sys/sys/time.h ============================================================================== --- head/sys/sys/time.h Sun Jul 18 20:23:10 2010 (r210225) +++ head/sys/sys/time.h Sun Jul 18 20:57:53 2010 (r210226) @@ -90,7 +90,7 @@ bintime_sub(struct bintime *bt, const st bt->sec -= bt2->sec; } -/* +/*- * Background information: * * When converting between timestamps on parallel timescales of differing Modified: head/sys/sys/timetc.h ============================================================================== --- head/sys/sys/timetc.h Sun Jul 18 20:23:10 2010 (r210225) +++ head/sys/sys/timetc.h Sun Jul 18 20:57:53 2010 (r210226) @@ -16,7 +16,7 @@ #error "no user-serviceable parts inside" #endif -/* +/*- * `struct timecounter' is the interface between the hardware which implements * a timecounter and the MI code which uses this to keep track of time. * Modified: head/sys/sys/types.h ============================================================================== --- head/sys/sys/types.h Sun Jul 18 20:23:10 2010 (r210225) +++ head/sys/sys/types.h Sun Jul 18 20:57:53 2010 (r210226) @@ -287,7 +287,7 @@ typedef int boolean_t; typedef struct device *device_t; typedef __intfptr_t intfptr_t; -/* +/*- * XXX this is fixed width for historical reasons. It should have had type * __int_fast32_t. Fixed-width types should not be used unless binary * compatibility is essential. Least-width types should be used even less