Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 11 Jan 2008 06:42:25 GMT
From:      Peter Wemm <peter@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 133025 for review
Message-ID:  <200801110642.m0B6gPXY067412@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=133025

Change 133025 by peter@peter_overcee on 2008/01/11 06:41:47

	IFC @133011

Affected files ...

.. //depot/projects/hammer/contrib/cvs/src/parseinfo.c#7 integrate
.. //depot/projects/hammer/contrib/libiberty/cp-demangle.c#1 branch
.. //depot/projects/hammer/contrib/top/top.c#11 integrate
.. //depot/projects/hammer/etc/defaults/periodic.conf#23 integrate
.. //depot/projects/hammer/etc/periodic/daily/460.status-mail-rejects#6 integrate
.. //depot/projects/hammer/games/fortune/datfiles/fortunes#76 integrate
.. //depot/projects/hammer/games/fortune/datfiles/limerick#10 integrate
.. //depot/projects/hammer/include/unistd.h#19 integrate
.. //depot/projects/hammer/lib/libc/gen/Makefile.inc#31 integrate
.. //depot/projects/hammer/lib/libc/gen/feature_present.3#1 branch
.. //depot/projects/hammer/lib/libc/gen/feature_present.c#1 branch
.. //depot/projects/hammer/lib/libc/gen/posixshm.c#2 delete
.. //depot/projects/hammer/lib/libc/gen/shm_open.3#5 delete
.. //depot/projects/hammer/lib/libc/sys/Makefile.inc#30 integrate
.. //depot/projects/hammer/lib/libc/sys/shm_open.2#1 branch
.. //depot/projects/hammer/lib/libthr/thread/thr_sem.c#8 integrate
.. //depot/projects/hammer/lib/msun/src/s_csqrt.c#2 integrate
.. //depot/projects/hammer/lib/msun/src/s_csqrtf.c#2 integrate
.. //depot/projects/hammer/share/man/man4/ipmi.4#6 integrate
.. //depot/projects/hammer/share/man/man4/lagg.4#3 integrate
.. //depot/projects/hammer/share/man/man4/ng_pppoe.4#14 integrate
.. //depot/projects/hammer/share/man/man4/pci.4#10 integrate
.. //depot/projects/hammer/share/man/man4/pcib.4#2 integrate
.. //depot/projects/hammer/share/man/man4/textdump.4#2 integrate
.. //depot/projects/hammer/share/man/man7/bsd.snmpmod.mk.7#3 integrate
.. //depot/projects/hammer/share/man/man9/VOP_LOCK.9#8 integrate
.. //depot/projects/hammer/share/man/man9/lock.9#10 integrate
.. //depot/projects/hammer/share/man/man9/style.9#26 integrate
.. //depot/projects/hammer/share/misc/committers-ports.dot#8 integrate
.. //depot/projects/hammer/share/misc/committers-src.dot#8 integrate
.. //depot/projects/hammer/share/mk/bsd.snmpmod.mk#2 integrate
.. //depot/projects/hammer/share/termcap/termcap.src#16 integrate
.. //depot/projects/hammer/sys/amd64/amd64/pmap.c#171 integrate
.. //depot/projects/hammer/sys/amd64/conf/GENERIC#103 integrate
.. //depot/projects/hammer/sys/amd64/include/ieeefp.h#18 integrate
.. //depot/projects/hammer/sys/amd64/include/pmap.h#65 integrate
.. //depot/projects/hammer/sys/arm/at91/if_ate.c#11 integrate
.. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_proto.h#50 integrate
.. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscall.h#47 integrate
.. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_syscalls.c#47 integrate
.. //depot/projects/hammer/sys/compat/freebsd32/freebsd32_sysent.c#47 integrate
.. //depot/projects/hammer/sys/compat/freebsd32/syscalls.master#52 integrate
.. //depot/projects/hammer/sys/compat/linprocfs/linprocfs.c#40 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_file.c#26 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_getcwd.c#17 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_stats.c#31 integrate
.. //depot/projects/hammer/sys/compat/opensolaris/kern/opensolaris_kobj.c#4 integrate
.. //depot/projects/hammer/sys/compat/opensolaris/kern/opensolaris_vfs.c#5 integrate
.. //depot/projects/hammer/sys/compat/opensolaris/sys/vnode.h#4 integrate
.. //depot/projects/hammer/sys/compat/pecoff/imgact_pecoff.c#17 integrate
.. //depot/projects/hammer/sys/compat/svr4/imgact_svr4.c#10 integrate
.. //depot/projects/hammer/sys/compat/svr4/svr4_fcntl.c#13 integrate
.. //depot/projects/hammer/sys/compat/svr4/svr4_misc.c#30 integrate
.. //depot/projects/hammer/sys/conf/NOTES#136 integrate
.. //depot/projects/hammer/sys/conf/files#171 integrate
.. //depot/projects/hammer/sys/conf/options#121 integrate
.. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/gfs.c#4 integrate
.. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#4 integrate
.. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#3 integrate
.. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#6 integrate
.. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#6 integrate
.. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#5 integrate
.. //depot/projects/hammer/sys/ddb/db_textdump.c#3 integrate
.. //depot/projects/hammer/sys/dev/coretemp/coretemp.c#4 integrate
.. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_t3_cpl.h#5 integrate
.. //depot/projects/hammer/sys/dev/cxgb/cxgb_adapter.h#13 integrate
.. //depot/projects/hammer/sys/dev/cxgb/cxgb_main.c#13 integrate
.. //depot/projects/hammer/sys/dev/cxgb/cxgb_sge.c#14 integrate
.. //depot/projects/hammer/sys/dev/cxgb/sys/cxgb_support.c#3 integrate
.. //depot/projects/hammer/sys/dev/cxgb/sys/mvec.h#7 integrate
.. //depot/projects/hammer/sys/dev/cxgb/sys/uipc_mvec.c#5 integrate
.. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_mod.c#21 integrate
.. //depot/projects/hammer/sys/dev/ichwd/ichwd.c#13 integrate
.. //depot/projects/hammer/sys/dev/ichwd/ichwd.h#7 integrate
.. //depot/projects/hammer/sys/dev/iir/iir.c#17 integrate
.. //depot/projects/hammer/sys/dev/md/md.c#63 integrate
.. //depot/projects/hammer/sys/dev/ppbus/ppbconf.c#5 integrate
.. //depot/projects/hammer/sys/dev/ppbus/ppbconf.h#3 integrate
.. //depot/projects/hammer/sys/dev/streams/streams.c#17 integrate
.. //depot/projects/hammer/sys/dev/usb/ehci.c#30 integrate
.. //depot/projects/hammer/sys/dev/usb/if_rum.c#6 integrate
.. //depot/projects/hammer/sys/dev/usb/if_udav.c#22 integrate
.. //depot/projects/hammer/sys/dev/usb/if_zyd.c#8 integrate
.. //depot/projects/hammer/sys/dev/usb/usbdevs#93 integrate
.. //depot/projects/hammer/sys/fs/cd9660/cd9660_lookup.c#3 integrate
.. //depot/projects/hammer/sys/fs/cd9660/cd9660_vfsops.c#4 integrate
.. //depot/projects/hammer/sys/fs/coda/coda_vfsops.c#4 integrate
.. //depot/projects/hammer/sys/fs/coda/coda_vnops.c#3 integrate
.. //depot/projects/hammer/sys/fs/devfs/devfs_devs.c#19 integrate
.. //depot/projects/hammer/sys/fs/devfs/devfs_vnops.c#55 integrate
.. //depot/projects/hammer/sys/fs/fdescfs/fdesc_vfsops.c#18 integrate
.. //depot/projects/hammer/sys/fs/fdescfs/fdesc_vnops.c#20 integrate
.. //depot/projects/hammer/sys/fs/fifofs/fifo_vnops.c#41 integrate
.. //depot/projects/hammer/sys/fs/hpfs/hpfs_subr.h#3 integrate
.. //depot/projects/hammer/sys/fs/hpfs/hpfs_vfsops.c#25 integrate
.. //depot/projects/hammer/sys/fs/hpfs/hpfs_vnops.c#24 integrate
.. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_lookup.c#14 integrate
.. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_vfsops.c#49 integrate
.. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_vnops.c#34 integrate
.. //depot/projects/hammer/sys/fs/ntfs/ntfs_subr.c#16 integrate
.. //depot/projects/hammer/sys/fs/ntfs/ntfs_vfsops.c#34 integrate
.. //depot/projects/hammer/sys/fs/ntfs/ntfs_vnops.c#22 integrate
.. //depot/projects/hammer/sys/fs/nullfs/null_subr.c#18 integrate
.. //depot/projects/hammer/sys/fs/nullfs/null_vfsops.c#26 integrate
.. //depot/projects/hammer/sys/fs/nwfs/nwfs_node.c#16 integrate
.. //depot/projects/hammer/sys/fs/nwfs/nwfs_vnops.c#16 integrate
.. //depot/projects/hammer/sys/fs/portalfs/portal_vfsops.c#18 integrate
.. //depot/projects/hammer/sys/fs/portalfs/portal_vnops.c#16 integrate
.. //depot/projects/hammer/sys/fs/procfs/procfs.c#10 integrate
.. //depot/projects/hammer/sys/fs/procfs/procfs_map.c#12 integrate
.. //depot/projects/hammer/sys/fs/pseudofs/pseudofs_vncache.c#17 integrate
.. //depot/projects/hammer/sys/fs/pseudofs/pseudofs_vnops.c#26 integrate
.. //depot/projects/hammer/sys/fs/smbfs/smbfs_io.c#20 integrate
.. //depot/projects/hammer/sys/fs/smbfs/smbfs_node.c#23 integrate
.. //depot/projects/hammer/sys/fs/smbfs/smbfs_vnops.c#29 integrate
.. //depot/projects/hammer/sys/fs/tmpfs/tmpfs_subr.c#8 integrate
.. //depot/projects/hammer/sys/fs/tmpfs/tmpfs_vfsops.c#11 integrate
.. //depot/projects/hammer/sys/fs/tmpfs/tmpfs_vnops.c#8 integrate
.. //depot/projects/hammer/sys/fs/udf/udf_vnops.c#38 integrate
.. //depot/projects/hammer/sys/fs/unionfs/union_subr.c#26 integrate
.. //depot/projects/hammer/sys/fs/unionfs/union_vfsops.c#23 integrate
.. //depot/projects/hammer/sys/fs/unionfs/union_vnops.c#34 integrate
.. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_lookup.c#5 integrate
.. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_vfsops.c#15 integrate
.. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_vnops.c#9 integrate
.. //depot/projects/hammer/sys/gnu/fs/ext2fs/fs.h#3 integrate
.. //depot/projects/hammer/sys/gnu/fs/reiserfs/reiserfs_namei.c#5 integrate
.. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_freebsd_iget.c#3 integrate
.. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_super.c#4 integrate
.. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.c#3 integrate
.. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#4 integrate
.. //depot/projects/hammer/sys/i386/conf/GENERIC#61 integrate
.. //depot/projects/hammer/sys/i386/i386/pmap.c#106 integrate
.. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_misc.c#19 integrate
.. //depot/projects/hammer/sys/i386/ibcs2/imgact_coff.c#15 integrate
.. //depot/projects/hammer/sys/i386/include/pmap.h#34 integrate
.. //depot/projects/hammer/sys/i386/linux/imgact_linux.c#14 integrate
.. //depot/projects/hammer/sys/ia64/conf/GENERIC#32 integrate
.. //depot/projects/hammer/sys/kern/imgact_aout.c#18 integrate
.. //depot/projects/hammer/sys/kern/imgact_elf.c#45 integrate
.. //depot/projects/hammer/sys/kern/imgact_gzip.c#11 integrate
.. //depot/projects/hammer/sys/kern/init_main.c#52 integrate
.. //depot/projects/hammer/sys/kern/init_sysent.c#63 integrate
.. //depot/projects/hammer/sys/kern/kern_alq.c#17 integrate
.. //depot/projects/hammer/sys/kern/kern_descrip.c#73 integrate
.. //depot/projects/hammer/sys/kern/kern_event.c#49 integrate
.. //depot/projects/hammer/sys/kern/kern_exec.c#77 integrate
.. //depot/projects/hammer/sys/kern/kern_jail.c#26 integrate
.. //depot/projects/hammer/sys/kern/kern_ktrace.c#35 integrate
.. //depot/projects/hammer/sys/kern/kern_lock.c#34 integrate
.. //depot/projects/hammer/sys/kern/kern_proc.c#65 integrate
.. //depot/projects/hammer/sys/kern/kern_resource.c#38 integrate
.. //depot/projects/hammer/sys/kern/kern_sig.c#85 integrate
.. //depot/projects/hammer/sys/kern/kern_synch.c#64 integrate
.. //depot/projects/hammer/sys/kern/subr_lock.c#11 integrate
.. //depot/projects/hammer/sys/kern/sys_generic.c#38 integrate
.. //depot/projects/hammer/sys/kern/sys_pipe.c#39 integrate
.. //depot/projects/hammer/sys/kern/sys_socket.c#22 integrate
.. //depot/projects/hammer/sys/kern/syscalls.c#61 integrate
.. //depot/projects/hammer/sys/kern/syscalls.master#63 integrate
.. //depot/projects/hammer/sys/kern/systrace_args.c#7 integrate
.. //depot/projects/hammer/sys/kern/tty.c#56 integrate
.. //depot/projects/hammer/sys/kern/uipc_mqueue.c#13 integrate
.. //depot/projects/hammer/sys/kern/uipc_sem.c#19 integrate
.. //depot/projects/hammer/sys/kern/uipc_shm.c#1 branch
.. //depot/projects/hammer/sys/kern/uipc_syscalls.c#68 integrate
.. //depot/projects/hammer/sys/kern/uipc_usrreq.c#54 integrate
.. //depot/projects/hammer/sys/kern/vfs_acl.c#3 integrate
.. //depot/projects/hammer/sys/kern/vfs_aio.c#53 integrate
.. //depot/projects/hammer/sys/kern/vfs_bio.c#82 integrate
.. //depot/projects/hammer/sys/kern/vfs_cache.c#25 integrate
.. //depot/projects/hammer/sys/kern/vfs_extattr.c#3 integrate
.. //depot/projects/hammer/sys/kern/vfs_lookup.c#30 integrate
.. //depot/projects/hammer/sys/kern/vfs_mount.c#87 integrate
.. //depot/projects/hammer/sys/kern/vfs_subr.c#121 integrate
.. //depot/projects/hammer/sys/kern/vfs_syscalls.c#76 integrate
.. //depot/projects/hammer/sys/kern/vfs_vnops.c#51 integrate
.. //depot/projects/hammer/sys/netinet6/frag6.c#13 integrate
.. //depot/projects/hammer/sys/netinet6/icmp6.c#32 integrate
.. //depot/projects/hammer/sys/netinet6/in6.c#30 integrate
.. //depot/projects/hammer/sys/netinet6/in6_ifattach.c#22 integrate
.. //depot/projects/hammer/sys/netinet6/in6_pcb.c#34 integrate
.. //depot/projects/hammer/sys/netinet6/in6_proto.c#21 integrate
.. //depot/projects/hammer/sys/netinet6/in6_rmx.c#13 integrate
.. //depot/projects/hammer/sys/netinet6/in6_src.c#25 integrate
.. //depot/projects/hammer/sys/netinet6/ip6_input.c#34 integrate
.. //depot/projects/hammer/sys/netinet6/ip6_mroute.c#23 integrate
.. //depot/projects/hammer/sys/netinet6/ip6_output.c#47 integrate
.. //depot/projects/hammer/sys/netinet6/mld6.c#22 integrate
.. //depot/projects/hammer/sys/netinet6/nd6.c#36 integrate
.. //depot/projects/hammer/sys/netinet6/nd6_nbr.c#25 integrate
.. //depot/projects/hammer/sys/netinet6/nd6_rtr.c#18 integrate
.. //depot/projects/hammer/sys/netinet6/raw_ip6.c#33 integrate
.. //depot/projects/hammer/sys/netinet6/udp6_usrreq.c#34 integrate
.. //depot/projects/hammer/sys/nfs4client/nfs4_vnops.c#27 integrate
.. //depot/projects/hammer/sys/nfsclient/nfs_socket.c#43 integrate
.. //depot/projects/hammer/sys/nfsclient/nfs_subs.c#30 integrate
.. //depot/projects/hammer/sys/nfsclient/nfs_vnops.c#55 integrate
.. //depot/projects/hammer/sys/nfsserver/nfs_serv.c#37 integrate
.. //depot/projects/hammer/sys/nfsserver/nfs_srvsubs.c#29 integrate
.. //depot/projects/hammer/sys/opencrypto/cryptodev.c#26 integrate
.. //depot/projects/hammer/sys/pc98/conf/GENERIC#48 integrate
.. //depot/projects/hammer/sys/powerpc/conf/GENERIC#36 integrate
.. //depot/projects/hammer/sys/security/audit/audit_arg.c#10 integrate
.. //depot/projects/hammer/sys/security/audit/audit_bsm_klib.c#8 integrate
.. //depot/projects/hammer/sys/security/audit/audit_worker.c#6 integrate
.. //depot/projects/hammer/sys/security/mac/mac_framework.h#9 integrate
.. //depot/projects/hammer/sys/security/mac/mac_policy.h#10 integrate
.. //depot/projects/hammer/sys/security/mac/mac_posix_shm.c#1 branch
.. //depot/projects/hammer/sys/security/mac/mac_process.c#13 integrate
.. //depot/projects/hammer/sys/security/mac/mac_syscalls.c#5 integrate
.. //depot/projects/hammer/sys/security/mac_stub/mac_stub.c#28 integrate
.. //depot/projects/hammer/sys/security/mac_test/mac_test.c#47 integrate
.. //depot/projects/hammer/sys/sparc64/conf/GENERIC#57 integrate
.. //depot/projects/hammer/sys/sys/buf.h#32 integrate
.. //depot/projects/hammer/sys/sys/fcntl.h#5 integrate
.. //depot/projects/hammer/sys/sys/file.h#18 integrate
.. //depot/projects/hammer/sys/sys/lockmgr.h#15 integrate
.. //depot/projects/hammer/sys/sys/mbuf.h#64 integrate
.. //depot/projects/hammer/sys/sys/mman.h#9 integrate
.. //depot/projects/hammer/sys/sys/param.h#102 integrate
.. //depot/projects/hammer/sys/sys/proc.h#113 integrate
.. //depot/projects/hammer/sys/sys/syscall.h#60 integrate
.. //depot/projects/hammer/sys/sys/syscall.mk#60 integrate
.. //depot/projects/hammer/sys/sys/syscallsubr.h#29 integrate
.. //depot/projects/hammer/sys/sys/sysproto.h#61 integrate
.. //depot/projects/hammer/sys/sys/vnode.h#73 integrate
.. //depot/projects/hammer/sys/ufs/ffs/ffs_snapshot.c#50 integrate
.. //depot/projects/hammer/sys/ufs/ffs/ffs_softdep.c#47 integrate
.. //depot/projects/hammer/sys/ufs/ffs/ffs_vfsops.c#69 integrate
.. //depot/projects/hammer/sys/ufs/ufs/ufs_extattr.c#24 integrate
.. //depot/projects/hammer/sys/ufs/ufs/ufs_lookup.c#19 integrate
.. //depot/projects/hammer/sys/ufs/ufs/ufs_quota.c#26 integrate
.. //depot/projects/hammer/sys/ufs/ufs/ufs_vnops.c#51 integrate
.. //depot/projects/hammer/sys/vm/swap_pager.c#56 integrate
.. //depot/projects/hammer/sys/vm/vm_contig.c#38 integrate
.. //depot/projects/hammer/sys/vm/vm_kern.c#29 integrate
.. //depot/projects/hammer/sys/vm/vm_mmap.c#49 integrate
.. //depot/projects/hammer/sys/vm/vm_object.c#72 integrate
.. //depot/projects/hammer/sys/vm/vnode_pager.c#43 integrate
.. //depot/projects/hammer/usr.bin/kdump/kdump.c#22 integrate
.. //depot/projects/hammer/usr.bin/netstat/route.c#14 integrate
.. //depot/projects/hammer/usr.bin/top/machine.c#22 integrate
.. //depot/projects/hammer/usr.bin/unzip/Makefile#1 branch
.. //depot/projects/hammer/usr.bin/unzip/unzip.1#1 branch
.. //depot/projects/hammer/usr.bin/unzip/unzip.c#1 branch
.. //depot/projects/hammer/usr.sbin/arp/arp.c#17 integrate
.. //depot/projects/hammer/usr.sbin/config/main.c#17 integrate
.. //depot/projects/hammer/usr.sbin/gstat/gstat.c#11 integrate
.. //depot/projects/hammer/usr.sbin/pkg_install/add/pkg_add.1#18 integrate
.. //depot/projects/hammer/usr.sbin/pmcstat/pmcstat.c#15 integrate

