From owner-p4-projects@FreeBSD.ORG Sun Sep 12 13:29:37 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D6D3F1065673; Sun, 12 Sep 2010 13:29:36 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8BDAD1065672 for ; Sun, 12 Sep 2010 13:29:36 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 790F98FC0C for ; Sun, 12 Sep 2010 13:29:36 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o8CDTa4m075010 for ; Sun, 12 Sep 2010 13:29:36 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o8CDTal9075007 for perforce@freebsd.org; Sun, 12 Sep 2010 13:29:36 GMT (envelope-from trasz@freebsd.org) Date: Sun, 12 Sep 2010 13:29:36 GMT Message-Id: <201009121329.o8CDTal9075007@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 183667 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Sep 2010 13:29:37 -0000 http://p4web.freebsd.org/@@183667?ac=10 Change 183667 by trasz@trasz_victim on 2010/09/12 13:29:15 Move decreasing a thread count to a more appropriate place. Affected files ... .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_thr.c#9 edit .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_thread.c#8 edit Differences ... ==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_thr.c#9 (text+ko) ==== @@ -295,6 +295,10 @@ kern_umtx_wake(td, uap->state, INT_MAX, 0); } +#ifdef CONTAINERS + rusage_sub(p, RUSAGE_NTHR, 1); +#endif + PROC_LOCK(p); tdsigcleanup(td); PROC_SLOCK(p); @@ -310,9 +314,6 @@ } PROC_SUNLOCK(p); PROC_UNLOCK(p); -#ifdef CONTAINERS - rusage_sub(p, RUSAGE_NTHR, 1); -#endif return (0); } ==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_thread.c#8 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Sun Sep 12 14:50:45 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4DD571065673; Sun, 12 Sep 2010 14:50:45 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 060CB1065670 for ; Sun, 12 Sep 2010 14:50:45 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id E76618FC0C for ; Sun, 12 Sep 2010 14:50:44 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o8CEoiod092257 for ; Sun, 12 Sep 2010 14:50:44 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o8CEoidl092253 for perforce@freebsd.org; Sun, 12 Sep 2010 14:50:44 GMT (envelope-from trasz@freebsd.org) Date: Sun, 12 Sep 2010 14:50:44 GMT Message-Id: <201009121450.o8CEoidl092253@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 183670 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Sep 2010 14:50:45 -0000 http://p4web.freebsd.org/@@183670?ac=10 Change 183670 by trasz@trasz_victim on 2010/09/12 14:50:41 Adapt to sbuf(9) changes in head. Affected files ... .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_hrl.c#94 edit Differences ... ==== //depot/projects/soc2009/trasz_limits/sys/kern/kern_hrl.c#94 (text+ko) ==== @@ -1208,7 +1208,7 @@ loginclass_container_foreach(hrl_get_rules_callback, filter, sb); ui_container_foreach(hrl_get_rules_callback, filter, sb); mtx_unlock(&hrl_lock); - if (sbuf_overflowed(sb)) { + if (sbuf_error(sb) == ENOMEM) { sbuf_delete(sb); free(buf, M_HRL); bufsize *= 4; @@ -1278,7 +1278,7 @@ sbuf_printf(sb, ","); } mtx_unlock(&hrl_lock); - if (sbuf_overflowed(sb)) { + if (sbuf_error(sb) == ENOMEM) { sbuf_delete(sb); free(buf, M_HRL); bufsize *= 4; From owner-p4-projects@FreeBSD.ORG Sun Sep 12 15:28:02 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4C4571065695; Sun, 12 Sep 2010 15:28:02 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0DBB91065674 for ; Sun, 12 Sep 2010 15:28:02 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id EC7D58FC17 for ; Sun, 12 Sep 2010 15:28:01 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o8CFS1v6099572 for ; Sun, 12 Sep 2010 15:28:01 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o8CFS0AH099569 for perforce@freebsd.org; Sun, 12 Sep 2010 15:28:00 GMT (envelope-from trasz@freebsd.org) Date: Sun, 12 Sep 2010 15:28:00 GMT Message-Id: <201009121528.o8CFS0AH099569@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 183671 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Sep 2010 15:28:02 -0000 http://p4web.freebsd.org/@@183671?ac=10 Change 183671 by trasz@trasz_victim on 2010/09/12 15:27:37 IFC. Affected files ... .. //depot/projects/soc2009/trasz_limits/Makefile.inc1#15 integrate .. //depot/projects/soc2009/trasz_limits/ObsoleteFiles.inc#26 integrate .. //depot/projects/soc2009/trasz_limits/bin/expr/expr.1#2 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/eval.c#13 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/expand.c#12 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/miscbltin.c#5 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/mksyntax.c#7 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/sh.1#14 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/var.c#9 integrate .. //depot/projects/soc2009/trasz_limits/bin/test/test.1#3 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c#5 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c#4 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c#3 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c#4 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/lib/libdtrace/common/dt_program.c#3 integrate .. //depot/projects/soc2009/trasz_limits/etc/mtree/BSD.var.dist#3 integrate .. //depot/projects/soc2009/trasz_limits/etc/rc.d/cleartmp#3 integrate .. //depot/projects/soc2009/trasz_limits/games/fortune/datfiles/fortunes#11 integrate .. //depot/projects/soc2009/trasz_limits/gnu/lib/libobjc/Makefile#5 integrate .. //depot/projects/soc2009/trasz_limits/gnu/lib/libstdc++/Makefile#5 integrate .. //depot/projects/soc2009/trasz_limits/gnu/lib/libstdc++/config.h#2 integrate .. //depot/projects/soc2009/trasz_limits/include/limits.h#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/db/man/dbopen.3#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/net/sctp_send.3#8 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/net/sctp_sendmsg.3#8 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/posix1e/acl_strip.c#4 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/stdio/printf.3#7 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/stdlib/Makefile.inc#4 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/stdlib/malloc.3#6 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/sys/Makefile.inc#8 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/sys/Symbol.map#11 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/sys/connect.2#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/sys/cpuset_getaffinity.2#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/sys/sigwait.c#1 branch .. //depot/projects/soc2009/trasz_limits/lib/libedit/common.c#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libedit/term.c#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libedit/term.h#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libelf/elf_update.c#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/libjail/jail.3#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/libjail/jail.c#6 integrate .. //depot/projects/soc2009/trasz_limits/lib/libpmc/libpmc.c#9 integrate .. //depot/projects/soc2009/trasz_limits/lib/libstand/nfs.c#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/libthr/thread/thr_cancel.c#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/libthr/thread/thr_cond.c#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/libthr/thread/thr_create.c#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libthr/thread/thr_exit.c#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/libthr/thread/thr_fork.c#4 integrate .. //depot/projects/soc2009/trasz_limits/lib/libthr/thread/thr_init.c#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/libthr/thread/thr_join.c#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/libthr/thread/thr_kern.c#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libthr/thread/thr_mutex.c#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libthr/thread/thr_private.h#5 integrate .. //depot/projects/soc2009/trasz_limits/lib/libthr/thread/thr_rtld.c#4 integrate .. //depot/projects/soc2009/trasz_limits/lib/libthr/thread/thr_sig.c#4 integrate .. //depot/projects/soc2009/trasz_limits/lib/libthr/thread/thr_syscalls.c#4 integrate .. //depot/projects/soc2009/trasz_limits/lib/libthr/thread/thr_umtx.c#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/libthr/thread/thr_umtx.h#3 integrate .. //depot/projects/soc2009/trasz_limits/release/doc/share/misc/dev.archlist.txt#5 integrate .. //depot/projects/soc2009/trasz_limits/sbin/dhclient/dhclient-script.8#2 integrate .. //depot/projects/soc2009/trasz_limits/sbin/fdisk/fdisk.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sbin/geom/core/geom.8#6 integrate .. //depot/projects/soc2009/trasz_limits/sbin/hastd/Makefile#3 integrate .. //depot/projects/soc2009/trasz_limits/sbin/hastd/control.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sbin/hastd/event.c#1 branch .. //depot/projects/soc2009/trasz_limits/sbin/hastd/event.h#1 branch .. //depot/projects/soc2009/trasz_limits/sbin/hastd/hast.conf.5#8 integrate .. //depot/projects/soc2009/trasz_limits/sbin/hastd/hast.h#5 integrate .. //depot/projects/soc2009/trasz_limits/sbin/hastd/hast_proto.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sbin/hastd/hast_proto.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sbin/hastd/hastd.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sbin/hastd/hooks.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sbin/hastd/hooks.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sbin/hastd/pjdlog.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sbin/hastd/primary.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sbin/hastd/proto.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sbin/hastd/proto.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sbin/hastd/proto_socketpair.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sbin/hastd/secondary.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sbin/hastd/synch.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sbin/kldload/kldload.8#5 integrate .. //depot/projects/soc2009/trasz_limits/sbin/kldload/kldload.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sbin/mount_nfs/mount_nfs.c#9 integrate .. //depot/projects/soc2009/trasz_limits/sbin/mount_unionfs/mount_unionfs.8#2 integrate .. //depot/projects/soc2009/trasz_limits/secure/lib/libcrypto/man/BIO_s_bio.3#6 integrate .. //depot/projects/soc2009/trasz_limits/share/examples/etc/make.conf#4 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man3/Makefile#5 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man3/siginfo.3#3 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man4/Makefile#24 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man4/aesni.4#1 branch .. //depot/projects/soc2009/trasz_limits/share/man/man4/ata.4#8 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man4/axe.4#3 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man4/bwn.4#3 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man4/crypto.4#2 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man4/ddb.4#4 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man4/man4.powerpc/powermac_nvram.4#2 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man4/ng_hci.4#3 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man4/psm.4#5 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man4/sis.4#3 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man5/rc.conf.5#14 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man7/hier.7#3 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man9/Makefile#18 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man9/devclass_get_maxunit.9#2 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man9/locking.9#7 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man9/make_dev.9#5 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man9/rmlock.9#3 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man9/sbuf.9#3 integrate .. //depot/projects/soc2009/trasz_limits/share/misc/committers-ports.dot#12 integrate .. //depot/projects/soc2009/trasz_limits/share/misc/committers-src.dot#14 integrate .. //depot/projects/soc2009/trasz_limits/share/mk/Makefile#3 integrate .. //depot/projects/soc2009/trasz_limits/share/mk/bsd.dtrace.mk#1 branch .. //depot/projects/soc2009/trasz_limits/share/mk/bsd.lib.mk#7 integrate .. //depot/projects/soc2009/trasz_limits/share/mk/bsd.prog.mk#5 integrate .. //depot/projects/soc2009/trasz_limits/share/mk/sys.mk#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/amd64/cpu_switch.S#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/amd64/legacy.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/amd64/nexus.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/conf/GENERIC#17 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/include/cpufunc.h#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/arm/arm/nexus.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/arm/conf/DOCKSTAR#1 branch .. //depot/projects/soc2009/trasz_limits/sys/arm/xscale/ixp425/ixp425.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/boot/fdt/dts/dockstar.dts#1 branch .. //depot/projects/soc2009/trasz_limits/sys/boot/forth/beastie.4th#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/boot/i386/boot2/Makefile#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/boot/i386/efi/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/boot/i386/libi386/pxe.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/boot/i386/loader/Makefile#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/boot/i386/zfsloader/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/boot/ofw/libofw/ofw_copy.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/boot/pc98/boot2/Makefile#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/boot/pc98/boot2/boot2.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/boot/zfs/zfsimpl.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/cam/ata/ata_da.c#12 integrate .. //depot/projects/soc2009/trasz_limits/sys/cam/scsi/scsi_da.c#10 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/boot/zfs/zfsimpl.h#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#11 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#17 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/dev/dtrace/dtrace_load.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/linux/linux_ioctl.c#14 integrate .. //depot/projects/soc2009/trasz_limits/sys/conf/files#35 integrate .. //depot/projects/soc2009/trasz_limits/sys/conf/files.powerpc#12 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/pf/net/pf.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/acpi_support/acpi_hp.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/acpi_support/acpi_wmi.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/acpica/acpi.c#16 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/acpica/acpi_cpu.c#10 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/acpica/acpi_hpet.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ata/ata-all.h#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ata/ata-lowlevel.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ata/chipsets/ata-ahci.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ata/chipsets/ata-serverworks.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ata/chipsets/ata-siliconimage.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/atkbdc/atkbdc_isa.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/atkbdc/psm.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/bge/if_bge.c#19 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/bge/if_bgereg.h#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/cxgb/cxgb_sge.c#13 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/e1000/if_em.c#17 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/e1000/if_em.h#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/fb/vesa.c#16 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/firewire/firewire.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/firewire/fwohci_pci.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/hwpmc/hwpmc_core.c#10 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/if_ndis/if_ndis_usb.c#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/iicbus/iicbus.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/iscsi/initiator/iscsi.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/iscsi/initiator/iscsivar.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/led/led.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/malo/if_malo_pci.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/mii/brgphy.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/mii/brgphyreg.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/mps/mpi/mpi2.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/dev/mps/mpi/mpi2_cnfg.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/dev/mps/mpi/mpi2_hbd.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/dev/mps/mpi/mpi2_history.txt#1 branch .. //depot/projects/soc2009/trasz_limits/sys/dev/mps/mpi/mpi2_init.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/dev/mps/mpi/mpi2_ioc.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/dev/mps/mpi/mpi2_ra.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/dev/mps/mpi/mpi2_raid.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/dev/mps/mpi/mpi2_sas.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/dev/mps/mpi/mpi2_targ.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/dev/mps/mpi/mpi2_tool.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/dev/mps/mpi/mpi2_type.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/dev/mps/mps.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/dev/mps/mps_ioctl.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/dev/mps/mps_pci.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/dev/mps/mps_sas.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/dev/mps/mps_table.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/dev/mps/mps_table.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/dev/mps/mps_user.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/dev/mps/mpsvar.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/dev/msk/if_msk.c#11 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/mwl/if_mwl_pci.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ofw/ofw_fdt.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ofw/ofw_if.m#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ofw/ofw_iicbus.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ofw/ofw_standard.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ofw/openfirm.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/pci/pcireg.h#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/powermac_nvram/powermac_nvram.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/powermac_nvram/powermac_nvramvar.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ppbus/ppbconf.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/siba/siba.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/sis/if_sis.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/sis/if_sisreg.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/spibus/spibus.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/twa/tw_cl.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/twa/tw_cl_externs.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/twa/tw_cl_fwif.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/twa/tw_cl_init.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/twa/tw_cl_intr.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/twa/tw_cl_io.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/twa/tw_cl_misc.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/twa/tw_cl_share.h#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/twa/tw_osl.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/twa/tw_osl_cam.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/twa/tw_osl_freebsd.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/twa/tw_osl_share.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/controller/ehci.c#15 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/controller/ohci.c#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/controller/uhci.c#11 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/input/atp.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/input/uep.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/input/uhid.c#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/input/ukbd.c#14 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/input/ums.c#11 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/misc/udbp.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/misc/ufm.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/net/if_aue.c#10 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/net/if_axe.c#10 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/net/if_axereg.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/net/if_cdce.c#10 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/net/if_cue.c#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/net/if_kue.c#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/net/if_rue.c#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/net/if_udav.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/net/uhso.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/u3g.c#15 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/uark.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/ubsa.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/ubser.c#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/uchcom.c#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/ucycom.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/ufoma.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/uftdi.c#15 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/ugensa.c#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/uipaq.c#11 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/ulpt.c#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/umct.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/umoscom.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/uvisor.c#10 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/storage/umass.c#14 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/storage/urio.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_compat_linux.c#11 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_controller.h#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_device.c#14 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_generic.c#10 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_hub.c#12 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_transfer.c#14 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usb_transfer.h#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usbdi.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usbdi_util.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/wlan/if_rum.c#12 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/wlan/if_run.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/wlan/if_uath.c#10 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/wlan/if_upgt.c#11 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/wlan/if_ural.c#11 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/wlan/if_urtw.c#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/wlan/if_zyd.c#13 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/ext2fs/ext2_alloc.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/nfs/nfsdport.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/nfsclient/nfs_clbio.c#15 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/nfsclient/nfs_clrpcops.c#10 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/nfsclient/nfs_clvnops.c#18 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/nfsclient/nfsnode.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/nfsserver/nfs_nfsdstate.c#12 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/nullfs/null_vnops.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/tmpfs/tmpfs_vnops.c#13 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/unionfs/union_vfsops.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/geom/geom_io.c#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/geom/sched/subr_disk.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/i386/legacy.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/i386/nexus.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/include/cpufunc.h#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/ia64/ia64/nexus.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/isa/isa_common.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/bus_if.m#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/init_sysent.c#13 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_et.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_exec.c#20 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_fork.c#23 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_jail.c#25 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_malloc.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_rmlock.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_sig.c#17 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_sysctl.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/sched_4bsd.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/sched_ule.c#10 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/subr_acl_nfs4.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/subr_acl_posix1e.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/subr_bus.c#15 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/subr_disk.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/subr_lock.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/subr_sbuf.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/subr_sleepqueue.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/subr_witness.c#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/syscalls.c#12 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/syscalls.master#14 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/systrace_args.c#11 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/uipc_syscalls.c#15 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/vfs_mount.c#12 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/vfs_subr.c#19 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/adm5120/obio.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/alchemy/obio.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/atheros/apb.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/idt/obio.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/include/pte.h#10 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/mips/busdma_machdep.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/mips/mainbus.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/mips/nexus.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/rmi/board.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/rmi/board.h#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/rmi/clock.c#3 delete .. //depot/projects/soc2009/trasz_limits/sys/mips/rmi/clock.h#2 delete .. //depot/projects/soc2009/trasz_limits/sys/mips/rmi/debug.h#2 delete .. //depot/projects/soc2009/trasz_limits/sys/mips/rmi/dev/nlge/if_nlge.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/rmi/dev/xlr/debug.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/mips/rmi/dev/xlr/rge.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/rmi/fmn.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/rmi/interrupt.h#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/rmi/intr_machdep.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/rmi/iodi.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/rmi/iomap.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/rmi/msgring.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/rmi/pic.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/rmi/rmi_boot_info.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/mips/rmi/rmi_mips_exts.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/rmi/shared_structs.h#2 delete .. //depot/projects/soc2009/trasz_limits/sys/mips/rmi/shared_structs_func.h#2 delete .. //depot/projects/soc2009/trasz_limits/sys/mips/rmi/shared_structs_offsets.h#2 delete .. //depot/projects/soc2009/trasz_limits/sys/mips/rmi/xlr_machdep.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/rmi/xlr_pci.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/mips/rmi/xlrconfig.h#3 delete .. //depot/projects/soc2009/trasz_limits/sys/mips/sibyte/sb_zbbus.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/modules/Makefile#24 integrate .. //depot/projects/soc2009/trasz_limits/sys/modules/mps/Makefile#1 branch .. //depot/projects/soc2009/trasz_limits/sys/net/if.c#21 integrate .. //depot/projects/soc2009/trasz_limits/sys/net/if_epair.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/net/if_lagg.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/in.c#19 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/ip_carp.c#10 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/ip_input.c#14 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/ip_var.h#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/ipfw/ip_fw_log.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/ipfw/ip_fw_nat.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_input.c#12 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_output.c#16 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_pcb.c#14 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_timer.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/sctp_uio.h#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/sctputil.c#15 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet6/ip6_input.c#17 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet6/ip6_var.h#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/nfsclient/nfs_diskless.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/nfsclient/nfs_vnops.c#14 integrate .. //depot/projects/soc2009/trasz_limits/sys/nfsclient/nfsnode.h#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/pc98/pc98/canbus.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/aim/clock.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/aim/interrupt.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/aim/machdep.c#11 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/aim/mmu_oea.c#11 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/aim/mmu_oea64.c#13 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/aim/nexus.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/aim/ofw_machdep.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/aim/platform_chrp.c#6 delete .. //depot/projects/soc2009/trasz_limits/sys/powerpc/aim/trap_subr.S#3 delete .. //depot/projects/soc2009/trasz_limits/sys/powerpc/aim/vm_machdep.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/booke/clock.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/booke/interrupt.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/booke/platform_bare.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/conf/GENERIC64#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/include/intr_machdep.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/include/md_var.h#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/include/ofw_machdep.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/include/param.h#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/include/smp.h#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/mpc85xx/mpc85xx.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/ofw/ofw_real.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/powermac/ata_kauai.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/powermac/cuda.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/powermac/platform_powermac.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/powerpc/powermac/pmu.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/powermac/smu.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/powerpc/intr_machdep.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/powerpc/mp_machdep.c#10 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/powerpc/platform.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/powerpc/platform_if.m#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/security/audit/audit_bsm_klib.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/sparc64/conf/GENERIC#15 integrate .. //depot/projects/soc2009/trasz_limits/sys/sparc64/pci/schizo.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/sparc64/sparc64/machdep.c#11 integrate .. //depot/projects/soc2009/trasz_limits/sys/sparc64/sparc64/nexus.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/sun4v/sun4v/nexus.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sun4v/sun4v/vnex.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/_rmlock.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/bio.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/bus.h#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/copyright.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/lock.h#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/mount.h#11 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/param.h#24 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/rmlock.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/sbuf.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/syscall.h#12 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/syscall.mk#12 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/sysctl.h#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/sysproto.h#13 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/time.h#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/vm/memguard.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/vm/memguard.h#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/vm/uma_core.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/vm/vm_mmap.c#17 integrate .. //depot/projects/soc2009/trasz_limits/sys/vm/vm_page.c#17 integrate .. //depot/projects/soc2009/trasz_limits/sys/vm/vm_pageout.c#15 integrate .. //depot/projects/soc2009/trasz_limits/sys/vm/vm_phys.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/vm/vm_reserv.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/x86/pci/qpi.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/x86/x86/local_apic.c#4 integrate .. //depot/projects/soc2009/trasz_limits/tools/regression/bin/sh/builtins/command4.0#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/bin/sh/builtins/command4.127#2 delete .. //depot/projects/soc2009/trasz_limits/tools/regression/bin/sh/builtins/read2.0#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/bin/sh/builtins/read3.0#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/bin/sh/builtins/read3.0.stdout#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/bin/sh/builtins/read4.0#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/bin/sh/builtins/read4.0.stdout#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/bin/sh/builtins/return6.4#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/bin/sh/builtins/return7.4#1 branch .. //depot/projects/soc2009/trasz_limits/tools/regression/bin/sh/execution/var-assign1.0#1 branch .. //depot/projects/soc2009/trasz_limits/tools/tools/nanobsd/nanobsd.sh#8 integrate .. //depot/projects/soc2009/trasz_limits/tools/tools/sysbuild/sysbuild.sh#3 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/calendar/calendar.1#3 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/calendar/calendar.h#3 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/calendar/calendars/calendar.freebsd#11 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/calendar/calendars/calendar.judaic#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/calendar/calendars/fr_FR.ISO8859-1/calendar.fetes#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/calendar/parsedata.c#3 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/cpio/bsdcpio.1#5 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/ncal/ncal.c#6 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/printf/printf.1#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/split/split.1#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/systat/vmstat.c#6 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/usbhidaction/usbhidaction.c#4 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/apmd/apmd.c#3 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/bluetooth/bthidcontrol/sdp.c#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/bluetooth/bthidd/hid.c#3 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/freebsd-update/freebsd-update.8#5 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/freebsd-update/freebsd-update.sh#5 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend-query/disk-list.sh#3 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend/Makefile#4 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh#3 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend/functions-disk.sh#3 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend/functions-extractimage.sh#3 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend/functions-installcomponents.sh#3 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend/functions-packages.sh#3 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend/functions-parse.sh#3 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend/functions.sh#3 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend/installimage.sh#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/backend/parseconfig.sh#3 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/doc/help-index#5 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/examples/README#3 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/pc-sysinstall/pc-sysinstall/pc-sysinstall.sh#5 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/pciconf/cap.c#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/pciconf/pciconf.8#3 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/pciconf/pciconf.c#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/pkg_install/add/main.c#5 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/pmcstat/pmcpl_callgraph.c#5 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/pmcstat/pmcpl_calltree.c#7 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/pmcstat/pmcstat_log.c#9 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/pmcstat/pmcstat_log.h#3 integrate Differences ... ==== //depot/projects/soc2009/trasz_limits/Makefile.inc1#15 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.668 2010/08/28 15:03:11 nwhitehorn Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.669 2010/09/08 19:53:16 nwhitehorn Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -161,7 +161,7 @@ .error To cross-build, set TARGET_ARCH. .endif .endif -.if ${MACHINE} == ${TARGET} && !defined(CROSS_BUILD_TESTING) +.if ${MACHINE} == ${TARGET} && ${MACHINE_ARCH} == ${TARGET_ARCH} && !defined(CROSS_BUILD_TESTING) OBJTREE= ${MAKEOBJDIRPREFIX} .else OBJTREE= ${MAKEOBJDIRPREFIX}/${TARGET}.${TARGET_ARCH} ==== //depot/projects/soc2009/trasz_limits/ObsoleteFiles.inc#26 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.242 2010/08/15 21:25:52 brueffer Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.243 2010/09/10 20:42:41 mdf Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,8 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20100910: renamed sbuf_overflowed to sbuf_error +OLD_FILES+=usr/share/man/man9/sbuf_overflowed.9.gz # 20100815: retired last traces of chooseproc(9) OLD_FILES+=usr/share/man/man9/chooseproc.9.gz # 20100806: removal of unused libcompat routines ==== //depot/projects/soc2009/trasz_limits/bin/expr/expr.1#2 (text+ko) ==== @@ -28,9 +28,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/bin/expr/expr.1,v 1.29 2007/03/04 19:52:07 ru Exp $ +.\" $FreeBSD: src/bin/expr/expr.1,v 1.30 2010/09/09 21:59:53 jilles Exp $ .\" -.Dd July 12, 2004 +.Dd September 9, 2010 .Dt EXPR 1 .Os .Sh NAME @@ -217,6 +217,9 @@ More generally, parenthesize possibly-negative values: .Dl "a=$(expr \e( $a \e) + 1)" .It +With shell arithmetic, no escaping is required: +.Dl "a=$((a + 1))" +.It This example prints the filename portion of a pathname stored in variable .Va a . @@ -229,6 +232,12 @@ .Li // characters resolve this ambiguity. .Dl "expr \*q//$a\*q \&: '.*/\e(.*\e)'" +.It +With modern +.Xr sh 1 +syntax, +.Dl "\*q${a##*/}\*q" +expands to the same value. .El .Pp The following examples output the number of characters in variable @@ -237,19 +246,21 @@ .Va a might begin with a hyphen, it is necessary to prevent it from being interpreted as an option to -.Nm . +.Nm , +and +.Va a +might be interpreted as an operator. .Bl -bullet .It -If the -.Nm -command conforms to -.St -p1003.1-2001 , -this is simple: -.Dl "expr -- \*q$a\*q \&: \*q.*\*q" -.It -For portability to older systems, however, a more complicated command +To deal with all of this, a complicated command is required: .Dl "expr \e( \*qX$a\*q \&: \*q.*\*q \e) - 1" +.It +With modern +.Xr sh 1 +syntax, this can be done much more easily: +.Dl "${#a}" +expands to the required number. .El .Sh SEE ALSO .Xr sh 1 , ==== //depot/projects/soc2009/trasz_limits/bin/sh/eval.c#13 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.85 2010/08/13 20:29:43 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.87 2010/09/11 15:07:40 jilles Exp $"); #include #include @@ -305,6 +305,8 @@ } if (evalskip == SKIPBREAK && --skipcount <= 0) evalskip = 0; + if (evalskip == SKIPFUNC || evalskip == SKIPFILE) + status = exitstatus; break; } if (n->type == NWHILE) { @@ -995,7 +997,7 @@ goto out; parent: /* parent process gets here (if we forked) */ - if (mode == 0) { /* argument to fork */ + if (mode == FORK_FG) { /* argument to fork */ INTOFF; exitstatus = waitforjob(jp, &realstatus); INTON; @@ -1003,7 +1005,7 @@ evalskip = SKIPBREAK; skipcount = loopnest; } - } else if (mode == 2) { + } else if (mode == FORK_NOJOB) { backcmd->fd = pip[0]; close(pip[1]); backcmd->jp = jp; ==== //depot/projects/soc2009/trasz_limits/bin/sh/expand.c#12 (text+ko) ==== @@ -38,7 +38,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.67 2010/08/22 21:18:21 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.68 2010/09/05 21:12:48 jilles Exp $"); #include #include @@ -138,12 +138,18 @@ /* - * Perform variable substitution and command substitution on an argument, - * placing the resulting list of arguments in arglist. If EXP_FULL is true, - * perform splitting and file name expansion. When arglist is NULL, perform - * here document expansion. + * Perform expansions on an argument, placing the resulting list of arguments + * in arglist. Parameter expansion, command substitution and arithmetic + * expansion are always performed; additional expansions can be requested + * via flag (EXP_*). + * The result is left in the stack string. + * When arglist is NULL, perform here document expansion. A partial result + * may be written to herefd, which is then not included in the stack string. + * + * Caution: this function uses global state and is not reentrant. + * However, a new invocation after an interrupted invocation is safe + * and will reset the global state for the new call. */ - void expandarg(union node *arg, struct arglist *arglist, int flag) { @@ -195,11 +201,14 @@ /* - * Perform variable and command substitution. If EXP_FULL is set, output CTLESC - * characters to allow for further processing. Otherwise treat - * $@ like $* since no splitting will be performed. + * Perform parameter expansion, command substitution and arithmetic + * expansion, and tilde expansion if requested via EXP_TILDE/EXP_VARTILDE. + * Processing ends at a CTLENDVAR character as well as '\0'. + * This is used to expand word in ${var+word} etc. + * If EXP_FULL, EXP_CASE or EXP_REDIR are set, keep and/or generate CTLESC + * characters to allow for further processing. + * If EXP_FULL is set, also preserve CTLQUOTEMARK characters. */ - STATIC void argstr(char *p, int flag) { @@ -212,7 +221,7 @@ for (;;) { switch (c = *p++) { case '\0': - case CTLENDVAR: /* ??? */ + case CTLENDVAR: goto breakloop; case CTLQUOTEMARK: /* "$@" syntax adherence hack */ @@ -262,6 +271,10 @@ breakloop:; } +/* + * Perform tilde expansion, placing the result in the stack string and + * returning the next position in the input string to process. + */ STATIC char * exptilde(char *p, int flag) { @@ -367,12 +380,11 @@ int quotes = flag & (EXP_FULL | EXP_CASE | EXP_REDIR); int quoted; - /* * This routine is slightly over-complicated for * efficiency. First we make sure there is * enough space for the result, which may be bigger - * than the expression if we add exponentiation. Next we + * than the expression. Next we * scan backwards looking for the start of arithmetic. If the * next previous character is a CTLESC character, then we * have to rescan starting from the beginning since CTLESC @@ -413,9 +425,8 @@ /* - * Expand stuff in backwards quotes. + * Perform command substitution. */ - STATIC void expbackq(union node *cmd, int quoted, int flag) { @@ -974,6 +985,12 @@ * Break the argument string into pieces based upon IFS and add the * strings to the argument list. The regions of the string to be * searched for IFS characters have been stored by recordregion. + * CTLESC characters are preserved but have little effect in this pass + * other than escaping CTL* characters. In particular, they do not escape + * IFS characters: that should be done with the ifsregion mechanism. + * CTLQUOTEMARK characters are used to preserve empty quoted strings. + * This pass treats them as a regular character, making the string non-empty. + * Later, they are removed along with the other CTL* characters. */ STATIC void ifsbreakup(char *string, struct arglist *arglist) @@ -1075,15 +1092,14 @@ } +STATIC char expdir[PATH_MAX]; +#define expdir_end (expdir + sizeof(expdir)) /* - * Expand shell metacharacters. At this point, the only control characters - * should be escapes. The results are stored in the list exparg. + * Perform pathname generation and remove control characters. + * At this point, the only control characters should be CTLESC and CTLQUOTEMARK. + * The results are stored in the list exparg. */ - -STATIC char expdir[PATH_MAX]; -#define expdir_end (expdir + sizeof(expdir)) - STATIC void expandmeta(struct strlist *str, int flag __unused) { @@ -1469,7 +1485,7 @@ /* - * Remove any CTLESC characters from a string. + * Remove any CTLESC and CTLQUOTEMARK characters from a string. */ void ==== //depot/projects/soc2009/trasz_limits/bin/sh/miscbltin.c#5 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/miscbltin.c,v 1.42 2009/12/27 18:04:05 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/miscbltin.c,v 1.43 2010/09/08 20:35:43 jilles Exp $"); /* * Miscellaneous builtins. @@ -174,6 +174,7 @@ continue; if (backslash) { backslash = 0; + startword = 0; if (c != '\n') STPUTC(c, p); continue; ==== //depot/projects/soc2009/trasz_limits/bin/sh/mksyntax.c#7 (text+ko) ==== @@ -42,7 +42,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/sh/mksyntax.c,v 1.30 2010/08/08 21:04:27 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/mksyntax.c,v 1.31 2010/09/03 22:13:54 jilles Exp $"); /* * This program creates syntax.h and syntax.c. @@ -338,12 +338,12 @@ */ static const char *macro[] = { - "#define is_digit(c)\t((is_type+SYNBASE)[c] & ISDIGIT)", + "#define is_digit(c)\t((is_type+SYNBASE)[(int)c] & ISDIGIT)", "#define is_eof(c)\t((c) == PEOF)", - "#define is_alpha(c)\t(((c) < CTLESC || (c) > CTLQUOTEMARK) && isalpha((unsigned char) (c)))", - "#define is_name(c)\t(((c) < CTLESC || (c) > CTLQUOTEMARK) && ((c) == '_' || isalpha((unsigned char) (c))))", - "#define is_in_name(c)\t(((c) < CTLESC || (c) > CTLQUOTEMARK) && ((c) == '_' || isalnum((unsigned char) (c))))", - "#define is_special(c)\t((is_type+SYNBASE)[c] & (ISSPECL|ISDIGIT))", + "#define is_alpha(c)\t(((c) < CTLESC || (c) > CTLQUOTEMARK) && (is_type+SYNBASE)[(int)c] & (ISUPPER|ISLOWER))", + "#define is_name(c)\t(((c) < CTLESC || (c) > CTLQUOTEMARK) && (is_type+SYNBASE)[(int)c] & (ISUPPER|ISLOWER|ISUNDER))", + "#define is_in_name(c)\t(((c) < CTLESC || (c) > CTLQUOTEMARK) && (is_type+SYNBASE)[(int)c] & (ISUPPER|ISLOWER|ISUNDER|ISDIGIT))", + "#define is_special(c)\t((is_type+SYNBASE)[(int)c] & (ISSPECL|ISDIGIT))", NULL }; ==== //depot/projects/soc2009/trasz_limits/bin/sh/sh.1#14 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 -.\" $FreeBSD: src/bin/sh/sh.1,v 1.143 2010/08/22 13:04:00 jilles Exp $ +.\" $FreeBSD: src/bin/sh/sh.1,v 1.144 2010/09/10 13:40:31 jilles Exp $ .\" -.Dd August 22, 2010 +.Dd September 10, 2010 .Dt SH 1 .Os .Sh NAME @@ -2455,8 +2455,6 @@ .Xr echo 1 , .Xr ed 1 , .Xr emacs 1 , -.Xr expr 1 , -.Xr getopt 1 , .Xr pwd 1 , .Xr test 1 , .Xr vi 1 , ==== //depot/projects/soc2009/trasz_limits/bin/sh/var.c#9 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/var.c,v 1.47 2010/06/02 19:16:58 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/var.c,v 1.48 2010/09/11 14:15:50 jilles Exp $"); #include #include @@ -431,11 +431,15 @@ { struct strlist *sp; struct var *v; + char *result; + result = NULL; for (sp = cmdenviron ; sp ; sp = sp->next) { if (varequal(sp->text, name)) - return strchr(sp->text, '=') + 1; + result = strchr(sp->text, '=') + 1; } + if (result != NULL) + return result; for (v = *hashvar(name) ; v ; v = v->next) { if (varequal(v->text, name)) { if ((v->flags & VUNSET) ==== //depot/projects/soc2009/trasz_limits/bin/test/test.1#3 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)test.1 8.1 (Berkeley) 5/31/93 -.\" $FreeBSD: src/bin/test/test.1,v 1.28 2010/08/28 16:32:01 brucec Exp $ +.\" $FreeBSD: src/bin/test/test.1,v 1.31 2010/09/11 10:49:56 brucec Exp $ .\" -.Dd July 31, 2006 +.Dd September 10, 2010 .Dt TEST 1 .Os .Sh NAME @@ -282,7 +282,7 @@ or .Ar expression2 are true. -.It Cm \&( Ns Ar expression Ns Cm \&) +.It Cm \&( Ar expression Cm \&) True if expression is true. .El .Pp @@ -302,7 +302,7 @@ The .Nm grammar is inherently ambiguous. -In order to ensure a degree of consistency, +In order to assure a degree of consistency, the cases described in the .St -p1003.2 , section D11.2/4.62.4, standard @@ -310,6 +310,14 @@ standards document. All other cases are subject to the ambiguity in the command semantics. +.Pp +In particular, only expressions containing +.Fl a , +.Fl o , +.Cm \&( +or +.Cm \&) +can be ambiguous. .Sh EXIT STATUS The .Nm @@ -338,12 +346,11 @@ Both sides are always evaluated in .Fl a and -.Fl o , -unlike in the logical operators of -.Xr sh 1 . +.Fl o . For instance, the writable status of .Pa file will be tested by the following command even though the former expression indicated false, which results in a gratuitous access to the file system: -.Pp .Dl "[ -z abc -a -w file ]" +To avoid this, write +.Dl "[ -z abc ] && [ -w file ]" ==== //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c#5 (text+ko) ==== @@ -3333,12 +3333,38 @@ int cb_all; int cb_first; int cb_newer; + char cb_poolname[ZPOOL_MAXNAMELEN]; int cb_argc; uint64_t cb_version; char **cb_argv; } upgrade_cbdata_t; static int +is_root_pool(zpool_handle_t *zhp) +{ + static struct statfs sfs; + static char *poolname = NULL; + static boolean_t stated = B_FALSE; + char *slash; + + if (!stated) { + stated = B_TRUE; + if (statfs("/", &sfs) == -1) { + (void) fprintf(stderr, + "Unable to stat root file system: %s.\n", + strerror(errno)); + return (0); + } + if (strcmp(sfs.f_fstypename, "zfs") != 0) + return (0); + poolname = sfs.f_mntfromname; + if ((slash = strchr(poolname, '/')) != NULL) + *slash = '\0'; + } + return (poolname != NULL && strcmp(poolname, zpool_get_name(zhp)) == 0); +} + +static int upgrade_cb(zpool_handle_t *zhp, void *arg) { upgrade_cbdata_t *cbp = arg; @@ -3371,6 +3397,12 @@ if (!ret) { (void) printf(gettext("Successfully upgraded " "'%s'\n\n"), zpool_get_name(zhp)); + if (cbp->cb_poolname[0] == '\0' && + is_root_pool(zhp)) { + (void) strlcpy(cbp->cb_poolname, + zpool_get_name(zhp), + sizeof(cbp->cb_poolname)); + } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Sep 13 13:58:04 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 194FE1065675; Mon, 13 Sep 2010 13:58:04 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D00FA1065694 for ; Mon, 13 Sep 2010 13:58:03 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id BC7058FC0A for ; Mon, 13 Sep 2010 13:58:03 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o8DDw3kj085755 for ; Mon, 13 Sep 2010 13:58:03 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o8DDw39L085752 for perforce@freebsd.org; Mon, 13 Sep 2010 13:58:03 GMT (envelope-from trasz@freebsd.org) Date: Mon, 13 Sep 2010 13:58:03 GMT Message-Id: <201009131358.o8DDw39L085752@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 183712 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Sep 2010 13:58:04 -0000 http://p4web.freebsd.org/@@183712?ac=10 Change 183712 by trasz@trasz_victim on 2010/09/13 13:58:02 Try to fix panics I've been seeing occasionaly. Affected files ... .. //depot/projects/soc2009/trasz_limits/sys/vm/swap_pager.c#8 edit .. //depot/projects/soc2009/trasz_limits/sys/vm/vm_pageout.c#16 edit Differences ... ==== //depot/projects/soc2009/trasz_limits/sys/vm/swap_pager.c#8 (text+ko) ==== @@ -2438,6 +2438,11 @@ vm_map_entry_t cur; int count = 0; +#if 0 + /* Panics the kernel at startup. */ + KASSERT(vm_map_locked(map), ("vm_map not locked")); +#endif + for (cur = map->header.next; cur != &map->header; cur = cur->next) { vm_object_t object; ==== //depot/projects/soc2009/trasz_limits/sys/vm/vm_pageout.c#16 (text+ko) ==== @@ -1722,8 +1722,11 @@ * I want to get a better feeling on how the memory * management works. In other words, it's post-shm task. */ - size = vmspace_swap_count(vm); - rusage_set(p, RUSAGE_SWAP, IDX_TO_OFF(size)); + if (vm_map_trylock_read(&vm->vm_map)) { + size = vmspace_swap_count(vm); + vm_map_unlock_read(&vm->vm_map); + rusage_set(p, RUSAGE_SWAP, IDX_TO_OFF(size)); + } #endif vmspace_free(vm); } From owner-p4-projects@FreeBSD.ORG Tue Sep 14 14:56:34 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B50FE1065679; Tue, 14 Sep 2010 14:56:34 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1AB86106564A for ; Tue, 14 Sep 2010 14:56:34 +0000 (UTC) (envelope-from ken@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 08EAC8FC1A for ; Tue, 14 Sep 2010 14:56:33 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o8EEuXwh099614 for ; Tue, 14 Sep 2010 14:56:33 GMT (envelope-from ken@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o8EEuX6X099611 for perforce@freebsd.org; Tue, 14 Sep 2010 14:56:33 GMT (envelope-from ken@FreeBSD.org) Date: Tue, 14 Sep 2010 14:56:33 GMT Message-Id: <201009141456.o8EEuX6X099611@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to ken@FreeBSD.org using -f From: Ken Merry To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 183757 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Sep 2010 14:56:35 -0000 http://p4web.freebsd.org/@@183757?ac=10 Change 183757 by ken@ken.spectra.vm-freebsd on 2010/09/14 14:56:13 Report data overruns properly. Submitted by: scottl Affected files ... .. //depot/projects/mps/src/sys/dev/mps/mps_sas.c#2 edit Differences ... ==== //depot/projects/mps/src/sys/dev/mps/mps_sas.c#2 (text+ko) ==== @@ -1219,11 +1219,9 @@ ccb->ccb_h.status = CAM_REQ_CMP; break; case MPI2_IOCSTATUS_SCSI_DATA_OVERRUN: - /* - * XXX any way to report this? - */ + /* resid is ignored for this condition */ ccb->csio.resid = 0; - ccb->ccb_h.status = CAM_REQ_CMP; + ccb->ccb_h.status = CAM_DATA_RUN_ERR; break; case MPI2_IOCSTATUS_SCSI_INVALID_DEVHANDLE: case MPI2_IOCSTATUS_SCSI_DEVICE_NOT_THERE: From owner-p4-projects@FreeBSD.ORG Tue Sep 14 15:03:07 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 47B741065675; Tue, 14 Sep 2010 15:03:07 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0735D1065674 for ; Tue, 14 Sep 2010 15:03:07 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id E834F8FC1A for ; Tue, 14 Sep 2010 15:03:06 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o8EF36Ye001619 for ; Tue, 14 Sep 2010 15:03:06 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o8EF36bJ001616 for perforce@freebsd.org; Tue, 14 Sep 2010 15:03:06 GMT (envelope-from rene@FreeBSD.org) Date: Tue, 14 Sep 2010 15:03:06 GMT Message-Id: <201009141503.o8EF36bJ001616@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 183758 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Sep 2010 15:03:07 -0000 http://p4web.freebsd.org/@@183758?ac=10 Change 183758 by rene@rene_acer on 2010/09/14 15:02:03 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#70 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#51 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#44 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/geom/chapter.sgml#15 integrate .. //depot/projects/docproj_nl/share/pgpkeys/arved.key#2 integrate .. //depot/projects/docproj_nl/share/sgml/mirrors.xml#22 integrate .. //depot/projects/docproj_nl/www/en/developers.sgml#42 integrate .. //depot/projects/docproj_nl/www/en/donations/donors.sgml#34 integrate .. //depot/projects/docproj_nl/www/share/sgml/commercial.isp.xml#18 integrate .. //depot/projects/docproj_nl/www/share/sgml/events.xml#32 integrate .. //depot/projects/docproj_nl/www/share/sgml/news.xml#89 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#70 (text+ko) ==== @@ -1,4 +1,4 @@ - + + aaron@FreeBSD.org"> @@ -68,6 +68,8 @@ andreas@FreeBSD.org"> +andreast@FreeBSD.org"> + andrew@FreeBSD.org"> andy@FreeBSD.org"> @@ -88,7 +90,7 @@ arun@FreeBSD.org"> -arved@FreeBSD.org"> +arved@FreeBSD.org"> asami@FreeBSD.org"> ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/geom/chapter.sgml#15 (text+ko) ==== @@ -1,10 +1,10 @@ @@ -766,7 +766,7 @@ Om ondersteuning in te schakelen voor gjournal, moet de kernel over de volgende optie - beschikken, welke standaard is op 7.X-systemen: + beschikken, welke standaard is op &os; 7.X-systemen: options UFS_GJOURNAL @@ -813,12 +813,10 @@ ad4s1 en ad4s2 allebei slices zijn, dan zal gjournal een ad4s1.journal en een - ad4s2.journal creëeren. In het - geval dat het commando twee keer gestart wordt, wordt het - resultaat journals. + ad4s2.journal creëeren. - In sommige gevallen kan het gewenst zijn om het logboek op een + Voor performance doeleinden is het gewenst om het logboek op een andere schijf te bewaren. Voor deze gevallen moet de logboekleverancier of het opslagapparaat gespecificeerd worden achter het apparaat waarop de logboek functionaliteit aangebracht ==== //depot/projects/docproj_nl/share/pgpkeys/arved.key#2 (text+ko) ==== @@ -1,15 +1,13 @@ - + -uid Tilman Linneweh -uid Tilman Linneweh -uid Tilman Linneweh -sub 1024g/FA351986 2002-06-03 [expires: 2009-06-15] +uid Tilman Keskinöz +uid Tilman Keskinöz +sub 1024g/FA351986 2002-06-03 [expires: 2013-09-07] ]]> >> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Sep 14 15:17:20 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9C4421065675; Tue, 14 Sep 2010 15:17:20 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3A911106566C for ; Tue, 14 Sep 2010 15:17:20 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 282A98FC19 for ; Tue, 14 Sep 2010 15:17:20 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o8EFHKsb004460 for ; Tue, 14 Sep 2010 15:17:20 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o8EFHJLm004457 for perforce@freebsd.org; Tue, 14 Sep 2010 15:17:19 GMT (envelope-from rene@FreeBSD.org) Date: Tue, 14 Sep 2010 15:17:19 GMT Message-Id: <201009141517.o8EFHJLm004457@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 183759 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Sep 2010 15:17:20 -0000 http://p4web.freebsd.org/@@183759?ac=10 Change 183759 by rene@rene_acer on 2010/09/14 15:16:52 MFen the Dutch Handbook, plus language/whitespace fixes: - advanced-networking 1.432 -> 1.433 - config 1.243 -> 1.244 Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#50 edit .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/config/chapter.sgml#20 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#50 (text+ko) ==== @@ -4,7 +4,7 @@ $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml,v 1.23 2010/09/05 14:23:54 remko Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml - %SRCID% 1.432 + %SRCID% 1.433 --> @@ -1908,7 +1908,7 @@ Op machine A: &prompt.root; ifconfig wlan0 create wlandev ath0 wlanmode adhoc -&prompt.root; ifconfig wlan0 inet 192.168.0.1 netmask 255.255.255.0 ssid +&prompt.root; ifconfig wlan0 inet 192.168.0.1 netmask 255.255.255.0 ssid freebsdap wlan0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> metric 0 mtu 1500 ether 00:11:95:c3:0d:ac @@ -1995,9 +1995,9 @@ welke beveiligingsprotocollen ingesteld kunnen worden op het toegangspunt. - Het draadloze apparaat kan enkel in hostap-modues worden + Het draadloze apparaat kan enkel in hostap-modus worden gezet tijdens het creeëren van het netwerk pseudo-device - dus vooraf aangemaakte apparaten moeten eerst verwijderd + dus een vooraf aangemaakt apparaat moet eerst verwijderd worden: &prompt.root; ifconfig wlan0 destroy ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/config/chapter.sgml#20 (text+ko) ==== @@ -4,7 +4,7 @@ $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/config/chapter.sgml,v 1.22 2010/09/06 08:06:09 remko Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/config/chapter.sgml - %SRCID% 1.243 + %SRCID% 1.244 --> @@ -1233,8 +1233,8 @@ /usr/share/examples/etc/hosts. - Als internet toegang benodigd is met dit apparaat, kan - het zijn dat de default gateway, en de naamserver handmatig + Als internettoegang nodig is met dit apparaat, kan + het zijn dat de default gateway en de naamserver handmatig moeten worden ingesteld: &prompt.root; echo 'defaultrouter="your_default_router"' >> /etc/rc.conf @@ -1310,7 +1310,7 @@ van met 192.168.1.2 als dit geconfigureerd is in het /etc/hosts bestand. - + Problemen oplossen @@ -3084,7 +3084,7 @@ serieële poort/kabel voor de serieële console of een Firewire poort/kabel voor &man.dcons.4;, en vaardigheden in het debuggen van de kernel. - + Om een probleem te kunnen isoleren helpt het om zoveel mogelijk stuurprogramma's uit de kernel te halen. Als dit werkt, kan er teruggewerkt worden naar het stuurprogramma dat From owner-p4-projects@FreeBSD.ORG Tue Sep 14 15:43:41 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A76AE1065673; Tue, 14 Sep 2010 15:43:41 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 68DBD106566C for ; Tue, 14 Sep 2010 15:43:41 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 53C2F8FC25 for ; Tue, 14 Sep 2010 15:43:41 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o8EFhfJR010153 for ; Tue, 14 Sep 2010 15:43:41 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o8EFhf3a010150 for perforce@freebsd.org; Tue, 14 Sep 2010 15:43:41 GMT (envelope-from rene@FreeBSD.org) Date: Tue, 14 Sep 2010 15:43:41 GMT Message-Id: <201009141543.o8EFhf3a010150@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 183761 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Sep 2010 15:43:41 -0000 http://p4web.freebsd.org/@@183761?ac=10 Change 183761 by rene@rene_acer on 2010/09/14 15:43:39 Add a trailing space on purpose to fix rendering Submitted by: remko Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#51 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#51 (text+ko) ==== @@ -1908,7 +1908,7 @@ Op machine A: &prompt.root; ifconfig wlan0 create wlandev ath0 wlanmode adhoc -&prompt.root; ifconfig wlan0 inet 192.168.0.1 netmask 255.255.255.0 ssid +&prompt.root; ifconfig wlan0 inet 192.168.0.1 netmask 255.255.255.0 ssid freebsdap wlan0: flags=8843<UP,BROADCAST,RUNNING,SIMPLEX,MULTICAST> metric 0 mtu 1500 ether 00:11:95:c3:0d:ac From owner-p4-projects@FreeBSD.ORG Tue Sep 14 19:49:27 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 281A91065673; Tue, 14 Sep 2010 19:49:27 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DF0821065670 for ; Tue, 14 Sep 2010 19:49:26 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id CAB638FC1D for ; Tue, 14 Sep 2010 19:49:26 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o8EJnQr0059496 for ; Tue, 14 Sep 2010 19:49:26 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o8EJnQJ7059493 for perforce@freebsd.org; Tue, 14 Sep 2010 19:49:26 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 14 Sep 2010 19:49:26 GMT Message-Id: <201009141949.o8EJnQJ7059493@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 183770 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Sep 2010 19:49:27 -0000 http://p4web.freebsd.org/@@183770?ac=10 Change 183770 by hselasky@hselasky_laptop001 on 2010/09/14 19:49:07 LibUSB: - correct manual page. PR: usb/150546 Affected files ... .. //depot/projects/usb/src/lib/libusb/libusb.3#24 edit Differences ... ==== //depot/projects/usb/src/lib/libusb/libusb.3#24 (text+ko) ==== @@ -379,7 +379,7 @@ . .Pp .Ft int -.Fn libusb_control_transfer "libusb_device_handle *devh" "uint8_t bmRequestType" "uint16_t wIndex" "unsigned char *data" "uint16_t wLength" "unsigned int timeout" +.Fn libusb_control_transfer "libusb_device_handle *devh" "uint8_t bmRequestType" "uint8_t bRequest" "uint16_t wValue" "uint16_t wIndex" "unsigned char *data" "uint16_t wLength" "unsigned int timeout" Perform a USB control transfer. Returns 0 on success, LIBUSB_ERROR_TIMEOUT if the transfer timeout, LIBUSB_ERROR_PIPE if the control request was not supported, LIBUSB_ERROR_NO_DEVICE if the device has been disconnected and From owner-p4-projects@FreeBSD.ORG Tue Sep 14 21:37:47 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6F5E61065674; Tue, 14 Sep 2010 21:37:47 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 31921106566B for ; Tue, 14 Sep 2010 21:37:47 +0000 (UTC) (envelope-from ken@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 1E7528FC1A for ; Tue, 14 Sep 2010 21:37:47 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o8ELbleu082513 for ; Tue, 14 Sep 2010 21:37:47 GMT (envelope-from ken@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o8ELbk1R082510 for perforce@freebsd.org; Tue, 14 Sep 2010 21:37:46 GMT (envelope-from ken@FreeBSD.org) Date: Tue, 14 Sep 2010 21:37:46 GMT Message-Id: <201009142137.o8ELbk1R082510@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to ken@FreeBSD.org using -f From: Ken Merry To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 183774 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Sep 2010 21:37:47 -0000 http://p4web.freebsd.org/@@183774?ac=10 Change 183774 by ken@ken.spectra.vm-freebsd on 2010/09/14 21:37:13 Add a man page for the mps(4) driver, and reference it in the mpt(4) driver man page. Sponsored by: Spectra Logic Corporation Affected files ... .. //depot/projects/mps/src/share/man/man4/Makefile#2 edit .. //depot/projects/mps/src/share/man/man4/mps.4#1 add .. //depot/projects/mps/src/share/man/man4/mpt.4#2 edit Differences ... ==== //depot/projects/mps/src/share/man/man4/Makefile#2 (text+ko) ==== @@ -219,6 +219,7 @@ mmcsd.4 \ mn.4 \ mouse.4 \ + mps.4 \ mpt.4 \ msk.4 \ mtio.4 \ ==== //depot/projects/mps/src/share/man/man4/mpt.4#2 (text+ko) ==== @@ -33,7 +33,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/mpt.4,v 1.20 2010/06/02 10:20:23 uqs Exp $ +.\" $FreeBSD: head/share/man/man4/mpt.4 208732 2010-06-02 10:20:23Z uqs $ .\" .Dd May 13, 2010 .Dt MPT 4 @@ -152,6 +152,7 @@ .Xr cd 4 , .Xr ch 4 , .Xr da 4 , +.Xr mps 4 , .Xr pci 4 , .Xr sa 4 , .Xr scsi 4 , From owner-p4-projects@FreeBSD.ORG Wed Sep 15 16:02:58 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 528AF1065675; Wed, 15 Sep 2010 16:02:58 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 14CD0106566C for ; Wed, 15 Sep 2010 16:02:58 +0000 (UTC) (envelope-from ken@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id DDDA18FC14 for ; Wed, 15 Sep 2010 16:02:57 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o8FG2vBp033647 for ; Wed, 15 Sep 2010 16:02:57 GMT (envelope-from ken@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o8FG2vwQ033644 for perforce@freebsd.org; Wed, 15 Sep 2010 16:02:57 GMT (envelope-from ken@FreeBSD.org) Date: Wed, 15 Sep 2010 16:02:57 GMT Message-Id: <201009151602.o8FG2vwQ033644@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to ken@FreeBSD.org using -f From: Ken Merry To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 183806 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Sep 2010 16:02:58 -0000 http://p4web.freebsd.org/@@183806?ac=10 Change 183806 by ken@ken.spectra.vm-freebsd on 2010/09/15 16:02:29 Fix a typo. Submitted by: pluknet at gmail dot com Affected files ... .. //depot/projects/mps/src/share/man/man4/mps.4#2 edit Differences ... ==== //depot/projects/mps/src/share/man/man4/mps.4#2 (text+ko) ==== @@ -51,7 +51,7 @@ Or, to load the driver as a module at boot, place the following line in .Xr loader.conf 5 : .Bd -literal -offset indent -mpt_load="YES" +mps_load="YES" .Ed .Sh DESCRIPTION The From owner-p4-projects@FreeBSD.ORG Wed Sep 15 18:33:13 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 095201065675; Wed, 15 Sep 2010 18:33:13 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C054B1065672 for ; Wed, 15 Sep 2010 18:33:12 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id AEA228FC1C for ; Wed, 15 Sep 2010 18:33:12 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o8FIXCvC064976 for ; Wed, 15 Sep 2010 18:33:12 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o8FIXCCM064973 for perforce@freebsd.org; Wed, 15 Sep 2010 18:33:12 GMT (envelope-from trasz@freebsd.org) Date: Wed, 15 Sep 2010 18:33:12 GMT Message-Id: <201009151833.o8FIXCCM064973@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 183814 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Sep 2010 18:33:13 -0000 http://p4web.freebsd.org/@@183814?ac=10 Change 183814 by trasz@trasz_victim on 2010/09/15 18:32:12 Drop a wrong KASSERT, break out resetting per-vmspace counters into its own routine. Affected files ... .. //depot/projects/soc2009/trasz_limits/sys/vm/swap_pager.c#9 edit .. //depot/projects/soc2009/trasz_limits/sys/vm/vm_map.c#21 edit Differences ... ==== //depot/projects/soc2009/trasz_limits/sys/vm/swap_pager.c#9 (text+ko) ==== @@ -2438,11 +2438,6 @@ vm_map_entry_t cur; int count = 0; -#if 0 - /* Panics the kernel at startup. */ - KASSERT(vm_map_locked(map), ("vm_map not locked")); -#endif - for (cur = map->header.next; cur != &map->header; cur = cur->next) { vm_object_t object; ==== //depot/projects/soc2009/trasz_limits/sys/vm/vm_map.c#21 (text+ko) ==== @@ -311,6 +311,20 @@ vmspace_zinit, vmspace_zfini, UMA_ALIGN_PTR, UMA_ZONE_NOFREE); } +#ifdef CONTAINERS +static void +vmspace_container_reset(struct proc *p) +{ + + rusage_set(p, RUSAGE_DATA, 0); + rusage_set(p, RUSAGE_STACK, 0); + rusage_set(p, RUSAGE_RSS, 0); + rusage_set(p, RUSAGE_MEMLOCK, 0); + rusage_set(p, RUSAGE_VMEM, 0); + rusage_set(p, RUSAGE_SWAP, 0); +} +#endif + static inline void vmspace_dofree(struct vmspace *vm) { @@ -413,12 +427,7 @@ vmspace_dofree(vm); } #ifdef CONTAINERS - rusage_set(p, RUSAGE_DATA, 0); - rusage_set(p, RUSAGE_STACK, 0); - rusage_set(p, RUSAGE_RSS, 0); - rusage_set(p, RUSAGE_MEMLOCK, 0); - rusage_set(p, RUSAGE_VMEM, 0); - rusage_set(p, RUSAGE_SWAP, 0); + vmspace_container_reset(p); #endif } From owner-p4-projects@FreeBSD.ORG Thu Sep 16 06:57:13 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5BC4C1065674; Thu, 16 Sep 2010 06:57:13 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 10FC81065670 for ; Thu, 16 Sep 2010 06:57:13 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id F39068FC1E for ; Thu, 16 Sep 2010 06:57:12 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o8G6vCKX019060 for ; Thu, 16 Sep 2010 06:57:12 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o8G6vCgO019057 for perforce@freebsd.org; Thu, 16 Sep 2010 06:57:12 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 16 Sep 2010 06:57:12 GMT Message-Id: <201009160657.o8G6vCgO019057@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 183845 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Sep 2010 06:57:13 -0000 http://p4web.freebsd.org/@@183845?ac=10 Change 183845 by hselasky@hselasky_laptop001 on 2010/09/16 06:56:29 LibUSB documentation: - fix spelling - reported by: Robert Jenssen Affected files ... .. //depot/projects/usb/src/lib/libusb/libusb.3#25 edit Differences ... ==== //depot/projects/usb/src/lib/libusb/libusb.3#25 (text+ko) ==== @@ -313,7 +313,7 @@ . .Pp .Ft int -.Fn libsub_get_active_config_descriptor "libusb_device *dev" "libusb_device_descriptor **config" +.Fn libsub_get_active_config_descriptor "libusb_device *dev" "struct libusb_config_descriptor **config" Get the USB configuration descriptor for the active configuration. Returns 0 on success, returns LIBUSB_ERROR_NOT_FOUND if the device is in unconfigured state and return another LIBUSB_ERROR code on error. From owner-p4-projects@FreeBSD.ORG Thu Sep 16 12:20:01 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1D25B10656A3; Thu, 16 Sep 2010 12:20:01 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BAFD11065679 for ; Thu, 16 Sep 2010 12:20:00 +0000 (UTC) (envelope-from lz@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id A50988FC1E for ; Thu, 16 Sep 2010 12:20:00 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o8GCK0nq097910 for ; Thu, 16 Sep 2010 12:20:00 GMT (envelope-from lz@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o8GCK0g2097907 for perforce@freebsd.org; Thu, 16 Sep 2010 12:20:00 GMT (envelope-from lz@FreeBSD.org) Date: Thu, 16 Sep 2010 12:20:00 GMT Message-Id: <201009161220.o8GCK0g2097907@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to lz@FreeBSD.org using -f From: Zheng Liu To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 183854 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Sep 2010 12:20:01 -0000 http://p4web.freebsd.org/@@183854?ac=10 Change 183854 by lz@gnehzuil-freebsd on 2010/09/16 12:19:28 Create a new ext4fs directory to create a new kernel module. Affected files ... .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2_alloc.c#6 delete .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2_balloc.c#6 delete .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2_bmap.c#6 delete .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2_dinode.h#5 delete .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2_dir.h#4 delete .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2_extents.c#10 delete .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2_extents.h#8 delete .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2_extern.h#5 delete .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2_htree.c#3 delete .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2_htree.h#4 delete .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2_inode.c#7 delete .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2_inode_cnv.c#8 delete .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2_lookup.c#7 delete .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2_mount.h#4 delete .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2_readwrite.c#11 delete .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2_rsv_win.h#8 delete .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2_subr.c#7 delete .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2_vfsops.c#14 delete .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2_vnops.c#5 delete .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/ext2fs.h#12 delete .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/fs.h#4 delete .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext2fs/inode.h#9 delete .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext2_alloc.c#1 add .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext2_balloc.c#1 add .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext2_bmap.c#1 add .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext2_dinode.h#1 add .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext2_dir.h#1 add .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext2_extents.c#1 add .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext2_extents.h#1 add .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext2_extern.h#1 add .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext2_htree.c#1 add .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext2_htree.h#1 add .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext2_inode.c#1 add .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext2_inode_cnv.c#1 add .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext2_lookup.c#1 add .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext2_mount.h#1 add .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext2_readwrite.c#1 add .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext2_rsv_win.h#1 add .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext2_subr.c#1 add .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext2_vfsops.c#1 add .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext2_vnops.c#1 add .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext2fs.h#1 add .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/fs.h#1 add .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/inode.h#1 add .. //depot/projects/soc2010/ext4fs/src/sys/modules/ext2fs/Makefile#3 delete .. //depot/projects/soc2010/ext4fs/src/sys/modules/ext4fs/Makefile#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Thu Sep 16 12:33:12 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BD49B106566C; Thu, 16 Sep 2010 12:33:11 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6751C1065679 for ; Thu, 16 Sep 2010 12:33:11 +0000 (UTC) (envelope-from lz@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 546FB8FC19 for ; Thu, 16 Sep 2010 12:33:11 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o8GCXBHT001835 for ; Thu, 16 Sep 2010 12:33:11 GMT (envelope-from lz@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o8GCXBFt001832 for perforce@freebsd.org; Thu, 16 Sep 2010 12:33:11 GMT (envelope-from lz@FreeBSD.org) Date: Thu, 16 Sep 2010 12:33:11 GMT Message-Id: <201009161233.o8GCXBFt001832@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to lz@FreeBSD.org using -f From: Zheng Liu To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 183855 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Sep 2010 12:33:12 -0000 http://p4web.freebsd.org/@@183855?ac=10 Change 183855 by lz@gnehzuil-freebsd on 2010/09/16 12:32:14 Rename file prefix name from ext2_ to ext4_. Affected files ... .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext2_alloc.c#2 delete .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext2_balloc.c#2 delete .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext2_bmap.c#2 delete .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext2_dinode.h#2 delete .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext2_dir.h#2 delete .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext2_extents.c#2 delete .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext2_extents.h#2 delete .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext2_extern.h#2 delete .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext2_htree.c#2 delete .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext2_htree.h#2 delete .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext2_inode.c#2 delete .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext2_inode_cnv.c#2 delete .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext2_lookup.c#2 delete .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext2_mount.h#2 delete .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext2_readwrite.c#2 delete .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext2_rsv_win.h#2 delete .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext2_subr.c#2 delete .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext2_vfsops.c#2 delete .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext2_vnops.c#2 delete .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext2fs.h#2 delete .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext4_alloc.c#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext4_balloc.c#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext4_bmap.c#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext4_dinode.h#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext4_dir.h#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext4_extents.c#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext4_extents.h#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext4_extern.h#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext4_htree.c#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext4_htree.h#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext4_inode.c#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext4_inode_cnv.c#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext4_lookup.c#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext4_mount.h#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext4_readwrite.c#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext4_rsv_win.h#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext4_subr.c#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext4_vfsops.c#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext4_vnops.c#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext4fs.h#1 branch .. //depot/projects/soc2010/ext4fs/src/sys/modules/ext4fs/Makefile#2 edit Differences ... ==== //depot/projects/soc2010/ext4fs/src/sys/modules/ext4fs/Makefile#2 (text+ko) ==== @@ -1,10 +1,10 @@ -# $FreeBSD: src/sys/modules/ext2fs/Makefile,v 1.7 2010/01/14 14:30:54 lulf Exp $ +# $FreeBSD: src/sys/modules/ext4fs/Makefile,v 1.7 2010/09/16 20:23:54 lz Exp $ -.PATH: ${.CURDIR}/../../fs/ext2fs -KMOD= ext2fs +.PATH: ${.CURDIR}/../../fs/ext4fs +KMOD= ext4fs SRCS= opt_ddb.h opt_quota.h opt_suiddir.h vnode_if.h \ - ext2_alloc.c ext2_balloc.c ext2_bmap.c ext2_extents.c \ - ext2_inode.c ext2_inode_cnv.c ext2_lookup.c ext2_subr.c \ - ext2_vfsops.c ext2_vnops.c ext2_htree.c + ext4_alloc.c ext4_balloc.c ext4_bmap.c ext4_extents.c \ + ext4_inode.c ext4_inode_cnv.c ext4_lookup.c ext4_subr.c \ + ext4_vfsops.c ext4_vnops.c ext4_htree.c .include From owner-p4-projects@FreeBSD.ORG Thu Sep 16 13:25:49 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DFA4F10656A4; Thu, 16 Sep 2010 13:25:48 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 896D410656A3 for ; Thu, 16 Sep 2010 13:25:48 +0000 (UTC) (envelope-from lz@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 747138FC33 for ; Thu, 16 Sep 2010 13:25:48 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o8GDPm0h012717 for ; Thu, 16 Sep 2010 13:25:48 GMT (envelope-from lz@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o8GDPmEc012714 for perforce@freebsd.org; Thu, 16 Sep 2010 13:25:48 GMT (envelope-from lz@FreeBSD.org) Date: Thu, 16 Sep 2010 13:25:48 GMT Message-Id: <201009161325.o8GDPmEc012714@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to lz@FreeBSD.org using -f From: Zheng Liu To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 183858 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Sep 2010 13:25:49 -0000 http://p4web.freebsd.org/@@183858?ac=10 Change 183858 by lz@gnehzuil-freebsd on 2010/09/16 13:25:00 Make ext4fs can be compiled. Affected files ... .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext4_alloc.c#2 edit .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext4_balloc.c#2 edit .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext4_bmap.c#2 edit .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext4_dinode.h#2 edit .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext4_dir.h#2 edit .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext4_extents.c#2 edit .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext4_extents.h#2 edit .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext4_extern.h#2 edit .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext4_htree.c#2 edit .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext4_htree.h#2 edit .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext4_inode.c#2 edit .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext4_inode_cnv.c#2 edit .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext4_lookup.c#2 edit .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext4_mount.h#2 edit .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext4_readwrite.c#2 edit .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext4_rsv_win.h#2 edit .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext4_subr.c#2 edit .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext4_vfsops.c#2 edit .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext4_vnops.c#2 edit .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext4fs.h#2 edit .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/fs.h#2 edit .. //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/inode.h#2 edit Differences ... ==== //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext4_alloc.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ * SUCH DAMAGE. * * @(#)ffs_alloc.c 8.8 (Berkeley) 2/21/94 - * $FreeBSD: src/sys/fs/ext2fs/ext2_alloc.c,v 1.1 2010/01/14 14:30:54 lulf Exp $ + * $FreeBSD: src/sys/fs/ext4fs/ext4_alloc.c,v 1.1 2010/09/16 20:35:00 lz Exp $ */ #include @@ -45,12 +45,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include /* Just for clear */ #define phy_blk(cg, fs) (((cg) * (fs->e2fs->e2fs_fpg)) + fs->e2fs->e2fs_first_dblock) ==== //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext4_balloc.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ * SUCH DAMAGE. * * @(#)ffs_balloc.c 8.4 (Berkeley) 9/23/93 - * $FreeBSD: src/sys/fs/ext2fs/ext2_balloc.c,v 1.1 2010/01/14 14:30:54 lulf Exp $ + * $FreeBSD: src/sys/fs/ext4fs/ext4_balloc.c,v 1.1 2010/09/16 20:35:00 lz Exp $ */ #include @@ -44,12 +44,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include /* * Balloc defines the structure of file system storage * by allocating the physical blocks on a device given ==== //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext4_bmap.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * @(#)ufs_bmap.c 8.7 (Berkeley) 3/21/95 - * $FreeBSD: src/sys/fs/ext2fs/ext2_bmap.c,v 1.1 2010/01/14 14:30:54 lulf Exp $ + * $FreeBSD: src/sys/fs/ext4fs/ext4_bmap.c,v 1.1 2010/09/16 20:36:00 lz Exp $ */ #include @@ -45,12 +45,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include static int ext4_bmapext(struct vnode *, int32_t, int64_t *, int *, int *); ==== //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext4_dinode.h#2 (text+ko) ==== @@ -23,11 +23,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/ext2fs/ext2_dinode.h,v 1.1 2010/01/14 14:30:54 lulf Exp $ + * $FreeBSD: src/sys/fs/ext4fs/ext4_dinode.h,v 1.1 2010/09/16 20:34:00 lz Exp $ */ -#ifndef _FS_EXT2FS_EXT2_DINODE_H_ -#define _FS_EXT2FS_EXT2_DINODE_H_ +#ifndef _FS_EXT4FS_EXT4_DINODE_H_ +#define _FS_EXT4FS_EXT4_DINODE_H_ /* * Inode flags @@ -121,5 +121,4 @@ u_int32_t e2di_version_hi; }; -#endif /* _FS_EXT2FS_EXT2_DINODE_H_ */ - +#endif /* _FS_EXT4FS_EXT4_DINODE_H_ */ ==== //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext4_dir.h#2 (text+ko) ==== @@ -23,11 +23,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/ext2fs/ext2_dir.h,v 1.1 2010/01/14 14:30:54 lulf Exp $ + * $FreeBSD: src/sys/fs/ext4fs/ext4_dir.h,v 1.1 2010/09/16 20:37:00 lz Exp $ */ -#ifndef _FS_EXT2FS_EXT2_DIR_H_ -#define _FS_EXT2FS_EXT2_DIR_H_ +#ifndef _FS_EXT4FS_EXT4_DIR_H_ +#define _FS_EXT4FS_EXT4_DIR_H_ /* * Structure of a directory entry @@ -77,5 +77,4 @@ #define EXT2_DIR_ROUND (EXT2_DIR_PAD - 1) #define EXT2_DIR_REC_LEN(name_len) (((name_len) + 8 + EXT2_DIR_ROUND) & \ ~EXT2_DIR_ROUND) -#endif /* !_FS_EXT2FS_EXT2_DIR_H_ */ - +#endif /* !_FS_EXT4FS_EXT4_DIR_H_ */ ==== //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext4_extents.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/ext2fs/ext2_extents.c,v 0.1 2010/07/02 17:22:00 lz Exp $ + * $FreeBSD: src/sys/fs/ext4fs/ext4_extents.c,v 0.1 2010/09/16 20:37:00 lz Exp $ */ #include @@ -36,12 +36,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include static void ext4_ext_binsearch_index(struct inode *, struct ext4_extent_path *, daddr_t); static void ext4_ext_binsearch(struct inode *, struct ext4_extent_path *, daddr_t); ==== //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext4_extents.h#2 (text+ko) ==== @@ -23,10 +23,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/ext2fs/ext2_extents.h,v 0.1 2010/06/22 18:01:51 lz Exp $ + * $FreeBSD: src/sys/fs/ext4fs/ext4_extents.h,v 0.1 2010/09/16 20:38:51 lz Exp $ */ -#ifndef _FS_EXT2FS_EXT2_EXTENTS_H_ -#define _FS_EXT2FS_EXT2_EXTENTS_H_ +#ifndef _FS_EXT4FS_EXT4_EXTENTS_H_ +#define _FS_EXT4FS_EXT4_EXTENTS_H_ #include @@ -100,4 +100,4 @@ struct ext4_extent_path *ext4_ext_find_extent(struct m_ext2fs *fs, struct inode *, daddr_t, struct ext4_extent_path *); -#endif /* !_FS_EXT2FS_EXT2_EXTENTS_H_ */ +#endif /* !_FS_EXT4FS_EXT4_EXTENTS_H_ */ ==== //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext4_extern.h#2 (text+ko) ==== @@ -33,11 +33,11 @@ * SUCH DAMAGE. * * @(#)ffs_extern.h 8.3 (Berkeley) 4/16/94 - * $FreeBSD: src/sys/fs/ext2fs/ext2_extern.h,v 1.1 2010/01/14 14:30:54 lulf Exp $ + * $FreeBSD: src/sys/fs/ext4fs/ext4_extern.h,v 1.1 2010/09/16 20:38:54 lz Exp $ */ -#ifndef _FS_EXT2FS_EXT2_EXTERN_H_ -#define _FS_EXT2FS_EXT2_EXTERN_H_ +#ifndef _FS_EXT4FS_EXT4_EXTERN_H_ +#define _FS_EXT4FS_EXT4_EXTERN_H_ struct ext2fs_dinode; struct indir; @@ -90,4 +90,4 @@ extern struct vop_vector ext2_vnodeops; extern struct vop_vector ext2_fifoops; -#endif /* !_FS_EXT2FS_EXT2_EXTERN_H_ */ +#endif /* !_FS_EXT4FS_EXT4_EXTERN_H_ */ ==== //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext4_htree.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/ext2fs/ext2_htree.c,v 0.1 2010/08/01 15:02:00 lz Exp $ + * $FreeBSD: src/sys/fs/ext4fs/ext4_htree.c,v 0.1 2010/09/16 20:39:00 lz Exp $ */ #include @@ -34,14 +34,14 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include static int ext4_get_limit(struct dirindex_entry *); static int ext4_root_limit(struct inode *, int); ==== //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext4_htree.h#2 (text+ko) ==== @@ -23,10 +23,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/ext2fs/ext2_htree.h,v 0.1 2010/08/01 14:45:00 lz Exp $ + * $FreeBSD: src/sys/fs/ext4fs/ext4_htree.h,v 0.1 2010/09/16 20:40:00 lz Exp $ */ -#ifndef _FS_EXT2FS_EXT2_HTREE_H_ -#define _FS_EXT2FS_EXT2_HTREE_H_ +#ifndef _FS_EXT4FS_EXT4_HTREE_H_ +#define _FS_EXT4FS_EXT4_HTREE_H_ #define DIRINDEX_HASH_LEGACY 0 #define DIRINDEX_HASH_HALF_MD4 1 @@ -99,4 +99,4 @@ int ext4_dirindex_lookup(struct vnode *, char *, int, doff_t *, struct buf **, doff_t *prevoffp); -#endif /* !_FS_EXT2FS_EXT2_HTREE_H_ */ +#endif /* !_FS_EXT4FS_EXT4_HTREE_H_ */ ==== //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext4_inode.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ * SUCH DAMAGE. * * @(#)ffs_inode.c 8.5 (Berkeley) 12/30/93 - * $FreeBSD: src/sys/fs/ext2fs/ext2_inode.c,v 1.1 2010/01/14 14:30:54 lulf Exp $ + * $FreeBSD: src/sys/fs/ext4fs/ext4_inode.c,v 1.1 2010/09/16 20:40:54 lz Exp $ */ #include @@ -47,11 +47,12 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include static int ext2_indirtrunc(struct inode *, int32_t, int32_t, int32_t, int, long *); @@ -154,6 +155,10 @@ fs = oip->i_e2fs; osize = oip->i_size; + EXT2_RSV_LOCK(oip); + ext2_discard_rsv(oip); + EXT2_RSV_UNLOCK(oip); + /* * Lengthen the size of the file. We must ensure that the * last byte of the file is allocated. Since the smallest @@ -485,6 +490,10 @@ if (prtactive && vrefcnt(vp) != 0) vprint("ext2_inactive: pushing active", vp); + EXT2_RSV_LOCK(ip); + ext2_discard_rsv(ip); + EXT2_RSV_UNLOCK(ip); + /* * Ignore inodes related to stale file handles. */ @@ -533,6 +542,14 @@ } vfs_hash_remove(vp); + EXT2_RSV_LOCK(ip); + if (ip->i_rsv != NULL) { + free(ip->i_rsv, M_EXT2NODE); + ip->i_rsv = NULL; + } + EXT2_RSV_UNLOCK(ip); + mtx_destroy(&ip->i_rsv_lock); + mtx_destroy(&ip->i_ext_lock); free(vp->v_data, M_EXT2NODE); ==== //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext4_inode_cnv.c#2 (text+ko) ==== @@ -19,7 +19,7 @@ * improvements that they make and grant CSL redistribution rights. * * Utah $Hdr$ - * $FreeBSD: src/sys/fs/ext2fs/ext2_inode_cnv.c,v 1.1 2010/01/14 14:30:54 lulf Exp $ + * $FreeBSD: src/sys/fs/ext4fs/ext4_inode_cnv.c,v 1.1 2010/09/16 20:41:00 lz Exp $ */ /* @@ -31,11 +31,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include void ext2_print_inode( in ) ==== //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext4_lookup.c#2 (text+ko) ==== @@ -38,7 +38,7 @@ * SUCH DAMAGE. * * @(#)ufs_lookup.c 8.6 (Berkeley) 4/1/94 - * $FreeBSD: src/sys/fs/ext2fs/ext2_lookup.c,v 1.1 2010/01/14 14:30:54 lulf Exp $ + * $FreeBSD: src/sys/fs/ext4fs/ext4_lookup.c,v 1.1 2010/09/16 20:42:54 lz Exp $ */ #include @@ -55,11 +55,12 @@ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #ifdef DIAGNOSTIC static int dirchk = 1; @@ -348,6 +349,25 @@ cnp->cn_namelen + 3) &~ 3; */ } + bmask = VFSTOEXT2(vdp->v_mount)->um_mountp->mnt_stat.f_iosize - 1; + + /* Usr hash directory index to search a large direcotries. */ + numdirpasses = 2; + prevoff = 0; + if (ext4_is_dirindex(dp)) { + switch (ext4_dirindex_lookup(vdp, cnp->cn_nameptr, + cnp->cn_namelen, &i_offset, &bp, NULL)) { + case 0: + ep = (struct ext2fs_direct_2 *)((char *)bp->b_data + + (i_offset & bmask)); + entryoffsetinblock = i_offset; + goto dirindex_found; + case ENOENT: + default: + break; + } + } + /* * If there is cached information on a previous search of * this directory, pick up where we last left off. @@ -359,7 +379,6 @@ * profiling time and hence has been removed in the interest * of simplicity. */ - bmask = VFSTOEXT2(vdp->v_mount)->um_mountp->mnt_stat.f_iosize - 1; if (nameiop != LOOKUP || i_diroff == 0 || i_diroff > dp->i_size) { entryoffsetinblock = 0; @@ -462,6 +481,7 @@ * reclen in ndp->ni_ufs area, and release * directory buffer. */ +dirindex_found: ino = ep->e2d_ino; goto found; } ==== //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext4_mount.h#2 (text+ko) ==== @@ -27,11 +27,11 @@ * SUCH DAMAGE. * * @(#)ufsmount.h 8.6 (Berkeley) 3/30/95 - * $FreeBSD: src/sys/fs/ext2fs/ext2_mount.h,v 1.1 2010/01/14 14:30:54 lulf Exp $ + * $FreeBSD: src/sys/fs/ext4fs/ext4_mount.h,v 1.1 2010/09/16 20:42:00 lz Exp $ */ -#ifndef _FS_EXT2FS_EXT2_MOUNT_H_ -#define _FS_EXT2FS_EXT2_MOUNT_H_ +#ifndef _FS_EXT4FS_EXT4_MOUNT_H_ +#define _FS_EXT4FS_EXT4_MOUNT_H_ #ifdef _KERNEL @@ -76,4 +76,4 @@ #define is_sequential(ump, a, b) ((b) == (a) + ump->um_seqinc) #endif /* _KERNEL */ -#endif +#endif /* _FS_EXT4FS_EXT4_MOUNT_H_ */ ==== //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext4_readwrite.c#2 (text+ko) ==== @@ -33,11 +33,11 @@ * SUCH DAMAGE. * * @(#)ufs_readwrite.c 8.7 (Berkeley) 1/21/94 - * $FreeBSD: src/sys/fs/ext2fs/ext2_readwrite.c,v 1.1 2010/01/14 14:30:54 lulf Exp $ + * $FreeBSD: src/sys/fs/ext4fs/ext4_readwrite.c,v 1.1 2010/09/16 20:43:00 lz Exp $ */ -#include -#include +#include +#include /* XXX TODO: remove these obfuscations (as in ffs_vnops.c). */ #define BLKSIZE(a, b, c) blksize(a, b, c) ==== //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext4_rsv_win.h#2 (text+ko) ==== @@ -23,10 +23,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/ext2fs/ext2_rsv_win.h,v 0.1 2010/05/08 12:41:51 lz Exp $ + * $FreeBSD: src/sys/fs/ext4fs/ext4_rsv_win.h,v 0.1 2010/09/16 20:43:51 lz Exp $ */ -#ifndef _FS_EXT2FS_EXT2_RSV_WIN_H_ -#define _FS_EXT2FS_EXT2_RSV_WIN_H_ +#ifndef _FS_EXT4FS_EXT4_RSV_WIN_H_ +#define _FS_EXT4FS_EXT4_RSV_WIN_H_ #include @@ -76,4 +76,4 @@ int ext2_alloc_rsv(struct inode *, int32_t, int32_t, int, struct ucred *, int32_t *); -#endif /* !_FS_EXT2FS_EXT2_RSV_WIN_H_ */ +#endif /* !_FS_EXT4FS_EXT4_RSV_WIN_H_ */ ==== //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext4_subr.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ * SUCH DAMAGE. * * @(#)ffs_subr.c 8.2 (Berkeley) 9/21/93 - * $FreeBSD: src/sys/fs/ext2fs/ext2_subr.c,v 1.1 2010/01/14 14:30:54 lulf Exp $ + * $FreeBSD: src/sys/fs/ext4fs/ext4_subr.c,v 1.1 2010/09/16 20:44:00 lz Exp $ */ #include @@ -46,11 +46,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #ifdef KDB void ext2_checkoverlap(struct buf *, struct inode *); ==== //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext4_vfsops.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ * SUCH DAMAGE. * * @(#)ffs_vfsops.c 8.8 (Berkeley) 4/18/94 - * $FreeBSD: src/sys/fs/ext2fs/ext2_vfsops.c,v 1.1 2010/01/14 14:30:54 lulf Exp $ + * $FreeBSD: src/sys/fs/ext4fs/ext4_vfsops.c,v 1.1 2010/09/16 20:44:00 lz Exp $ */ #include @@ -58,13 +58,13 @@ #include #include -#include -#include +#include +#include -#include -#include -#include -#include +#include +#include +#include +#include static int ext2_flushfiles(struct mount *mp, int flags, struct thread *td); static int ext2_mountfs(struct vnode *, struct mount *); @@ -98,6 +98,8 @@ int ronly); static int compute_sb_data(struct vnode * devvp, struct ext2fs * es, struct m_ext2fs * fs); +static int ext4_init_fg(struct m_ext2fs *); +static int find_most_set_bit(int64_t n); static const char *ext2_opts[] = { "from", "export", "acls", "noexec", "noatime", "union", "suiddir", "multilabel", "nosymfollow", @@ -353,6 +355,7 @@ fs->e2fs_ipb = fs->e2fs_bsize / EXT2_INODE_SIZE(fs); fs->e2fs_itpg = fs->e2fs_ipg /fs->e2fs_ipb; fs->e2fs_descpb = fs->e2fs_bsize / sizeof (struct ext2_gd); + fs->e2fs_descpbbits = find_most_set_bit(fs->e2fs_descpb); /* s_resuid / s_resgid ? */ fs->e2fs_gcount = (((int64_t)(es->e2fs_bcount_hi) << 32 | es->e2fs_bcount_lo) - es->e2fs_first_dblock + EXT2_BLOCKS_PER_GROUP(fs) - 1) / @@ -389,6 +392,9 @@ bp = NULL; } + /* initialize flex groups */ + ext4_init_fg(fs); + fs->e2fs_total_dir = 0; for (i=0; i < fs->e2fs_gcount; i++){ fs->e2fs_total_dir += (fs->e2fs_gd[i].ext2bgd_ndirs_lo); @@ -414,11 +420,77 @@ } if (E2FS_REV0_INODE_SIZE + fs->e2fs_want_extra_isize > - fs->e2fs_isize) + fs->e2fs_isize) { printf("EXT2-fs: no space for extra inode.\n"); + return (EIO); + } + + return (0); +} +/* + * Initialize flex groups data structure. + */ +static int +ext4_init_fg(struct m_ext2fs *fs) +{ + struct ext2fs *es = fs->e2fs; + int i, gpf = 0; + unsigned int fgcount, fg; + long nifree, nbfree, ndirs; - return (0); + fs->e2fs_log_gpf = es->e2fs_log_gpf; + gpf = 1 << fs->e2fs_log_gpf; + + if (gpf < 2) { + fs->e2fs_log_gpf = 0; + return (0); + } + + fgcount = ((fs->e2fs_gcount + gpf - 1) + + ((es->e2fs_reserved_ngdb + 1) << fs->e2fs_descpbbits)) / gpf; + + fs->e2fs_fg = malloc(fgcount * sizeof(struct ext4_flex_groups), + M_EXT2MNT, M_WAITOK | M_ZERO); + + for (i = 0; i < fs->e2fs_gcount; i++) { + nifree = 0; + nbfree = 0; + ndirs = 0; + fg = i >> fs->e2fs_log_gpf; + + /* XXX: need to support 64 bits. */ + nifree = fs->e2fs_gd[i].ext2bgd_nifree_lo; + nbfree = fs->e2fs_gd[i].ext2bgd_nbfree_lo; + ndirs = fs->e2fs_gd[i].ext2bgd_ndirs_lo; + + atomic_add_long(&fs->e2fs_fg[fg].e2fg_nifree, nifree); + atomic_add_long(&fs->e2fs_fg[fg].e2fg_nbfree, nbfree); + atomic_add_long(&fs->e2fs_fg[fg].e2fg_ndirs, ndirs); + } + + return (0); +} + +/* + * Find most significant set bit. + * + * TODO: Maybe it need to rewrite by assembly language for + * improving the performance. + */ +static int +find_most_set_bit(int64_t n) +{ + int64_t num, i; + unsigned int pos, res = 0; + + for (num = 1; num <= n; num++) { + for (i = (num >> 1), pos = 0; i != 0; pos++) + i >>= 1; + res = pos; + } + + return res; } /* @@ -606,6 +678,12 @@ if ((error = compute_sb_data(devvp, ump->um_e2fs->e2fs, ump->um_e2fs))) goto out; + /* Initial reservation window index and lock */ + bzero(&ump->um_e2fs->e2fs_rsv_lock, sizeof(struct mtx)); + mtx_init(&ump->um_e2fs->e2fs_rsv_lock, + "rsv tree lock", NULL, MTX_DEF); + RB_INIT(&ump->um_e2fs->e2fs_rsv_tree); + brelse(bp); bp = NULL; fs = ump->um_e2fs; @@ -705,6 +783,8 @@ g_topology_unlock(); PICKUP_GIANT(); vrele(ump->um_devvp); + mtx_destroy(&fs->e2fs_rsv_lock); + free(fs->e2fs_fg, M_EXT2MNT); free(fs->e2fs_gd, M_EXT2MNT); free(fs->e2fs_contigdirs, M_EXT2MNT); free(fs->e2fs, M_EXT2MNT); @@ -948,6 +1028,15 @@ ip->i_prealloc_count = 0; ip->i_prealloc_block = 0; + /* initialize rsv lock and rsv data structure */ + bzero(&ip->i_rsv_lock, sizeof(struct mtx)); + mtx_init(&ip->i_rsv_lock, "inode rsv lock", NULL, MTX_DEF); + EXT2_RSV_LOCK(ip); + ip->i_rsv = NULL; + if (ip->i_rsv == NULL) + ext2_init_rsv(ip); + EXT2_RSV_UNLOCK(ip); + /* initialize ext lock */ bzero(&ip->i_ext_lock, sizeof(struct mtx)); mtx_init(&ip->i_ext_lock, "inode ext lock", NULL, MTX_DEF); ==== //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext4_vnops.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ * * @(#)ufs_vnops.c 8.7 (Berkeley) 2/3/94 * @(#)ufs_vnops.c 8.27 (Berkeley) 5/27/95 - * $FreeBSD: src/sys/fs/ext2fs/ext2_vnops.c,v 1.3 2010/02/20 10:19:19 uqs Exp $ + * $FreeBSD: src/sys/fs/ext4fs/ext4_vnops.c,v 1.3 2010/09/16 20:45:00 lz Exp $ */ #include "opt_suiddir.h" @@ -74,12 +74,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include static int ext2_makeinode(int mode, struct vnode *, struct vnode **, struct componentname *); static void ext2_itimes_locked(struct vnode *); ==== //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/ext4fs.h#2 (text+ko) ==== @@ -4,7 +4,7 @@ * Aug 1995, Godmar Back (gback@cs.utah.edu) * University of Utah, Department of Computer Science * - * $FreeBSD: src/sys/fs/ext2fs/ext2fs.h,v 1.1 2010/01/14 14:30:54 lulf Exp $ + * $FreeBSD: src/sys/fs/ext4fs/ext4fs.h,v 1.1 2010/09/16 20:46:00 lz Exp $ */ /*- * Copyright (c) 2009 Aditya Sarawgi @@ -34,12 +34,14 @@ * */ -#ifndef _FS_EXT2FS_EXT2_FS_H -#define _FS_EXT2FS_EXT2_FS_H +#ifndef _FS_EXT4FS_EXT4_FS_H +#define _FS_EXT4FS_EXT4_FS_H #include #include +#include + /* * Special inode numbers */ @@ -91,6 +93,15 @@ */ #define MAXMNTLEN 512 +/* ext4 flex block group data structure */ +struct ext4_flex_groups { + long e2fg_nifree; + long e2fg_nbfree; + long e2fg_ndirs; +}; + +#define EXT4_FLEX_ALLOC_DIR_SIZE 4 + /* * Super block for an ext2fs file system. */ @@ -204,6 +215,13 @@ off_t e2fs_maxfilesize; struct ext2_gd *e2fs_gd; /* Group Descriptors */ + struct mtx e2fs_rsv_lock; /* Protect reservation window RB tree */ + struct ext2_rsv_win_tree e2fs_rsv_tree; /* Reservation window index */ + + u_int8_t e2fs_log_gpf; /* FLEX_BG group size */ + int e2fs_descpbbits; + struct ext4_flex_groups *e2fs_fg; + u_int16_t e2fs_min_extra_isize; /* all inodes have at least some bytes */ u_int16_t e2fs_want_extra_isize; /* new inodes should reserve some bytes */ }; @@ -399,4 +417,4 @@ #endif -#endif /* _LINUX_EXT2_FS_H */ +#endif /* _LINUX_EXT4_FS_H */ ==== //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/fs.h#2 (text+ko) ==== ==== //depot/projects/soc2010/ext4fs/src/sys/fs/ext4fs/inode.h#2 (text+ko) ==== @@ -35,15 +35,15 @@ * $FreeBSD: src/sys/fs/ext2fs/inode.h,v 1.1 2010/01/14 14:30:54 lulf Exp $ */ -#ifndef _FS_EXT2FS_INODE_H_ -#define _FS_EXT2FS_INODE_H_ +#ifndef _FS_EXT4FS_INODE_H_ +#define _FS_EXT4FS_INODE_H_ #include #include #include #include -#include +#include #define ROOTINO ((ino_t)2) @@ -105,6 +105,10 @@ u_int32_t i_uid; /* File owner. */ u_int32_t i_gid; /* File group. */ + /* Fields for reservation window */ + struct mtx i_rsv_lock; /* Protects i_rsv */ + struct ext2_rsv_win *i_rsv; /* Reservation window */ + /* ext4 extents support */ struct mtx i_ext_lock; /* this lock only is required in read/write mode but we still use it in read-only mode. */ @@ -176,4 +180,4 @@ }; #endif /* _KERNEL */ -#endif /* !_FS_EXT2FS_INODE_H_ */ +#endif /* !_FS_EXT4FS_INODE_H_ */ From owner-p4-projects@FreeBSD.ORG Thu Sep 16 22:51:48 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 66F4B1065672; Thu, 16 Sep 2010 22:51:48 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 290F2106564A for ; Thu, 16 Sep 2010 22:51:48 +0000 (UTC) (envelope-from ken@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id F02C48FC13 for ; Thu, 16 Sep 2010 22:51:47 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o8GMplNP036543 for ; Thu, 16 Sep 2010 22:51:47 GMT (envelope-from ken@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o8GMplDA036540 for perforce@freebsd.org; Thu, 16 Sep 2010 22:51:47 GMT (envelope-from ken@FreeBSD.org) Date: Thu, 16 Sep 2010 22:51:47 GMT Message-Id: <201009162251.o8GMplDA036540@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to ken@FreeBSD.org using -f From: Ken Merry To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 183877 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Sep 2010 22:51:48 -0000 http://p4web.freebsd.org/@@183877?ac=10 Change 183877 by ken@ken.spectra.vm-freebsd on 2010/09/16 22:51:11 According to the MPT2 spec, task management commands are serialized, and so no I/O should start while task management commands are active. So, to comply with that, freeze the SIM queue before we send any task management commands (abort, target reset, etc.) down to the IOC. We unfreeze the queue once the task management command completes. It isn't clear from the spec whether multiple simultaneous task management commands are supported. Right now it is possible to have multiple outstanding task management commands, especially in the abort case. Multiple outstanding aborts do complete successfully, so it may be supported. We also don't yet have any recovery mechanism (e.g. reset the IOC) if the task management command fails. Affected files ... .. //depot/projects/mps/src/sys/dev/mps/mps_sas.c#3 edit Differences ... ==== //depot/projects/mps/src/sys/dev/mps/mps_sas.c#3 (text+ko) ==== @@ -438,6 +438,7 @@ cm->cm_desc.Default.RequestFlags = MPI2_REQ_DESCRIPT_FLAGS_DEFAULT_TYPE; cm->cm_complete = mpssas_remove_device; cm->cm_targ = targ; + xpt_freeze_simq(sc->sassc->sim, 1); mps_map_command(sc, cm); } @@ -453,6 +454,7 @@ reply = (MPI2_SCSI_TASK_MANAGE_REPLY *)cm->cm_reply; handle = cm->cm_targ->handle; + xpt_release_simq(sc->sassc->sim, 1); if (reply->IOCStatus != MPI2_IOCSTATUS_SUCCESS) { mps_printf(sc, "Failure 0x%x reseting device 0x%04x\n", reply->IOCStatus, handle); @@ -983,6 +985,11 @@ mps_printf(sc, "%s: abort request on handle %#04x SMID %d " "complete\n", __func__, req->DevHandle, req->TaskMID); + /* + * Release the SIM queue, we froze it when we sent the abort. + */ + xpt_release_simq(sc->sassc->sim, 1); + mps_free_command(sc, cm); } @@ -1013,10 +1020,19 @@ cm->cm_data = NULL; cm->cm_desc.Default.RequestFlags = MPI2_REQ_DESCRIPT_FLAGS_DEFAULT_TYPE; + /* + * Freeze the SIM queue while we issue the abort. According to the + * Fusion-MPT 2.0 spec, task management requests are serialized, + * and so the host should not send any I/O requests while task + * management requests are pending. + */ + xpt_freeze_simq(sc->sassc->sim, 1); + error = mps_map_command(sc, cm); if (error != 0) { mps_printf(sc, "%s: error mapping abort request!\n", __func__); + xpt_release_simq(sc->sassc->sim, 1); } #if 0 error = mpssas_reset(sc, targ, &resetcm); @@ -1361,7 +1377,13 @@ cm->cm_data = NULL; cm->cm_desc.Default.RequestFlags = MPI2_REQ_DESCRIPT_FLAGS_DEFAULT_TYPE; + xpt_freeze_simq(sassc->sim, 1); + error = mps_map_command(sassc->sc, cm); + + if (error != 0) + xpt_release_simq(sassc->sim, 1); + return (error); } @@ -1385,6 +1407,9 @@ ccb->ccb_h.status = CAM_REQ_CMP_ERR; mps_free_command(sc, cm); + + xpt_release_simq(sc->sassc->sim, 1); + xpt_done(ccb); } From owner-p4-projects@FreeBSD.ORG Thu Sep 16 23:03:50 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AAC2E1065674; Thu, 16 Sep 2010 23:03:50 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5541C106566C for ; Thu, 16 Sep 2010 23:03:50 +0000 (UTC) (envelope-from stas@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 3A85D8FC17 for ; Thu, 16 Sep 2010 23:03:50 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o8GN3or0038479 for ; Thu, 16 Sep 2010 23:03:50 GMT (envelope-from stas@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o8GN3nfT038476 for perforce@freebsd.org; Thu, 16 Sep 2010 23:03:50 GMT (envelope-from stas@freebsd.org) Date: Thu, 16 Sep 2010 23:03:50 GMT Message-Id: <201009162303.o8GN3nfT038476@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to stas@freebsd.org using -f From: Stanislav Sedov To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 183879 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Sep 2010 23:03:50 -0000 http://p4web.freebsd.org/@@183879?ac=10 Change 183879 by stas@stas_orion on 2010/09/16 23:03:06 - Add support for syscall 510 (new semctl). Affected files ... .. //depot/projects/valgrind/coregrind/m_syswrap/priv_syswrap-freebsd.h#21 edit .. //depot/projects/valgrind/coregrind/m_syswrap/syswrap-freebsd.c#47 edit .. //depot/projects/valgrind/include/vki/vki-scnums-freebsd.h#8 edit Differences ... ==== //depot/projects/valgrind/coregrind/m_syswrap/priv_syswrap-freebsd.h#21 (text+ko) ==== @@ -109,6 +109,7 @@ DECL_TEMPLATE(freebsd, sys_undelete); DECL_TEMPLATE(freebsd, sys_futimes); DECL_TEMPLATE(freebsd, sys_nfs_fhopen); +DECL_TEMPLATE(freebsd, sys___semctl7); DECL_TEMPLATE(freebsd, sys___semctl); DECL_TEMPLATE(freebsd, sys_semget); DECL_TEMPLATE(freebsd, sys_semop); ==== //depot/projects/valgrind/coregrind/m_syswrap/syswrap-freebsd.c#47 (text+ko) ==== @@ -2666,6 +2666,65 @@ ML_(generic_PRE_sys_semop)(tid, ARG1,ARG2,ARG3); } +struct ipc_perm7 { + unsigned short cuid; /* creator user id */ + unsigned short cgid; /* creator group id */ + unsigned short uid; /* user id */ + unsigned short gid; /* group id */ + unsigned short mode; /* r/w permission */ + unsigned short seq; /* sequence # (to generate unique ipcid) */ + vki_key_t key; /* user specified msg/sem/shm key */ +}; + +struct semid_ds7 { + struct ipc_perm7 sem_perm; /* operation permission struct */ + struct sem *sem_base; /* pointer to first semaphore in set */ + unsigned short sem_nsems; /* number of sems in set */ + vki_time_t sem_otime; /* last operation time */ + long sem_pad1; /* SVABI/386 says I need this here */ + vki_time_t sem_ctime; /* last change time */ + /* Times measured in secs since */ + /* 00:00:00 GMT, Jan. 1, 1970 */ + long sem_pad2; /* SVABI/386 says I need this here */ + long sem_pad3[4]; /* SVABI/386 says I need this here */ +}; + +PRE(sys___semctl7) +{ + switch (ARG3) { + case VKI_IPC_INFO: + case VKI_SEM_INFO: + PRINT("sys_semctl ( %ld, %ld, %ld, %#lx )",ARG1,ARG2,ARG3,ARG4); + PRE_REG_READ4(long, "semctl", + int, semid, int, semnum, int, cmd, struct seminfo *, arg); + break; + case VKI_IPC_STAT: + case VKI_SEM_STAT: + case VKI_IPC_SET: + PRINT("sys_semctl ( %ld, %ld, %ld, %#lx )",ARG1,ARG2,ARG3,ARG4); + PRE_REG_READ4(long, "semctl", + int, semid, int, semnum, int, cmd, struct semid_ds7 *, arg); + break; + case VKI_GETALL: + case VKI_SETALL: + PRINT("sys_semctl ( %ld, %ld, %ld, %#lx )",ARG1,ARG2,ARG3,ARG4); + PRE_REG_READ4(long, "semctl", + int, semid, int, semnum, int, cmd, unsigned short *, arg); + break; + default: + PRINT("sys_semctl ( %ld, %ld, %ld )",ARG1,ARG2,ARG3); + PRE_REG_READ3(long, "semctl", + int, semid, int, semnum, int, cmd); + break; + } + ML_(generic_PRE_sys_semctl)(tid, ARG1,ARG2,ARG3,ARG4); +} + +POST(sys___semctl7) +{ + ML_(generic_POST_sys_semctl)(tid, RES,ARG1,ARG2,ARG3,ARG4); +} + PRE(sys___semctl) { switch (ARG3) { @@ -3493,7 +3552,7 @@ BSDX_(__NR_lkmnosys8, sys_lkmnosys8), // 218 // BSDXY(__NR_nfs_fhopen, sys_nfs_fhopen), // 219 - BSDXY(__NR___semctl, sys___semctl), // 220 + BSDXY(__NR___semctl7, sys___semctl7), // 220 BSDX_(__NR_semget, sys_semget), // 221 BSDX_(__NR_semop, sys_semop), // 222 // unimpl semconfig 223 @@ -3850,6 +3909,8 @@ // posix_openpt 504 + BSDXY(__NR___semctl, sys___semctl), // 510 + }; ==== //depot/projects/valgrind/include/vki/vki-scnums-freebsd.h#8 (text+ko) ==== @@ -186,7 +186,7 @@ #define __NR_lkmnosys7 217 #define __NR_lkmnosys8 218 #define __NR_nfs_fhopen 219 -#define __NR___semctl 220 +#define __NR___semctl7 220 #define __NR_semget 221 #define __NR_semop 222 #define __NR_msgctl 224 @@ -405,5 +405,6 @@ #define __NR_symlinkat 502 #define __NR_unlinkat 503 #define __NR_posix_openpt 504 +#define __NR___semctl 510 #endif /* __VKI_UNISTD_FREEBSD_H */ From owner-p4-projects@FreeBSD.ORG Fri Sep 17 21:50:43 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D96B01065674; Fri, 17 Sep 2010 21:50:42 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 83768106564A for ; Fri, 17 Sep 2010 21:50:42 +0000 (UTC) (envelope-from ken@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 684798FC12 for ; Fri, 17 Sep 2010 21:50:42 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o8HLogM1019676 for ; Fri, 17 Sep 2010 21:50:42 GMT (envelope-from ken@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o8HLoghn019668 for perforce@freebsd.org; Fri, 17 Sep 2010 21:50:42 GMT (envelope-from ken@FreeBSD.org) Date: Fri, 17 Sep 2010 21:50:42 GMT Message-Id: <201009172150.o8HLoghn019668@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to ken@FreeBSD.org using -f From: Ken Merry To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 183909 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Sep 2010 21:50:43 -0000 http://p4web.freebsd.org/@@183909?ac=10 Change 183909 by ken@ken.spectra.vm-freebsd on 2010/09/17 21:50:13 Fix a couple of mps problems. When the driver is completely saturated with commands (1024 in the case of the SAS2008 in my test system), I/O stops. If we tell CAM that we have one less command slot than we have actually allocated, everything works fine. We also need a few extra command slots to allow for aborts and other task management commands to be sent down. This needs more investigation to determine the root cause, but for now this fixes things in my testing. mps.c: Change a printf() to mps_printf(). mps_sas.c: Subtract 5 command slots when we tell CAM how many commands we can handle. Add some commented-out logic to print the contents the CDBs for timed-out commands. This can help in debugging devices that are timing out. This will be uncommented once I bring some CAM changes in. Reported by: Andrew Boyer Affected files ... .. //depot/projects/mps/src/sys/dev/mps/mps.c#2 edit .. //depot/projects/mps/src/sys/dev/mps/mps_sas.c#4 edit Differences ... ==== //depot/projects/mps/src/sys/dev/mps/mps.c#2 (text+ko) ==== @@ -1416,7 +1416,7 @@ chain = mps_alloc_chain(sc); if (chain == NULL) { /* Resource shortage, roll back! */ - printf("out of chain frames\n"); + mps_printf(sc, "out of chain frames\n"); return; } ==== //depot/projects/mps/src/sys/dev/mps/mps_sas.c#4 (text+ko) ==== @@ -596,6 +596,7 @@ { struct mpssas_softc *sassc; int error = 0; + int num_sim_reqs; mps_dprint(sc, MPS_TRACE, "%s\n", __func__); @@ -605,15 +606,30 @@ sc->sassc = sassc; sassc->sc = sc; - if ((sassc->devq = cam_simq_alloc(sc->num_reqs)) == NULL) { + /* + * Tell CAM that we can handle 5 fewer requests than we have + * allocated. If we allow the full number of requests, all I/O + * will halt when we run out of resources. Things work fine with + * just 1 less request slot given to CAM than we have allocated. + * We also need a couple of extra commands so that we can send down + * abort, reset, etc. requests when commands time out. Otherwise + * we could wind up in a situation with sc->num_reqs requests down + * on the card and no way to send an abort. + * + * XXX KDM need to figure out why I/O locks up if all commands are + * used. + */ + num_sim_reqs = sc->num_reqs - 5; + + if ((sassc->devq = cam_simq_alloc(num_sim_reqs)) == NULL) { mps_dprint(sc, MPS_FAULT, "Cannot allocate SIMQ\n"); error = ENOMEM; goto out; } sassc->sim = cam_sim_alloc(mpssas_action, mpssas_poll, "mps", sassc, - device_get_unit(sc->mps_dev), &sc->mps_mtx, sc->num_reqs, sc->num_reqs, - sassc->devq); + device_get_unit(sc->mps_dev), &sc->mps_mtx, num_sim_reqs, + num_sim_reqs, sassc->devq); if (sassc->sim == NULL) { mps_dprint(sc, MPS_FAULT, "Cannot allocate SIM\n"); error = EINVAL; @@ -930,6 +946,9 @@ struct mps_softc *sc; struct mps_command *cm; struct mpssas_target *targ; +#if 0 + char cdb_str[(SCSI_MAX_CDBLEN * 3) + 1]; +#endif cm = (struct mps_command *)data; sc = cm->cm_sc; @@ -954,6 +973,22 @@ xpt_print(ccb->ccb_h.path, "SCSI command timeout on device handle " "0x%04x SMID %d\n", targ->handle, cm->cm_desc.Default.SMID); + /* + * XXX KDM this is useful for debugging purposes, but the existing + * scsi_op_desc() implementation can't handle a NULL value for + * inq_data. So this will remain commented out until I bring in + * those changes as well. + */ +#if 0 + xpt_print(ccb->ccb_h.path, "Timed out command: %s. CDB %s\n", + scsi_op_desc((ccb->ccb_h.flags & CAM_CDB_POINTER) ? + ccb->csio.cdb_io.cdb_ptr[0] : + ccb->csio.cdb_io.cdb_bytes[0], NULL), + scsi_cdb_string((ccb->ccb_h.flags & CAM_CDB_POINTER) ? + ccb->csio.cdb_io.cdb_ptr : + ccb->csio.cdb_io.cdb_bytes, cdb_str, + sizeof(cdb_str))); +#endif /* Inform CAM about the timeout and that recovery is starting. */ #if 0