PERFORCE change 168950 for review
Alexander Motin
mav at FreeBSD.org
Sun Sep 27 23:01:10 UTC 2009
http://perforce.freebsd.org/chv.cgi?CH=168950
Change 168950 by mav at mav_mavbook on 2009/09/27 23:01:03
IFC
Affected files ...
.. //depot/projects/scottl-camlock/src/UPDATING#18 integrate
.. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/zfs/zfs.8#2 integrate
.. //depot/projects/scottl-camlock/src/etc/mtree/BSD.usr.dist#5 integrate
.. //depot/projects/scottl-camlock/src/etc/network.subr#8 integrate
.. //depot/projects/scottl-camlock/src/etc/rc.d/defaultroute#3 integrate
.. //depot/projects/scottl-camlock/src/etc/rc.d/ip6addrctl#4 integrate
.. //depot/projects/scottl-camlock/src/etc/rc.d/netif#7 integrate
.. //depot/projects/scottl-camlock/src/etc/rc.d/routing#4 integrate
.. //depot/projects/scottl-camlock/src/etc/rc.d/rtadvd#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/nls/Makefile.inc#3 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/nls/gl_ES.ISO8859-1.msg#1 branch
.. //depot/projects/scottl-camlock/src/lib/libc/stdlib/malloc.3#4 integrate
.. //depot/projects/scottl-camlock/src/lib/libc/stdlib/malloc.c#5 integrate
.. //depot/projects/scottl-camlock/src/lib/libthr/thread/thr_spec.c#3 integrate
.. //depot/projects/scottl-camlock/src/libexec/rpc.rquotad/rquotad.c#3 integrate
.. //depot/projects/scottl-camlock/src/sbin/camcontrol/camcontrol.c#24 integrate
.. //depot/projects/scottl-camlock/src/sbin/ifconfig/ifconfig.8#8 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/Makefile#12 integrate
.. //depot/projects/scottl-camlock/src/share/man/man4/lindev.4#1 branch
.. //depot/projects/scottl-camlock/src/share/man/man5/rc.conf.5#8 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/acpica/acpi_machdep.c#10 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/amd64/trap.c#22 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/conf/NOTES#21 integrate
.. //depot/projects/scottl-camlock/src/sys/amd64/include/apm_bios.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/arm/arm/identcpu.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/arm/include/md_var.h#6 integrate
.. //depot/projects/scottl-camlock/src/sys/boot/forth/loader.conf#21 integrate
.. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_all.c#16 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#5 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#6 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#9 integrate
.. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/x86bios/x86bios.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/x86bios/x86bios.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/compat/x86bios/x86bios_alloc.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/files.amd64#24 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/files.i386#24 integrate
.. //depot/projects/scottl-camlock/src/sys/conf/files.pc98#18 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/acpi_support/acpi_ibm.c#12 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi.c#26 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/atkbdc/atkbd.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/de/if_de.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/de/if_devar.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/dpms/dpms.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/fb/vesa.c#3 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/lindev/full.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/lindev/lindev.c#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/lindev/lindev.h#1 branch
.. //depot/projects/scottl-camlock/src/sys/dev/syscons/scmouse.c#7 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/syscons/scterm-teken.c#8 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/syscons/syscons.c#19 integrate
.. //depot/projects/scottl-camlock/src/sys/dev/syscons/syscons.h#12 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/conf/NOTES#25 integrate
.. //depot/projects/scottl-camlock/src/sys/i386/include/apm_bios.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/kern_umtx.c#18 integrate
.. //depot/projects/scottl-camlock/src/sys/kern/subr_bus.c#33 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/Makefile#37 integrate
.. //depot/projects/scottl-camlock/src/sys/modules/lindev/Makefile#1 branch
.. //depot/projects/scottl-camlock/src/sys/modules/nfslockd/Makefile#3 integrate
.. //depot/projects/scottl-camlock/src/sys/nfsserver/nfs_serv.c#17 integrate
.. //depot/projects/scottl-camlock/src/sys/pc98/conf/NOTES#16 integrate
.. //depot/projects/scottl-camlock/src/sys/sparc64/conf/GENERIC#24 integrate
.. //depot/projects/scottl-camlock/src/sys/sys/ata.h#12 integrate
.. //depot/projects/scottl-camlock/src/sys/teken/sequences#2 integrate
.. //depot/projects/scottl-camlock/src/sys/teken/teken.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/teken/teken.h#4 integrate
.. //depot/projects/scottl-camlock/src/sys/teken/teken_demo.c#4 integrate
.. //depot/projects/scottl-camlock/src/sys/teken/teken_scs.h#2 integrate
.. //depot/projects/scottl-camlock/src/sys/teken/teken_stress.c#2 integrate
.. //depot/projects/scottl-camlock/src/sys/teken/teken_subr.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/teken/teken_subr_compat.h#3 integrate
.. //depot/projects/scottl-camlock/src/sys/vm/vm_mmap.c#18 integrate
.. //depot/projects/scottl-camlock/src/tools/regression/mmap/Makefile#1 branch
.. //depot/projects/scottl-camlock/src/tools/regression/mmap/mmap.c#1 branch
.. //depot/projects/scottl-camlock/src/tools/tools/nanobsd/nanobsd.sh#5 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/Makefile#6 integrate
.. //depot/projects/scottl-camlock/src/usr.sbin/apm/Makefile#2 integrate
Differences ...
==== //depot/projects/scottl-camlock/src/UPDATING#18 (text+ko) ====
@@ -22,10 +22,61 @@
machines to maximize performance. (To disable malloc debugging, run
ln -s aj /etc/malloc.conf.)
+20090926:
+ The rc.d/network_ipv6, IPv6 configuration script has been integrated
+ into rc.d/netif. The changes are the following:
+
+ 1. To use IPv6, simply define $ifconfig_IF_ipv6 like $ifconfig_IF
+ for IPv4. For aliases, $ifconfig_IF_aliasN should be used.
+ Note that both variables need the "inet6" keyword at the head.
+
+ Do not set $ipv6_network_interfaces manually if you do not
+ understand what you are doing. It is not needed in most cases.
+
+ $ipv6_ifconfig_IF and $ipv6_ifconfig_IF_aliasN still work, but
+ they are obsolete.
+
+ 2. $ipv6_enable is obsolete. Use $ipv6_prefer and
+ "inet6 accept_rtadv" keyword in ifconfig(8) instead.
+
+ If you define $ipv6_enable=YES, it means $ipv6_prefer=YES and
+ all configured interfaces have "inet6 accept_rtadv" in the
+ $ifconfig_IF_ipv6. These are for backward compatibility.
+
+ 3. A new variable $ipv6_prefer has been added. If NO, IPv6
+ functionality of interfaces with no corresponding
+ $ifconfig_IF_ipv6 is disabled by using "inet6 ifdisabled" flag,
+ and the default address selection policy of ip6addrctl(8)
+ is the IPv4-preferred one (see rc.d/ip6addrctl for more details).
+ Note that if you want to configure IPv6 functionality on the
+ disabled interfaces after boot, first you need to clear the flag by
+ using ifconfig(8) like:
+
+ ifconfig em0 inet6 -ifdisabled
+
+ If YES, the default address selection policy is set as
+ IPv6-preferred.
+
+ The default value of $ipv6_prefer is NO.
+
+ 4. If your system need to receive Router Advertisement messages,
+ define "inet6 accept_rtadv" in $ifconfig_IF_ipv6. The rc(8)
+ scripts automatically invoke rtsol(8) when the interface becomes
+ UP. The Router Advertisement messages are used for SLAAC
+ (State-Less Address AutoConfiguration).
+
20090922:
802.11s D3.03 support was committed. This is incompatible with the
previous code, which was based on D3.0.
+20090912:
+ A sysctl variable net.inet6.ip6.accept_rtadv now sets the default value
+ of a per-interface flag ND6_IFF_ACCEPT_RTADV, not a global knob to
+ control whether accepting Router Advertisement messages or not.
+ Also, a per-interface flag ND6_IFF_AUTO_LINKLOCAL has been added and
+ a sysctl variable net.inet6.ip6.auto_linklocal is its default value.
+ The ifconfig(8) utility now supports these flags.
+
20090910:
ZFS snapshots are now mounted with MNT_IGNORE flag. Use -v option for
mount(8) and -a option for df(1) to see them.
@@ -979,4 +1030,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: src/UPDATING,v 1.640 2009/09/22 18:19:18 rpaulo Exp $
+$FreeBSD: src/UPDATING,v 1.641 2009/09/26 18:59:00 hrs Exp $
==== //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/zfs/zfs.8#2 (text+ko) ====
@@ -535,7 +535,7 @@
.ad
.sp .6
.RS 4n
-Controls the checksum used to verify data integrity. The default value is "on", which automatically selects an appropriate algorithm (currently, \fIfletcher2\fR, but this may change in future releases). The value "off" disables integrity
+Controls the checksum used to verify data integrity. The default value is "on", which automatically selects an appropriate algorithm (currently, \fIfletcher4\fR, but this may change in future releases). The value "off" disables integrity
checking on user data. Disabling checksums is NOT a recommended practice.
.RE
==== //depot/projects/scottl-camlock/src/etc/mtree/BSD.usr.dist#5 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.338 2009/09/03 16:25:25 ache Exp $
+# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.339 2009/09/27 21:27:11 gabor Exp $
#
# Please see the file src/etc/mtree/README before making changes to this file.
#
@@ -1031,6 +1031,8 @@
..
fr_FR.UTF-8
..
+ gl_ES.ISO8859-1
+ ..
he_IL.UTF-8
..
hi_IN.ISCII-DEV
==== //depot/projects/scottl-camlock/src/etc/network.subr#8 (text+ko) ====
@@ -22,7 +22,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/etc/network.subr,v 1.201 2009/09/12 23:01:36 hrs Exp $
+# $FreeBSD: src/etc/network.subr,v 1.202 2009/09/26 18:59:00 hrs Exp $
#
#
@@ -97,15 +97,26 @@
if afexists inet6; then
if ipv6if $1; then
if checkyesno ipv6_gateway_enable; then
- _ipv6_opts="-accept_rtadv auto_linklocal"
+ _ipv6_opts="-accept_rtadv"
+ fi
+ else
+ if checkyesno ipv6_prefer; then
+ _ipv6_opts="-ifdisabled"
else
- _ipv6_opts="auto_linklocal"
+ _ipv6_opts="ifdisabled"
fi
- else
- _ipv6_opts="-auto_linklocal ifdisabled"
+
+ # backward compatibility: $ipv6_enable
+ case $ipv6_enable in
+ [Yy][Ee][Ss])
+ _ipv6_opts="${_ipv6_opts} accept_rtadv"
+ ;;
+ esac
fi
- ifconfig $1 inet6 ${_ipv6_opts}
+ if [ -n "${_ipv6_opts}" ]; then
+ ifconfig $1 inet6 ${_ipv6_opts}
+ fi
# ifconfig_IF_ipv6
ifconfig_args=`ifconfig_getargs $1 ipv6`
@@ -382,7 +393,7 @@
# 1 otherwise.
ipv6if()
{
- local _if i
+ local _if _tmpargs i
_if=$1
if ! afexists inet6; then
@@ -396,6 +407,18 @@
;;
esac
+ # True if $ifconfig_IF_ipv6 is defined.
+ _tmpargs=`_ifconfig_getargs $_if ipv6`
+ if [ -n "${_tmpargs}" ]; then
+ return 0
+ fi
+
+ # backward compatibility: True if $ipv6_ifconfig_IF is defined.
+ _tmpargs=`get_if_var $_if ipv6_ifconfig_IF`
+ if [ -n "${_tmpargs}" ]; then
+ return 0
+ fi
+
case "${ipv6_network_interfaces}" in
[Aa][Uu][Tt][Oo])
return 0
@@ -431,17 +454,30 @@
if checkyesno ipv6_gateway_enable; then
return 1
fi
+ _tmpargs=`get_if_var $_if ipv6_prefix_IF`
+ if [ -n "${_tmpargs}" ]; then
+ return 1
+ fi
case $_if in
lo0|\
stf[0-9]*|\
faith[0-9]*|\
lp[0-9]*|\
- sl[0-9]*)
+ sl[0-9]*|\
+ pflog[0-9]*|\
+ pfsync[0-9]*)
return 1
;;
esac
+ # backward compatibility: $ipv6_enable
+ case $ipv6_enable in
+ [Yy][Ee][Ss])
+ return 0
+ ;;
+ esac
+
_tmpargs=`_ifconfig_getargs $_if ipv6`
for _arg in $_tmpargs; do
case $_arg in
@@ -451,6 +487,16 @@
esac
done
+ # backward compatibility: $ipv6_ifconfig_IF
+ _tmpargs=`get_if_var $_if ipv6_ifconfig_IF`
+ for _arg in $_tmpargs; do
+ case $_arg in
+ accept_rtadv)
+ return 0
+ ;;
+ esac
+ done
+
return 1
}
@@ -691,7 +737,7 @@
;;
*)
ifconfig $1 inet6 ${ifconfig_args} alias && _ret=0
- warn "\$ipv6_ifconfig_$1_alias${alias} is obsolete."
+ warn "\$ipv6_ifconfig_$1_alias${alias} is obsolete." \
" Use ifconfig_$1_aliasN instead."
;;
esac
@@ -773,6 +819,7 @@
done
# backward compatibility: ipv6_ifconfig_IF_aliasN.
+ alias=0
while : ; do
ifconfig_args=`get_if_var $1 ipv6_ifconfig_IF_alias${alias}`
case "${ifconfig_args}" in
@@ -780,13 +827,12 @@
break
;;
*)
- ifconfig $1 inet6 ${ifconfig_args} -alias
- alias=$((${alias} + 1))
- warn "\$ipv6_ifconfig_$1_alias${alias} is obsolete."
+ ifconfig $1 inet6 ${ifconfig_args} -alias && _ret=0
+ warn "\$ipv6_ifconfig_$1_alias${alias} is obsolete." \
" Use ifconfig_$1_aliasN instead."
- _ret=0
;;
esac
+ alias=$((${alias} + 1))
done
return $_ret
==== //depot/projects/scottl-camlock/src/etc/rc.d/defaultroute#3 (text+ko) ====
@@ -2,11 +2,11 @@
#
# Wait for the default route to be up
#
-# $FreeBSD: src/etc/rc.d/defaultroute,v 1.7 2009/09/12 22:13:41 hrs Exp $
+# $FreeBSD: src/etc/rc.d/defaultroute,v 1.8 2009/09/26 19:00:20 hrs Exp $
#
# PROVIDE: defaultroute
-# REQUIRE: devd netif
+# REQUIRE: devd faith netif stf
# KEYWORD: nojail
. /etc/rc.subr
==== //depot/projects/scottl-camlock/src/etc/rc.d/ip6addrctl#4 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/ip6addrctl,v 1.6 2009/09/12 22:13:41 hrs Exp $
+# $FreeBSD: src/etc/rc.d/ip6addrctl,v 1.7 2009/09/26 18:59:00 hrs Exp $
#
# PROVIDE: ip6addrctl
@@ -19,6 +19,8 @@
prefer_ipv6_cmd="ip6addrctl_prefer_ipv6"
prefer_ipv4_cmd="ip6addrctl_prefer_ipv4"
+set_rcvar_obsolete ipv6_enable ipv6_prefer
+
ip6addrctl_prefer_ipv6()
{
ip6addrctl flush >/dev/null 2>&1
==== //depot/projects/scottl-camlock/src/etc/rc.d/netif#7 (text+ko) ====
@@ -22,7 +22,7 @@
# (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/etc/rc.d/netif,v 1.33 2009/09/12 22:13:41 hrs Exp $
+# $FreeBSD: src/etc/rc.d/netif,v 1.34 2009/09/26 18:59:00 hrs Exp $
#
# PROVIDE: netif
@@ -41,7 +41,7 @@
extra_commands="cloneup clonedown"
cmdifn=
-set_rcvar_obsolete ipv6_enable
+set_rcvar_obsolete ipv6_enable ipv6_prefer
network_start()
{
==== //depot/projects/scottl-camlock/src/etc/rc.d/routing#4 (text+ko) ====
@@ -2,11 +2,11 @@
#
# Configure routing and miscellaneous network tunables
#
-# $FreeBSD: src/etc/rc.d/routing,v 1.148 2009/09/13 20:19:02 bz Exp $
+# $FreeBSD: src/etc/rc.d/routing,v 1.149 2009/09/26 19:00:20 hrs Exp $
#
# PROVIDE: routing
-# REQUIRE: netif ppp
+# REQUIRE: faith netif ppp stf
# KEYWORD: nojail
. /etc/rc.subr
==== //depot/projects/scottl-camlock/src/etc/rc.d/rtadvd#4 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/rtadvd,v 1.14 2009/09/12 23:00:01 hrs Exp $
+# $FreeBSD: src/etc/rc.d/rtadvd,v 1.15 2009/09/26 19:00:47 hrs Exp $
#
# PROVIDE: rtadvd
@@ -43,7 +43,10 @@
case ${rtadvd_interfaces} in
[Aa][Uu][Tt][Oo]|'')
for i in `ifconfig -l` ; do
- if is_wired_interface $1; then
+ case $i in
+ lo0) continue ;;
+ esac
+ if ipv6if $i; then
rtadvd_interfaces="${rtadvd_interfaces} ${i}"
fi
done
==== //depot/projects/scottl-camlock/src/lib/libc/nls/Makefile.inc#3 (text+ko) ====
@@ -1,5 +1,5 @@
# from $NetBSD: Makefile.inc,v 1.7 1995/02/27 13:06:20 cgd Exp $
-# $FreeBSD: src/lib/libc/nls/Makefile.inc,v 1.17 2009/03/24 23:31:41 gabor Exp $
+# $FreeBSD: src/lib/libc/nls/Makefile.inc,v 1.18 2009/09/27 13:16:38 gabor Exp $
.PATH: ${.CURDIR}/nls
@@ -20,6 +20,7 @@
NLS+= es_ES.ISO8859-1
NLS+= fi_FI.ISO8859-1
NLS+= fr_FR.ISO8859-1
+NLS+= gl_ES.ISO8859-1
NLS+= hu_HU.ISO8859-2
NLS+= it_IT.ISO8859-15
NLS+= ko_KR.UTF-8
==== //depot/projects/scottl-camlock/src/lib/libc/stdlib/malloc.3#4 (text+ko) ====
@@ -30,9 +30,9 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)malloc.3 8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: src/lib/libc/stdlib/malloc.3,v 1.80 2008/11/03 21:17:18 jasone Exp $
+.\" $FreeBSD: src/lib/libc/stdlib/malloc.3,v 1.81 2009/09/26 18:20:40 alc Exp $
.\"
-.Dd August 26, 2008
+.Dd September 26, 2009
.Dt MALLOC 3
.Os
.Sh NAME
@@ -245,7 +245,8 @@
This is intended for debugging and will impact performance negatively.
.It K
Double/halve the virtual memory chunk size.
-The default chunk size is 1 MB.
+The default chunk size is the maximum of 1 MB and the largest
+page size that is less than or equal to 4 MB.
.It M
Use
.Xr mmap 2
@@ -561,6 +562,7 @@
.Xr alloca 3 ,
.Xr atexit 3 ,
.Xr getpagesize 3 ,
+.Xr getpagesizes 3 ,
.Xr memory 3 ,
.Xr posix_memalign 3
.Sh STANDARDS
==== //depot/projects/scottl-camlock/src/lib/libc/stdlib/malloc.c#5 (text+ko) ====
@@ -156,7 +156,7 @@
#define MALLOC_DSS
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.184 2009/09/05 13:32:05 kib Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.185 2009/09/26 18:20:40 alc Exp $");
#include "libc_private.h"
#ifdef MALLOC_DEBUG
@@ -4795,6 +4795,21 @@
}
}
+ /*
+ * Increase the chunk size to the largest page size that is greater
+ * than the default chunk size and less than or equal to 4MB.
+ */
+ {
+ size_t pagesizes[MAXPAGESIZES];
+ int k, nsizes;
+
+ nsizes = getpagesizes(pagesizes, MAXPAGESIZES);
+ for (k = 0; k < nsizes; k++)
+ if (pagesizes[k] <= (1LU << 22))
+ while ((1LU << opt_chunk_2pow) < pagesizes[k])
+ opt_chunk_2pow++;
+ }
+
for (i = 0; i < 3; i++) {
unsigned j;
==== //depot/projects/scottl-camlock/src/lib/libthr/thread/thr_spec.c#3 (text+ko) ====
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libthr/thread/thr_spec.c,v 1.7 2007/11/06 21:50:43 marius Exp $
+ * $FreeBSD: src/lib/libthr/thread/thr_spec.c,v 1.8 2009/09/25 00:15:30 davidxu Exp $
*/
#include "namespace.h"
@@ -131,9 +131,19 @@
curthread->specific[key].data = NULL;
curthread->specific_data_count--;
}
+ else if (curthread->specific[key].data != NULL) {
+ /*
+ * This can happen if the key is deleted via
+ * pthread_key_delete without first setting the value
+ * to NULL in all threads. POSIX says that the
+ * destructor is not invoked in this case.
+ */
+ curthread->specific[key].data = NULL;
+ curthread->specific_data_count--;
+ }
/*
- * If there is a destructore, call it
+ * If there is a destructor, call it
* with the key table entry unlocked:
*/
if (destructor != NULL) {
==== //depot/projects/scottl-camlock/src/libexec/rpc.rquotad/rquotad.c#3 (text+ko) ====
@@ -5,7 +5,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/libexec/rpc.rquotad/rquotad.c,v 1.10 2008/11/04 14:17:49 des Exp $");
+__FBSDID("$FreeBSD: src/libexec/rpc.rquotad/rquotad.c,v 1.13 2009/09/26 23:05:01 des Exp $");
#include <sys/param.h>
#include <sys/mount.h>
@@ -31,12 +31,11 @@
#include <syslog.h>
#include <unistd.h>
-void rquota_service(struct svc_req *request, SVCXPRT *transp);
-void sendquota(struct svc_req *request, SVCXPRT *transp);
-void printerr_reply(SVCXPRT *transp);
-void initfs(void);
-int getfsquota(long id, char *path, struct dqblk *dqblk);
-int hasquota(struct fstab *fs, char **qfnamep);
+static void rquota_service(struct svc_req *request, SVCXPRT *transp);
+static void sendquota(struct svc_req *request, SVCXPRT *transp);
+static void initfs(void);
+static int getfsquota(long id, char *path, struct dqblk *dqblk);
+static int hasquota(struct fstab *fs, char **qfnamep);
/*
* structure containing informations about ufs filesystems
@@ -48,16 +47,16 @@
char *qfpathname; /* pathname of the quota file */
dev_t st_dev; /* device of the filesystem */
} fs_stat;
-struct fs_stat *fs_begin = NULL;
+static struct fs_stat *fs_begin = NULL;
-int from_inetd = 1;
+static int from_inetd = 1;
static void
cleanup(int sig)
{
- (void) sig;
- (void) rpcb_unset(RQUOTAPROG, RQUOTAVERS, NULL);
+ (void)sig;
+ (void)rpcb_unset(RQUOTAPROG, RQUOTAVERS, NULL);
exit(0);
}
@@ -70,18 +69,17 @@
socklen_t fromlen;
fromlen = sizeof(from);
- if (getsockname(0, (struct sockaddr *)&from, &fromlen) < 0) {
+ if (getsockname(0, (struct sockaddr *)&from, &fromlen) < 0)
from_inetd = 0;
- }
if (!from_inetd) {
daemon(0, 0);
- (void) rpcb_unset(RQUOTAPROG, RQUOTAVERS, NULL);
+ (void)rpcb_unset(RQUOTAPROG, RQUOTAVERS, NULL);
- (void) signal(SIGINT, cleanup);
- (void) signal(SIGTERM, cleanup);
- (void) signal(SIGHUP, cleanup);
+ (void)signal(SIGINT, cleanup);
+ (void)signal(SIGTERM, cleanup);
+ (void)signal(SIGHUP, cleanup);
}
openlog("rpc.rquotad", LOG_CONS|LOG_PID, LOG_DAEMON);
@@ -94,10 +92,11 @@
exit(1);
}
ok = svc_reg(transp, RQUOTAPROG, RQUOTAVERS,
- rquota_service, NULL);
- } else
+ rquota_service, NULL);
+ } else {
ok = svc_create(rquota_service,
- RQUOTAPROG, RQUOTAVERS, "udp");
+ RQUOTAPROG, RQUOTAVERS, "udp");
+ }
if (!ok) {
syslog(LOG_ERR,
"unable to register (RQUOTAPROG, RQUOTAVERS, %s)",
@@ -111,7 +110,7 @@
exit(1);
}
-void
+static void
rquota_service(struct svc_req *request, SVCXPRT *transp)
{
@@ -134,7 +133,7 @@
}
/* read quota for the specified id, and send it */
-void
+static void
sendquota(struct svc_req *request, SVCXPRT *transp)
{
struct getquota_args getq_args;
@@ -142,7 +141,7 @@
struct dqblk dqblk;
struct timeval timev;
- bzero((char *)&getq_args, sizeof(getq_args));
+ bzero(&getq_args, sizeof(getq_args));
if (!svc_getargs(transp, (xdrproc_t)xdr_getquota_args, &getq_args)) {
svcerr_decode(transp);
return;
@@ -175,36 +174,16 @@
getq_rslt.getquota_rslt_u.gqr_rquota.rq_ftimeleft =
dqblk.dqb_itime - timev.tv_sec;
}
- if (!svc_sendreply(transp, (xdrproc_t)xdr_getquota_rslt, &getq_rslt)) {
+ if (!svc_sendreply(transp, (xdrproc_t)xdr_getquota_rslt, &getq_rslt))
svcerr_systemerr(transp);
- }
if (!svc_freeargs(transp, (xdrproc_t)xdr_getquota_args, &getq_args)) {
syslog(LOG_ERR, "unable to free arguments");
exit(1);
}
}
-void
-printerr_reply(SVCXPRT *transp) /* when a reply to a request failed */
-{
- char name[INET6_ADDRSTRLEN];
- struct sockaddr *caller;
- int save_errno;
-
- save_errno = errno;
-
- caller = (struct sockaddr *)svc_getrpccaller(transp)->buf;
- getnameinfo(caller, caller->sa_len, name, sizeof (name),
- NULL, 0, NI_NUMERICHOST);
- errno = save_errno;
- if (errno == 0)
- syslog(LOG_ERR, "couldn't send reply to %s", name);
- else
- syslog(LOG_ERR, "couldn't send reply to %s: %m", name);
-}
-
/* initialise the fs_tab list from entries in /etc/fstab */
-void
+static void
initfs(void)
{
struct fs_stat *fs_current = NULL;
@@ -220,15 +199,13 @@
if (!hasquota(fs, &qfpathname))
continue;
- fs_current = (struct fs_stat *) malloc(sizeof(struct fs_stat));
+ fs_current = malloc(sizeof(struct fs_stat));
fs_current->fs_next = fs_next; /* next element */
- fs_current->fs_file =
- malloc(sizeof(char) * (strlen(fs->fs_file) + 1));
+ fs_current->fs_file = malloc(strlen(fs->fs_file) + 1);
strcpy(fs_current->fs_file, fs->fs_file);
- fs_current->qfpathname =
- malloc(sizeof(char) * (strlen(qfpathname) + 1));
+ fs_current->qfpathname = malloc(strlen(qfpathname) + 1);
strcpy(fs_current->qfpathname, qfpathname);
stat(fs_current->fs_file, &st);
@@ -244,7 +221,7 @@
* gets the quotas for id, filesystem path.
* Return 0 if fail, 1 otherwise
*/
-int
+static int
getfsquota(long id, char *path, struct dqblk *dqblk)
{
struct stat st_path;
@@ -257,7 +234,7 @@
qcmd = QCMD(Q_GETQUOTA, USRQUOTA);
for (fs = fs_begin; fs != NULL; fs = fs->fs_next) {
- /* where the devise is the same as path */
+ /* where the device is the same as path */
if (fs->st_dev != st_path.st_dev)
continue;
@@ -299,7 +276,7 @@
* Check to see if a particular quota is to be enabled.
* Comes from quota.c, NetBSD 0.9
*/
-int
+static int
hasquota(struct fstab *fs, char **qfnamep)
{
static char initname, usrname[100];
==== //depot/projects/scottl-camlock/src/sbin/camcontrol/camcontrol.c#24 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sbin/camcontrol/camcontrol.c,v 1.64 2009/09/22 22:17:14 mav Exp $");
+__FBSDID("$FreeBSD: src/sbin/camcontrol/camcontrol.c,v 1.65 2009/09/27 22:00:26 mav Exp $");
#include <sys/ioctl.h>
#include <sys/stdint.h>
@@ -1019,18 +1019,28 @@
printf("protocol ");
printf("ATA/ATAPI-%d", ata_version(parm->version_major));
if (parm->satacapabilities && parm->satacapabilities != 0xffff) {
- if (parm->satacapabilities & ATA_SATA_GEN2)
+ if (parm->satacapabilities & ATA_SATA_GEN3)
+ printf(" SATA 3.x\n");
+ else if (parm->satacapabilities & ATA_SATA_GEN2)
printf(" SATA 2.x\n");
else if (parm->satacapabilities & ATA_SATA_GEN1)
printf(" SATA 1.x\n");
else
- printf(" SATA x.x\n");
+ printf(" SATA\n");
}
else
printf("\n");
printf("device model %.40s\n", parm->model);
+ printf("firmware revision %.8s\n", parm->revision);
printf("serial number %.20s\n", parm->serial);
- printf("firmware revision %.8s\n", parm->revision);
+ if (parm->enabled.extension & ATA_SUPPORT_64BITWWN) {
+ printf("WWN %02x%02x%02x%02x\n",
+ parm->wwn[0], parm->wwn[1], parm->wwn[2], parm->wwn[3]);
+ }
+ if (parm->enabled.extension & ATA_SUPPORT_MEDIASN) {
+ printf("media serial number %.30s\n",
+ parm->media_serial);
+ }
printf("cylinders %d\n", parm->cylinders);
printf("heads %d\n", parm->heads);
@@ -1071,6 +1081,8 @@
default:
printf("0");
}
+ if ((parm->capabilities1 & ATA_SUPPORT_IORDY) == 0)
+ printf(" w/o IORDY");
printf("\n");
printf("DMA%ssupported ",
@@ -1110,18 +1122,25 @@
printf("overlap%ssupported\n",
parm->capabilities1 & ATA_SUPPORT_OVERLAP ? " " : " not ");
+ if (parm->media_rotation_rate == 1) {
+ printf("media RPM non-rotating\n");
+ } else if (parm->media_rotation_rate >= 0x0401 &&
+ parm->media_rotation_rate <= 0xFFFE) {
+ printf("media RPM %d\n",
+ parm->media_rotation_rate);
+ }
printf("\nFeature "
"Support Enable Value Vendor\n");
-
+ printf("read ahead %s %s\n",
+ parm->support.command1 & ATA_SUPPORT_LOOKAHEAD ? "yes" : "no",
+ parm->enabled.command1 & ATA_SUPPORT_LOOKAHEAD ? "yes" : "no");
printf("write cache %s %s\n",
parm->support.command1 & ATA_SUPPORT_WRITECACHE ? "yes" : "no",
parm->enabled.command1 & ATA_SUPPORT_WRITECACHE ? "yes" : "no");
-
- printf("read ahead %s %s\n",
- parm->support.command1 & ATA_SUPPORT_LOOKAHEAD ? "yes" : "no",
- parm->enabled.command1 & ATA_SUPPORT_LOOKAHEAD ? "yes" : "no");
-
+ printf("flush cache %s %s\n",
+ parm->support.command2 & ATA_SUPPORT_FLUSHCACHE ? "yes" : "no",
+ parm->enabled.command2 & ATA_SUPPORT_FLUSHCACHE ? "yes" : "no");
if (parm->satacapabilities && parm->satacapabilities != 0xffff) {
printf("Native Command Queuing (NCQ) %s "
" %d/0x%02X\n",
@@ -1136,28 +1155,22 @@
parm->support.command2 & ATA_SUPPORT_QUEUED ? "yes" : "no",
parm->enabled.command2 & ATA_SUPPORT_QUEUED ? "yes" : "no",
ATA_QUEUE_LEN(parm->queue), ATA_QUEUE_LEN(parm->queue));
-
printf("SMART %s %s\n",
parm->support.command1 & ATA_SUPPORT_SMART ? "yes" : "no",
parm->enabled.command1 & ATA_SUPPORT_SMART ? "yes" : "no");
-
printf("microcode download %s %s\n",
parm->support.command2 & ATA_SUPPORT_MICROCODE ? "yes" : "no",
parm->enabled.command2 & ATA_SUPPORT_MICROCODE ? "yes" : "no");
-
printf("security %s %s\n",
parm->support.command1 & ATA_SUPPORT_SECURITY ? "yes" : "no",
parm->enabled.command1 & ATA_SUPPORT_SECURITY ? "yes" : "no");
-
printf("power management %s %s\n",
parm->support.command1 & ATA_SUPPORT_POWERMGT ? "yes" : "no",
parm->enabled.command1 & ATA_SUPPORT_POWERMGT ? "yes" : "no");
-
printf("advanced power management %s %s %d/0x%02X\n",
parm->support.command2 & ATA_SUPPORT_APM ? "yes" : "no",
parm->enabled.command2 & ATA_SUPPORT_APM ? "yes" : "no",
parm->apm_value, parm->apm_value);
-
printf("automatic acoustic management %s %s "
"%d/0x%02X %d/0x%02X\n",
parm->support.command2 & ATA_SUPPORT_AUTOACOUSTIC ? "yes" :"no",
@@ -1166,6 +1179,22 @@
ATA_ACOUSTIC_CURRENT(parm->acoustic),
ATA_ACOUSTIC_VENDOR(parm->acoustic),
ATA_ACOUSTIC_VENDOR(parm->acoustic));
+ printf("media status notification %s %s\n",
+ parm->support.command2 & ATA_SUPPORT_NOTIFY ? "yes" : "no",
+ parm->enabled.command2 & ATA_SUPPORT_NOTIFY ? "yes" : "no");
+ printf("power-up in Standby %s %s\n",
+ parm->support.command2 & ATA_SUPPORT_STANDBY ? "yes" : "no",
+ parm->enabled.command2 & ATA_SUPPORT_STANDBY ? "yes" : "no");
+ printf("write-read-verify %s %s %d/0x%x\n",
+ parm->support2 & ATA_SUPPORT_WRITEREADVERIFY ? "yes" : "no",
+ parm->enabled2 & ATA_SUPPORT_WRITEREADVERIFY ? "yes" : "no",
+ parm->wrv_mode, parm->wrv_mode);
+ printf("unload %s %s\n",
+ parm->support.extension & ATA_SUPPORT_UNLOAD ? "yes" : "no",
+ parm->enabled.extension & ATA_SUPPORT_UNLOAD ? "yes" : "no");
+ printf("free-fall %s %s\n",
+ parm->support2 & ATA_SUPPORT_FREEFALL ? "yes" : "no",
+ parm->enabled2 & ATA_SUPPORT_FREEFALL ? "yes" : "no");
}
@@ -1261,6 +1290,7 @@
ata_bswap(ident_buf->model, sizeof(ident_buf->model));
ata_bswap(ident_buf->revision, sizeof(ident_buf->revision));
ata_bswap(ident_buf->serial, sizeof(ident_buf->serial));
+ ata_bswap(ident_buf->media_serial, sizeof(ident_buf->media_serial));
}
ata_btrim(ident_buf->model, sizeof(ident_buf->model));
ata_bpack(ident_buf->model, ident_buf->model, sizeof(ident_buf->model));
@@ -1268,6 +1298,9 @@
ata_bpack(ident_buf->revision, ident_buf->revision, sizeof(ident_buf->revision));
ata_btrim(ident_buf->serial, sizeof(ident_buf->serial));
ata_bpack(ident_buf->serial, ident_buf->serial, sizeof(ident_buf->serial));
+ ata_btrim(ident_buf->media_serial, sizeof(ident_buf->media_serial));
+ ata_bpack(ident_buf->media_serial, ident_buf->media_serial,
+ sizeof(ident_buf->media_serial));
fprintf(stdout, "%s%d: ", device->device_name,
device->dev_unit_num);
==== //depot/projects/scottl-camlock/src/sbin/ifconfig/ifconfig.8#8 (text+ko) ====
@@ -26,9 +26,9 @@
.\" SUCH DAMAGE.
.\"
.\" From: @(#)ifconfig.8 8.3 (Berkeley) 1/5/94
-.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.161 2009/09/12 22:17:13 hrs Exp $
+.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.162 2009/09/26 18:59:00 hrs Exp $
.\"
-.Dd September 2, 2009
+.Dd September 23, 2009
.Dt IFCONFIG 8
.Os
.Sh NAME
@@ -598,7 +598,10 @@
the hardware will be re-initialized.
.El
.Pp
-The following parameters are for ICMPv6 Neightbor Discovery Protocol:
+The following parameters are for ICMPv6 Neightbor Discovery Protocol.
+Note that the address family keyword
+.Dq Li inet6
+is needed for them:
.Bl -tag -width indent
.It Cm accept_rtadv
Set a flag to enable accepting ICMPv6 Router Advertisement messages.
@@ -619,7 +622,10 @@
.Cm defaultif .
.It Cm ifdisabled
Set a flag to disable all of IPv6 network communications on the
-specified interface.
+specified interface. Note that if there are already configured IPv6
+addresses on that interface, all of them are marked as
+.Dq tentative
+and DAD will be performed when this flag is cleared.
.It Cm -ifdisabled
Clear a flag
.Cm ifdisabled .
==== //depot/projects/scottl-camlock/src/share/man/man4/Makefile#12 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.1 (Berkeley) 6/18/93
-# $FreeBSD: src/share/man/man4/Makefile,v 1.461 2009/09/09 09:50:31 delphij Exp $
+# $FreeBSD: src/share/man/man4/Makefile,v 1.462 2009/09/26 12:45:28 bz Exp $
MAN= aac.4 \
acpi.4 \
@@ -173,6 +173,7 @@
le.4 \
led.4 \
lge.4 \
+ ${_lindev.4} \
${_linux.4} \
lmc.4 \
lo.4 \
@@ -625,6 +626,7 @@
_if_wpi.4= if_wpi.4
_ipmi.4= ipmi.4
_io.4= io.4
+_lindev.4= lindev.4
_linux.4= linux.4
_ndis.4= ndis.4
_nfe.4= nfe.4
@@ -636,6 +638,8 @@
_spkr.4= spkr.4
_urtw.4= urtw.4
_wpi.4= wpi.4
+
+MLINKS+=lindev.4 full.4
.endif
.if exists(${.CURDIR}/man4.${MACHINE_ARCH})
==== //depot/projects/scottl-camlock/src/share/man/man5/rc.conf.5#8 (text+ko) ====
@@ -22,9 +22,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.363 2009/09/17 19:05:47 dougb Exp $
+.\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.364 2009/09/26 18:59:00 hrs Exp $
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list