Differences ...

==== //depot/projects/hammer/contrib/cvs/src/parseinfo.c#7 (text+ko) ====

@@ -5,7 +5,7 @@
  * You may distribute under the terms of the GNU General Public License as
  * specified in the README file that comes with the CVS source distribution.
  *
- * $FreeBSD: src/contrib/cvs/src/parseinfo.c,v 1.3 2004/04/15 01:17:27 peter Exp $
+ * $FreeBSD: src/contrib/cvs/src/parseinfo.c,v 1.4 2008/01/07 07:47:21 peter Exp $
  */
 
 #include "cvs.h"

==== //depot/projects/hammer/contrib/top/top.c#11 (text+ko) ====

@@ -13,7 +13,7 @@
  *  Copyright (c) 1994, 1995, William LeFebvre, Argonne National Laboratory
  *  Copyright (c) 1996, William LeFebvre, Group sys Consulting
  *
- * $FreeBSD: src/contrib/top/top.c,v 1.23 2007/05/04 15:42:58 rafan Exp $
+ * $FreeBSD: src/contrib/top/top.c,v 1.24 2008/01/09 18:06:24 obrien Exp $
  */
 
 /*
@@ -459,7 +459,7 @@
     }
 
     /* initialize the kernel memory interface */
-    if (machine_init(&statics) == -1)
+    if (machine_init(&statics, do_unames) == -1)
     {
 	exit(1);
     }

==== //depot/projects/hammer/etc/defaults/periodic.conf#23 (text+ko) ====

@@ -13,7 +13,7 @@
 # For a more detailed explanation of all the periodic.conf variables, please
 # refer to the periodic.conf(5) manual page.
 #
-# $FreeBSD: src/etc/defaults/periodic.conf,v 1.46 2007/12/20 20:37:22 dougb Exp $
+# $FreeBSD: src/etc/defaults/periodic.conf,v 1.47 2008/01/08 07:22:43 dds Exp $
 #
 
 # What files override these defaults ?
@@ -127,6 +127,7 @@
 # 460.status-mail-rejects
 daily_status_mail_rejects_enable="YES"			# Check mail rejects
 daily_status_mail_rejects_logs=3			# How many logs to check
+daily_status_mail_rejects_shorten="NO"			# Shorten output
 
 # 470.status-named
 daily_status_named_enable="YES"

==== //depot/projects/hammer/etc/periodic/daily/460.status-mail-rejects#6 (text+ko) ====

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: src/etc/periodic/daily/460.status-mail-rejects,v 1.20 2005/01/12 01:31:21 brian Exp $
+# $FreeBSD: src/etc/periodic/daily/460.status-mail-rejects,v 1.21 2008/01/08 07:22:43 dds Exp $
 #
 
 # If there is a global system configuration file, suck it in.
@@ -11,6 +11,13 @@
     source_periodic_confs
 fi
 
+case "$daily_status_mail_rejects_shorten" in
+[Yy][Ee][Ss])
+    sed_output='\4 \3...';;
+*)
+    sed_output='\2 (\3... \4)';;
+esac
+
 case "$daily_status_mail_rejects_enable" in
     [Yy][Ee][Ss])
 	if [ ! -d /etc/mail ]
@@ -51,7 +58,7 @@
 		done
 		cat /var/log/maillog
 	    } |
-		sed -n -E "s/^$start"'.*ruleset=check_[^ ]+, +arg1=<?([^@]+@)?([^>,]+).*reject=([^ ]+) .* ([^ ]+)$/\2 (\3... \4)/p' |
+		sed -n -E "s/^$start"'.*ruleset=check_[^ ]+, +arg1=<?([^@]+@)?([^>,]+).*reject=([^ ]+) .* ([^ ]+)$/'"$sed_output"'/p' |
 		sort -f | uniq -ic | sort -fnr | tee /dev/stderr | wc -l)
 	    [ $rc -gt 0 ] && rc=1
 	fi;;

==== //depot/projects/hammer/games/fortune/datfiles/fortunes#76 (text+ko) ====

@@ -1,5 +1,5 @@
 This fortune brought to you by:
-$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.254 2007/12/28 17:57:25 wilko Exp $
+$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.255 2008/01/10 14:51:24 des Exp $
 %
 =======================================================================
 ||								     ||
@@ -45342,6 +45342,9 @@
 compassion.
 		-- Saul Alinsky
 %
+The fall of the USSR proves you wrong.
+		-- Aryeh M. Friedman
+%
 The famous politician was trying to save both his faces.
 %
 The farther you go, the less you know.

==== //depot/projects/hammer/games/fortune/datfiles/limerick#10 (text+ko) ====

@@ -1,4 +1,4 @@
-%% $FreeBSD: src/games/fortune/datfiles/limerick,v 1.14 2007/12/07 22:41:39 dougb Exp $
+%% $FreeBSD: src/games/fortune/datfiles/limerick,v 1.15 2008/01/07 10:31:17 schweikh Exp $
 %
 A bad little girl in Madrid,
 A most reprehensible kid,
@@ -4421,7 +4421,7 @@
 There was an old man of St. Bees,
 Who was stung in the arm by a wasp.
 	When asked, "Does it hurt?"
-	He relied, "No, it doesn't.
+	He replied, "No, it doesn't.
 I'm so glad that it wasn't a hornet."
 		-- W.S. Gilbert
 %

==== //depot/projects/hammer/include/unistd.h#19 (text+ko) ====

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)unistd.h	8.12 (Berkeley) 4/27/95
- * $FreeBSD: src/include/unistd.h,v 1.80 2006/12/14 21:42:03 pjd Exp $
+ * $FreeBSD: src/include/unistd.h,v 1.81 2008/01/10 22:11:20 jhb Exp $
  */
 
 #ifndef _UNISTD_H_
@@ -480,6 +480,7 @@
 void	 endusershell(void);
 int	 exect(const char *, char * const *, char * const *);
 int	 execvP(const char *, const char *, char * const *);
+int	 feature_present(const char *);
 char	*fflagstostr(u_long);
 int	 getdomainname(char *, int);
 int	 getgrouplist(const char *, gid_t, gid_t *, int *);

==== //depot/projects/hammer/lib/libc/gen/Makefile.inc#31 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile.inc	8.6 (Berkeley) 5/4/95
-# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.128 2007/09/28 02:22:56 scf Exp $
+# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.130 2008/01/10 22:11:21 jhb Exp $
 
 # machine-independent gen sources
 .PATH: ${.CURDIR}/${MACHINE_ARCH}/gen ${.CURDIR}/gen
@@ -10,7 +10,7 @@
 	clock.c closedir.c confstr.c \
 	crypt.c ctermid.c daemon.c devname.c dirname.c disklabel.c \
 	dlfcn.c dlfunc.c drand48.c erand48.c err.c errlst.c errno.c \
-	exec.c fmtcheck.c fmtmsg.c fnmatch.c \
+	exec.c feature_present.c fmtcheck.c fmtmsg.c fnmatch.c \
 	fpclassify.c frexp.c fstab.c ftok.c fts.c ftw.c \
 	getbootfile.c getbsize.c \
 	getcap.c getcwd.c getdomainname.c getgrent.c getgrouplist.c \
@@ -21,7 +21,7 @@
 	initgroups.c isatty.c isinf.c isnan.c jrand48.c lcong48.c \
 	lockf.c lrand48.c mrand48.c nftw.c nice.c \
 	nlist.c nrand48.c opendir.c \
-	pause.c pmadvise.c popen.c posixshm.c pselect.c \
+	pause.c pmadvise.c popen.c pselect.c \
 	psignal.c pw_scan.c pwcache.c \
 	raise.c readdir.c readpassphrase.c rewinddir.c \
 	scandir.c seed48.c seekdir.c sem.c semctl.c \
@@ -45,7 +45,8 @@
 	basename.3 check_utility_compat.3 clock.3 \
 	confstr.3 ctermid.3 daemon.3 devname.3 directory.3 dirname.3 \
 	dladdr.3 dlinfo.3 dllockinit.3 dlopen.3 \
-	err.3 exec.3 fmtcheck.3 fmtmsg.3 fnmatch.3 fpclassify.3 frexp.3 \
+	err.3 exec.3 \
+	feature_present.3 fmtcheck.3 fmtmsg.3 fnmatch.3 fpclassify.3 frexp.3 \
 	ftok.3 fts.3 ftw.3 \
 	getbootfile.3 getbsize.3 getcap.3 getcontext.3 getcwd.3 \
 	getdiskbyname.3 getdomainname.3 getfsent.3 \
@@ -59,7 +60,7 @@
 	raise.3 rand48.3 readpassphrase.3 rfork_thread.3 \
 	scandir.3 sem_destroy.3 sem_getvalue.3 sem_init.3 \
 	sem_open.3 sem_post.3 sem_wait.3 \
-	setjmp.3 setmode.3 setproctitle.3 shm_open.3 \
+	setjmp.3 setmode.3 setproctitle.3 \
 	siginterrupt.3 signal.3 sigsetops.3 sleep.3 \
 	statvfs.3 stringlist.3 \
 	strtofflags.3 sysconf.3 sysctl.3 syslog.3 tcgetpgrp.3 \
@@ -133,7 +134,6 @@
 	setjmp.3 longjmperr.3 setjmp.3 longjmperror.3 \
 	setjmp.3 siglongjmp.3 setjmp.3 sigsetjmp.3
 MLINKS+=setmode.3 getmode.3
-MLINKS+=shm_open.3 shm_unlink.3
 MLINKS+=sigsetops.3 sigaddset.3 sigsetops.3 sigdelset.3 \
 	sigsetops.3 sigemptyset.3 sigsetops.3 sigfillset.3 \
 	sigsetops.3 sigismember.3

==== //depot/projects/hammer/lib/libc/sys/Makefile.inc#30 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile.inc	8.3 (Berkeley) 10/24/94
-# $FreeBSD: src/lib/libc/sys/Makefile.inc,v 1.127 2007/09/15 14:33:55 imp Exp $
+# $FreeBSD: src/lib/libc/sys/Makefile.inc,v 1.128 2008/01/08 21:58:14 jhb Exp $
 
 # sys sources
 .PATH: ${.CURDIR}/${MACHINE_ARCH}/sys ${.CURDIR}/sys
@@ -83,7 +83,7 @@
 	read.2 readlink.2 reboot.2 recv.2 rename.2 revoke.2 rfork.2 rmdir.2 \
 	rtprio.2 select.2 semctl.2 semget.2 semop.2 send.2 sendfile.2 \
 	setgroups.2 setpgid.2 setregid.2 setresuid.2 setreuid.2 setsid.2 \
-	setuid.2 shmat.2 shmctl.2 shmget.2 shutdown.2 \
+	setuid.2 shmat.2 shmctl.2 shmget.2 shm_open.2 shutdown.2 \
 	sigaction.2 sigaltstack.2 sigpending.2 sigprocmask.2 sigqueue.2 \
 	sigreturn.2 sigstack.2 sigsuspend.2 sigwait.2 sigwaitinfo.2 \
 	socket.2 socketpair.2 stat.2 statfs.2 \
@@ -154,6 +154,7 @@
 MLINKS+=setresuid.2 setresgid.2 setresuid.2 getresuid.2 setresuid.2 getresgid.2
 MLINKS+=setuid.2 setegid.2 setuid.2 seteuid.2 setuid.2 setgid.2
 MLINKS+=shmat.2 shmdt.2
+MLINKS+=shm_open.2 shm_unlink.2
 MLINKS+=sigwaitinfo.2 sigtimedwait.2
 MLINKS+=stat.2 fstat.2 stat.2 lstat.2
 MLINKS+=statfs.2 fstatfs.2

==== //depot/projects/hammer/lib/libthr/thread/thr_sem.c#8 (text+ko) ====

@@ -27,7 +27,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/lib/libthr/thread/thr_sem.c,v 1.12 2007/11/23 05:42:52 davidxu Exp $
+ * $FreeBSD: src/lib/libthr/thread/thr_sem.c,v 1.13 2008/01/07 02:26:29 davidxu Exp $
  */
 
 #include "namespace.h"
@@ -282,8 +282,8 @@
 
 	if ((*sem)->nwaiters) {
 		retval = _thr_umtx_wake(&(*sem)->count, 1);
-		if (retval > 0)
-			retval = 0;
+		if (retval != 0)
+			retval = -1;
 	}
 	return (retval);
 }

==== //depot/projects/hammer/lib/msun/src/s_csqrt.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/msun/src/s_csqrt.c,v 1.1 2007/12/15 08:38:43 das Exp $");
+__FBSDID("$FreeBSD: src/lib/msun/src/s_csqrt.c,v 1.2 2008/01/11 04:18:25 das Exp $");
 
 #include <complex.h>
 #include <math.h>
@@ -41,17 +41,20 @@
  */
 #pragma	STDC CX_LIMITED_RANGE	on
 
-/* We risk spurious overflow for components >= DBL_MAX/(1+sqrt(2)) */
-#define THRESH	0x1.a827999fcef32p+1022
+/* We risk spurious overflow for components >= DBL_MAX / (1 + sqrt(2)). */
+#define	THRESH	0x1.a827999fcef32p+1022
 
 double complex
 csqrt(double complex z)
 {
-	double a = creal(z), b = cimag(z);
+	double complex result;
+	double a, b;
 	double t;
-	double complex result;
 	int scale;
 
+	a = creal(z);
+	b = cimag(z);
+
 	/* Handle special cases. */
 	if (z == 0)
 		return (cpack(0, b));
@@ -59,13 +62,13 @@
 		return (cpack(INFINITY, b));
 	if (isnan(a)) {
 		t = (b - b) / (b - b);	/* raise invalid if b is not a NaN */
-		return (cpack(t, t));	/* return NaN + NaN i */
+		return (cpack(a, t));	/* return NaN + NaN i */
 	}
 	if (isinf(a)) {
 		/*
-		 * csqrt(inf + nan i)  = inf +  nan i
+		 * csqrt(inf + NaN i)  = inf +  NaN i
 		 * csqrt(inf + y i)    = inf +  0 i
-		 * csqrt(-inf + nan i) = nan +- inf i
+		 * csqrt(-inf + NaN i) = NaN +- inf i
 		 * csqrt(-inf + y i)   = 0   +  inf i
 		 */
 		if (signbit(a))
@@ -79,15 +82,15 @@
 	 */
 
 	/* Scale to avoid overflow. */
-	if (a >= THRESH || b >= THRESH) {
-	    a *= 0.25;
-	    b *= 0.25;
-	    scale = 1;
+	if (fabs(a) >= THRESH || fabs(b) >= THRESH) {
+		a *= 0.25;
+		b *= 0.25;
+		scale = 1;
 	} else {
-	    scale = 0;
+		scale = 0;
 	}
 
-	/* Algorithm 312, CACM vol 10, Oct 1967 */
+	/* Algorithm 312, CACM vol 10, Oct 1967. */
 	if (a >= 0) {
 		t = sqrt((a + hypot(a, b)) * 0.5);
 		result = cpack(t, b / (2 * t));
@@ -96,9 +99,9 @@
 		result = cpack(fabs(b) / (2 * t), copysign(t, b));
 	}
 
-	/* Rescale */
+	/* Rescale. */
 	if (scale)
-	    return (result * 2);
+		return (result * 2);
 	else
-	    return (result);
+		return (result);
 }

==== //depot/projects/hammer/lib/msun/src/s_csqrtf.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/msun/src/s_csqrtf.c,v 1.1 2007/12/15 08:38:43 das Exp $");
+__FBSDID("$FreeBSD: src/lib/msun/src/s_csqrtf.c,v 1.2 2008/01/11 04:18:25 das Exp $");
 
 #include <complex.h>
 #include <math.h>
@@ -54,13 +54,13 @@
 		return (cpackf(INFINITY, b));
 	if (isnan(a)) {
 		t = (b - b) / (b - b);	/* raise invalid if b is not a NaN */
-		return (cpackf(t, t));	/* return NaN + NaN i */
+		return (cpackf(a, t));	/* return NaN + NaN i */
 	}
 	if (isinf(a)) {
 		/*
-		 * csqrtf(inf + nan i)  = inf +  nan i
+		 * csqrtf(inf + NaN i)  = inf +  NaN i
 		 * csqrtf(inf + y i)    = inf +  0 i
-		 * csqrtf(-inf + nan i) = nan +- inf i
+		 * csqrtf(-inf + NaN i) = NaN +- inf i
 		 * csqrtf(-inf + y i)   = 0   +  inf i
 		 */
 		if (signbit(a))

==== //depot/projects/hammer/share/man/man4/ipmi.4#6 (text) ====

@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man4/ipmi.4,v 1.9 2008/01/04 12:55:23 gabor Exp $
+.\" $FreeBSD: src/share/man/man4/ipmi.4,v 1.11 2008/01/07 14:55:20 gabor Exp $
 .\"
 .Dd July 10, 2007
 .Dt IPMI 4
@@ -186,7 +186,7 @@
 The
 .Nm
 driver first appeared in
-.Fx 6.3 .
+.Fx 6.2 .
 .Sh AUTHORS
 .An -nosplit
 The

==== //depot/projects/hammer/share/man/man4/lagg.4#3 (text+ko) ====

@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.\" $FreeBSD: src/share/man/man4/lagg.4,v 1.4 2007/07/30 20:17:21 thompsa Exp $
+.\" $FreeBSD: src/share/man/man4/lagg.4,v 1.5 2008/01/08 15:36:06 gabor Exp $
 .\"
 .Dd April 17, 2007
 .Dt LAGG 4
@@ -154,7 +154,7 @@
 The
 .Nm
 device first appeared in
-.Fx 7.0 .
+.Fx 6.3 .
 .Sh AUTHORS
 .An -nosplit
 The

==== //depot/projects/hammer/share/man/man4/ng_pppoe.4#14 (text+ko) ====

@@ -32,10 +32,10 @@
 .\"
 .\" Author: Archie Cobbs <archie@FreeBSD.org>
 .\"
-.\" $FreeBSD: src/share/man/man4/ng_pppoe.4,v 1.40 2007/12/29 19:59:58 mav Exp $
+.\" $FreeBSD: src/share/man/man4/ng_pppoe.4,v 1.41 2008/01/05 23:41:15 brueffer Exp $
 .\" $Whistle: ng_pppoe.8,v 1.1 1999/01/25 23:46:27 archie Exp $
 .\"
-.Dd October 22, 2006
+.Dd December 27, 2007
 .Dt NG_PPPOE 4
 .Os
 .Sh NAME
@@ -104,9 +104,10 @@
 the state machine as a client.
 It must be newly created and a service name can be given as an argument.
 It is legal to specify a zero-length service name, this is common
-on some DSL setups. It is possible to request connection to specific
-access concentrator by it's name using "AC-Name\\Service-Name" syntax.
-A session request packet will be broadcast on the Ethernet.
+on some DSL setups.
+It is possible to request a connection to a specific
+access concentrator by its name using the "AC-Name\\Service-Name" syntax.
+A session request packet will be broadcasted on the Ethernet.
 This command uses the
 .Dv ngpppoe_init_data
 structure shown below.

==== //depot/projects/hammer/share/man/man4/pci.4#10 (text+ko) ====

@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man4/pci.4,v 1.20 2008/01/04 08:19:52 imp Exp $
+.\" $FreeBSD: src/share/man/man4/pci.4,v 1.21 2008/01/05 23:21:32 brueffer Exp $
 .\"
 .Dd January 3, 2008
 .Dt PCI 4
@@ -57,18 +57,30 @@
 .Pp
 The 
 .Nm 
-driver implements the pci bus in the kernel.
-It enumerates and devices on the pci bus and gives pci client drivers the
-chance to attach to them.
-It assigns resources to children, when the BIOS doesn't.
+driver implements the
+.Tn PCI
+bus in the kernel.
+It enumerates any devices on the
+.Tn PCI
+bus and gives
+.Tn PCI
+client drivers the chance to attach to them.
+It assigns resources to children, when the BIOS does not.
 It takes care of routing interrupts when necessary.
-It reprobes the unattached pci children when pci client drivers are dynamically
+It reprobes the unattached
+.Tn PCI
+children when
+.Tn PCI
+client drivers are dynamically
 loaded at runtime.
 .Sh KERNEL CONFIGURATION
 The 
 .Nm
 device is included in the kernel as described in the SYNOPSIS section.
-The pci driver cannot be built as a kld.
+The
+.Nm
+driver cannot be built as a
+.Xr kld 4 .
 .Sh IOCTLS
 The following
 .Xr ioctl 2

==== //depot/projects/hammer/share/man/man4/pcib.4#2 (text+ko) ====

@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man4/pcib.4,v 1.1 2008/01/04 08:26:22 imp Exp $
+.\" $FreeBSD: src/share/man/man4/pcib.4,v 1.2 2008/01/05 23:27:59 brueffer Exp $
 .\"
 .Dd January 4, 2008
 .Dt PCIB 4
@@ -31,11 +31,19 @@
 .Nm pcib
 .Nd PCI bridge driver
 .Sh SYNOPSIS
-.Cd device pcib
+To compile this driver into the kernel,
+place the following line in your
+kernel configuration file:
+.Bd -ragged -offset indent
+.Cd "device pcib"
+.Ed
 .Sh DESCRIPTION
 The
 .Nm
-driver provides for host and pci bridges in a pci system.
+driver provides for host and
+.Tn PCI
+bridges in a
+.Tn PCI
+system.
 .Sh BUGS
 This man page is too short.
-

==== //depot/projects/hammer/share/man/man4/textdump.4#2 (text+ko) ====

@@ -25,9 +25,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man4/textdump.4,v 1.2 2007/12/26 12:18:21 rwatson Exp $
+.\" $FreeBSD: src/share/man/man4/textdump.4,v 1.3 2008/01/07 16:47:30 brueffer Exp $
 .\"
-.Dd 26 December, 2007
+.Dd December 26, 2007
 .Dt textdump 4
 .Os
 .Sh NAME
@@ -93,7 +93,7 @@
 .It Pa version.txt
 Kernel version string.
 My be disabled by clearing the
-.Dv dbeug.ddb.textdump.do_panic
+.Dv debug.ddb.textdump.do_version
 sysctl.
 .El
 .Pp

==== //depot/projects/hammer/share/man/man7/bsd.snmpmod.mk.7#3 (text+ko) ====

@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (c) 2005
+.\" Copyright (c) 2005,2008
 .\"	Hartmut Brandt.
 .\" 	All rights reserved.
 .\"
@@ -26,9 +26,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man7/bsd.snmpmod.mk.7,v 1.4 2005/11/18 12:01:14 ru Exp $
+.\" $FreeBSD: src/share/man/man7/bsd.snmpmod.mk.7,v 1.5 2008/01/08 12:55:56 harti Exp $
 .\"
-.Dd November 10, 2005
+.Dd January 8, 2008
 .Dt BSD.SNMPMOD.MK 7
 .Os
 .Sh NAME
@@ -66,6 +66,21 @@
 A list of extra MIB definition files for
 .Xr gensnmptree 1 .
 This is optional.
+This file list is given to both calls to
+.Xr gensnmptree 1 \(em
+the one that extracts the symbols in
+.Va XSYM
+from the MIB definitions and the one that
+generates the table with OIDs served by this module.
+.It Va EXTRAMIBSYMS
+A list of extra MIB definition files for
+.Xr gensnmptree 1 .
+This is optional.
+This file list is given only to the call to
+.Xr gensnmptree 1
+that extracts symbols from MIB definition files.
+It is useful if there are dependencies on other MIBs or for extracting global
+definitions for enumeration constants.
 .It Va XSYM
 A list of symbols to be extracted from the MIB definition files by
 .Xr gensnmptree 1 .

==== //depot/projects/hammer/share/man/man9/VOP_LOCK.9#8 (text+ko) ====

@@ -26,9 +26,9 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man9/VOP_LOCK.9,v 1.19 2007/12/28 00:38:12 attilio Exp $
+.\" $FreeBSD: src/share/man/man9/VOP_LOCK.9,v 1.21 2008/01/10 19:11:37 brueffer Exp $
 .\"
-.Dd December 27, 2007
+.Dd January 10, 2008
 .Os
 .Dt VOP_LOCK 9
 .Sh NAME
@@ -48,7 +48,7 @@
 .Ft int
 .Fn VOP_ISLOCKED "struct vnode *vp" "struct thread *td"
 .Ft int
-.Fn vn_lock "struct vnode *vp" "int flags" "struct thread *td"
+.Fn vn_lock "struct vnode *vp" "int flags"
 .Sh DESCRIPTION
 These calls are used to serialize access to the file system, such as
 to prevent two writes to the same file from happening at the
@@ -110,6 +110,9 @@
 to lock a vnode rather than calling
 .Fn VOP_LOCK
 directly.
+.Fn vn_lock
+also does not want a thread specified as argument but it
+assumes curthread to be used.
 .Sh RETURN VALUES
 Zero is returned on success, otherwise an error is returned.
 .Sh PSEUDOCODE

==== //depot/projects/hammer/share/man/man9/lock.9#10 (text+ko) ====

@@ -24,9 +24,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
 .\" DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man9/lock.9,v 1.18 2007/12/28 00:38:12 attilio Exp $
+.\" $FreeBSD: src/share/man/man9/lock.9,v 1.20 2008/01/09 08:08:56 brueffer Exp $
 .\"
-.Dd December 27, 2007
+.Dd January 9, 2008
 .Dt LOCK 9
 .Os
 .Sh NAME
@@ -35,6 +35,7 @@
 .Nm lockcount ,
 .Nm lockmgr ,
 .Nm lockstatus ,
+.Nm lockmgr_disown ,
 .Nm lockmgr_printinfo
 .Nd "lockmgr family of functions"
 .Sh SYNOPSIS
@@ -51,6 +52,8 @@
 .Ft int
 .Fn lockstatus "struct lock *lkp" "struct thread *td"
 .Ft void
+.Fn lockmgr_disown "struct lock *lkp"
+.Ft void
 .Fn lockmgr_printinfo "struct lock *lkp"
 .Sh DESCRIPTION
 The
@@ -187,6 +190,12 @@
 will be returned.
 .Pp
 The
+.Fn lockmgr_disown
+function switches the owner from curthread to be
+.Dv LK_KERNPROC,
+if the lock is already held.
+.Pp
+The
 .Fn lockmgr_printinfo
 function prints debugging information about the lock.
 It is used primarily by

==== //depot/projects/hammer/share/man/man9/style.9#26 (text+ko) ====

@@ -24,7 +24,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	From: @(#)style	1.14 (Berkeley) 4/28/95
-.\" $FreeBSD: src/share/man/man9/style.9,v 1.123 2007/01/28 20:51:04 joel Exp $
+.\" $FreeBSD: src/share/man/man9/style.9,v 1.124 2008/01/05 21:39:21 grog Exp $
 .\"
 .Dd February 10, 2005
 .Dt STYLE 9
@@ -46,7 +46,7 @@
  * Style guide for FreeBSD.  Based on the CSRG's KNF (Kernel Normal Form).
  *
  *	@(#)style	1.14 (Berkeley) 4/28/95
- * $FreeBSD: src/share/man/man9/style.9,v 1.123 2007/01/28 20:51:04 joel Exp $
+ * $FreeBSD: src/share/man/man9/style.9,v 1.124 2008/01/05 21:39:21 grog Exp $
  */
 
 /*
@@ -68,7 +68,7 @@
  * Copyright (c) 1984-2025 John Q. Public
  * All rights reserved.
  *
- * Long, boring license goes here, but redacted for brevity
+ * Long, boring license goes here, but trimmed for brevity
  */
 .Ed
 .Pp
@@ -111,7 +111,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/share/man/man9/style.9,v 1.123 2007/01/28 20:51:04 joel Exp $");
+__FBSDID("$FreeBSD: src/share/man/man9/style.9,v 1.124 2008/01/05 21:39:21 grog Exp $");
 .Ed
 .Pp
 Leave another blank line before the header files.

==== //depot/projects/hammer/share/misc/committers-ports.dot#8 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/misc/committers-ports.dot,v 1.64 2007/11/01 16:08:25 brix Exp $
+# $FreeBSD: src/share/misc/committers-ports.dot,v 1.65 2008/01/10 01:25:40 edwin Exp $
 
 # This file is meant to list all FreeBSD ports committers and describe the
 # mentor-mentee relationships between them.
@@ -95,9 +95,11 @@
 lbr [label="Lars Balker Rasmussen\nlbr@FreeBSD.org\n2006/04/30"]
 leeym [label="Yen-Ming Lee\nleeym@FreeBSD.org\n2002/08/14"]
 lev [label="Lev Serebryakov\nlev@FreeBSD.org\n2003/06/17"]
+linimon [label="Mark Linimon\nlinimon@FreeBSD.org\n2003/10/23"]
 lioux [label="Mario Sergio Fujikawa Ferriera\nlioux@FreeBSD.org\n2000/10/14"]
 lth [label="Lars Thegler\nlth@FreeBSD.org\n2004/05/04"]
 lwhsu [label="Li-Wen Hsu\nlwhsu@FreeBSD.org\n2007/04/03"]
+lx [label="David Thiel\nlx@FreeBSD.org\n2006/11/29"]
 maho [label="Maho Nakata\nmaho@FreeBSD.org\n2002/10/17"]
 marcus [label="Joe Marcus Clarke\nmarcus@FreeBSD.org\n2002/04/05"]
 markus [label="Markus Brueffer\nmarkus@FreeBSD.org\n2004/02/21"]
@@ -171,6 +173,8 @@
 
 edwin -> cperciva
 edwin -> erwin
+edwin -> linimon
+edwin -> lx
 
 ehaupt -> db
 


>>> TRUNCATED FOR MAIL (1000 lines) <<<



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200801110642.m0B6gPXY067412>