From owner-p4-projects@FreeBSD.ORG Sun Jun 24 01:29:54 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0630316A46B; Sun, 24 Jun 2007 01:29:54 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id AA1F116A400 for ; Sun, 24 Jun 2007 01:29:53 +0000 (UTC) (envelope-from ivoras@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 9CCC913C465 for ; Sun, 24 Jun 2007 01:29:53 +0000 (UTC) (envelope-from ivoras@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5O1TrLG001348 for ; Sun, 24 Jun 2007 01:29:53 GMT (envelope-from ivoras@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5O1TrCQ001345 for perforce@freebsd.org; Sun, 24 Jun 2007 01:29:53 GMT (envelope-from ivoras@FreeBSD.org) Date: Sun, 24 Jun 2007 01:29:53 GMT Message-Id: <200706240129.l5O1TrCQ001345@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ivoras@FreeBSD.org using -f From: Ivan Voras To: Perforce Change Reviews Cc: Subject: PERFORCE change 122213 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Jun 2007 01:29:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=122213 Change 122213 by ivoras@ivoras_finstall on 2007/06/24 01:29:30 Implement basic functionality, with a nice little curses trick for better legibility. Affected files ... .. //depot/projects/soc2007/ivoras_finstall/makeimage/makeimage.py#2 edit .. //depot/projects/soc2007/ivoras_finstall/makeimage/util.py#1 add Differences ... ==== //depot/projects/soc2007/ivoras_finstall/makeimage/makeimage.py#2 (text+ko) ==== @@ -1,5 +1,31 @@ +#!/usr/local/bin/python +# Copyright (c) 2007. Ivan Voras +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are met: +# +# 1. Redistributions of source code must retain the above copyright notice, +# this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright notice, +# this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND ANY +# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +# DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY +# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +# finstall LiveCD image creator + import os, os.path, sys +from time import strftime from getopt import getopt, GetoptError +from util import nukedir, execute, printmsg, cmdout, initutils class MakeImageException(Exception): pass @@ -7,25 +33,80 @@ if os.getuid() != 0: raise MakeImageException("This utility needs to be executed as root user (for the installworld phase)") +if cmdout("which mkisofs").find("not found") != -1: + raise MakeImageException("This utility requires mkisofs(8) (install ports/sysutils/cdrtools)") + def usage(): - print "usage: %s <-d DESTDIR>" % sys.argv[0] + print "usage: %s -d WORKDIR [-s SRCDIR] [-k KERNEL]" % sys.argv[0] sys.exit(1) -DESTDIR = None +WORKDIR = None # Working directory. Will create DESTDIR inside it. +DESTDIR = None # The directory that will contain the root drive hierarchy +SRCDIR = "/usr/src" +KERNEL = "GENERIC" +DoBuild = False +LABEL = "FreeBSD7" -opts, args = getopt(sys.argv[1:], "d:h") +opts, args = getopt(sys.argv[1:], "d:s:bh") for o,a in opts: if o == "-d": - DESTDIR = a - if DESTDIR[-1] == "/": - DESTDIR = DESTDIR[:-1] - if not os.path.exists(DESTDIR): - raise MakeImageException("Directory not found: %s" % DESTDIR) + WORKDIR = a + if WORKDIR[-1] == "/": + WORKDIR = WORKDIR[:-1] + elif o == "-s": + SRCDIR = a + if SRCDIR[-1] == "/": + SRCDIR = SRCDIR[:-1] + if not os.path.exists(SRCDIR): + raise MakeImageException("Source directory not found: '%s'" % SRCDIR) + elif o == "-k": + KERNEL = a + elif o == "-b": + DoBuild = True elif o == "-h": usage() -if DESTDIR == None: - raise MakeImageException("Directory not specified (use '-d DESTDIR' argument)") +if WORKDIR == None: + raise MakeImageException("Directory not specified (use '-d WORKDIR' argument)") +if not os.path.exists(SRCDIR): + raise MakeImageException("Source directory not found: '%s'") +if not os.path.exists(WORKDIR): + os.makedirs(WORKDIR) + +DESTDIR = "%s/livecd" % WORKDIR +if os.path.exists(DESTDIR): + if not os.path.exists("%s/COPYRIGHT" % DESTDIR): + print "--> %s doesn't look like a FreeBSD root" % DESTDIR + resp = raw_input("Delete it anyway? (y/N) ").upper() + if resp != "Y": + print "Canceling" + sys.exit(1) + else: + print "Wiping out %s" % DESTDIR + nukedir(DESTDIR) + +os.makedirs(DESTDIR) + +initutils() + +printmsg("Using '%s' as source directory" % SRCDIR) +printmsg("Using '%s' as working directory (root on '%s')" % (WORKDIR, DESTDIR)) +printmsg("Using '%s' kernel" % KERNEL) +printmsg("Random message to test scrolling") + +os.chdir(SRCDIR) +if DoBuild: + execute("make buildworld") +execute("make installworld DESTDIR=%s" % DESTDIR) +execute("make distribution DESTDIR=%s" % DESTDIR) +execute("make installkernel KERNCONF=%s DESTDIR=%s" % (KERNEL, DESTDIR)) + +lc = file("%s/boot/loader.conf" % DESTDIR, "w+") +lc.write("# /boot/loader.conf generated by finstall makeimage.py on %s\n" % strftime("%Y-%m-%d %H:%M")) +lc.write('rootdev="iso9660/%s"\n' % LABEL) +lc.write('boot_cdrom="1"\n') +lc.close() -print "Using '%s' as build directory" % DESTDIR +os.chdir(WORKDIR) +execute("mkisofs -l -nobak -V %s -T -J -r -ldots -b boot/cdboot -no-emul-boot -o %s/image.iso %s" % (LABEL, WORKDIR, DESTDIR)) From owner-p4-projects@FreeBSD.ORG Sun Jun 24 07:36:55 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CDA8A16A46B; Sun, 24 Jun 2007 07:36:54 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 710DB16A41F for ; Sun, 24 Jun 2007 07:36:54 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 5E1A113C43E for ; Sun, 24 Jun 2007 07:36:54 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5O7asjS080793 for ; Sun, 24 Jun 2007 07:36:54 GMT (envelope-from zhouzhouyi@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5O7aswp080790 for perforce@freebsd.org; Sun, 24 Jun 2007 07:36:54 GMT (envelope-from zhouzhouyi@FreeBSD.org) Date: Sun, 24 Jun 2007 07:36:54 GMT Message-Id: <200706240736.l5O7aswp080790@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zhouzhouyi@FreeBSD.org using -f From: Zhouyi ZHOU To: Perforce Change Reviews Cc: Subject: PERFORCE change 122219 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Jun 2007 07:36:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=122219 Change 122219 by zhouzhouyi@zhouzhouyi_mactest on 2007/06/24 07:36:47 Delete for redesign of MAC test log Framework for userland test Affected files ... .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/README#4 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/Makefile#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/Makefile#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/acpica/OsdEnvironment.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/acpica/acpi_machdep.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/acpica/acpi_wakeup.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/acpica/madt.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/amd64_mem.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/apic_vector.S#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/atomic.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/autoconf.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/bios.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/bpf_jit_machdep.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/bpf_jit_machdep.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/busdma_machdep.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/cpu_switch.S#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/db_disasm.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/db_interface.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/db_trace.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/dump_machdep.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/elf_machdep.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/exception.S#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/fpu.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/gdb_machdep.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/genassym.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/identcpu.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/in_cksum.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/initcpu.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/intr_machdep.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/io.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/io_apic.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/legacy.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/local_apic.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/locore.S#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/machdep.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/mem.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/minidump_machdep.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/mp_machdep.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/mp_watchdog.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/mpboot.S#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/mptable.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/mptable_pci.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/msi.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/nexus.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/pmap.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/prof_machdep.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/sigtramp.S#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/support.S#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/sys_machdep.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/trap.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/tsc.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/uio_machdep.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/uma_machdep.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/amd64/vm_machdep.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/compile/.cvsignore#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/conf/.cvsignore#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/conf/DEFAULTS#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/conf/GENERIC#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/conf/GENERIC.hints#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/conf/MAC#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/conf/Makefile#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/conf/NOTES#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/ia32/ia32_exception.S#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/ia32/ia32_reg.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/ia32/ia32_signal.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/ia32/ia32_sigtramp.S#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/ia32/ia32_syscall.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/_bus.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/_inttypes.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/_limits.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/_stdint.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/_types.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/acpica_machdep.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/apicreg.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/apicvar.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/asm.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/asmacros.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/atomic.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/bus.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/bus_dma.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/clock.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/cpu.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/cpufunc.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/cputypes.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/db_machdep.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/elf.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/endian.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/exec.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/float.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/floatingpoint.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/fpu.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/frame.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/gdb_machdep.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/ieeefp.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/in_cksum.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/intr_machdep.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/iodev.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/kdb.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/legacyvar.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/limits.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/md_var.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/memdev.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/metadata.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/minidump.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/mp_watchdog.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/mptable.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/mutex.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/param.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/pc/bios.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/pc/display.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/pcb.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/pcb_ext.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/pci_cfgreg.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/pcpu.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/pmap.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/pmc_mdep.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/ppireg.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/proc.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/profile.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/psl.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/ptrace.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/reg.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/reloc.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/resource.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/runq.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/segments.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/setjmp.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/sf_buf.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/sigframe.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/signal.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/smp.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/specialreg.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/stdarg.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/sysarch.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/timerreg.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/trap.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/tss.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/ucontext.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/varargs.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/include/vmparam.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/isa/atpic.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/isa/atpic_vector.S#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/isa/clock.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/isa/elcr.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/isa/icu.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/isa/isa.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/isa/isa.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/isa/isa_dma.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/isa/nmi.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/linux32/Makefile#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/linux32/linux.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/linux32/linux32_dummy.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/linux32/linux32_genassym.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/linux32/linux32_ipc64.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/linux32/linux32_locore.s#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/linux32/linux32_machdep.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/linux32/linux32_proto.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/linux32/linux32_support.s#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/linux32/linux32_syscall.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/linux32/linux32_sysent.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/linux32/linux32_sysvec.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/linux32/syscalls.conf#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/linux32/syscalls.master#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/pci/pci_bus.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/amd64/pci/pci_cfgreg.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/autoconf.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/bcopy_page.S#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/bcopyinout.S#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/bcopyinout_xscale.S#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/blockio.S#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/bootconfig.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/bus_space_asm_generic.S#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/busdma_machdep.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/copystr.S#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/cpufunc.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/cpufunc_asm.S#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/cpufunc_asm_arm10.S#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/cpufunc_asm_arm7tdmi.S#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/cpufunc_asm_arm8.S#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/cpufunc_asm_arm9.S#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/cpufunc_asm_armv4.S#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/cpufunc_asm_ixp12x0.S#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/cpufunc_asm_sa1.S#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/cpufunc_asm_sa11x0.S#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/cpufunc_asm_xscale.S#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/db_disasm.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/db_interface.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/db_trace.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/disassem.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/dump_machdep.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/elf_machdep.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/elf_trampoline.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/exception.S#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/fiq.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/fiq_subr.S#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/fusu.S#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/gdb_machdep.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/genassym.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/identcpu.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/in_cksum.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/in_cksum_arm.S#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/inckern.S#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/intr.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/irq_dispatch.S#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/locore.S#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/machdep.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/mem.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/nexus.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/nexus_io.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/nexus_io_asm.S#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/pmap.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/setcpsr.S#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/setstack.s#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/support.S#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/swtch.S#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/sys_machdep.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/trap.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/uio_machdep.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/undefined.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/vectors.S#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/arm/vm_machdep.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/at91/at91.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/at91/at91_mci.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/at91/at91_mcireg.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/at91/at91_pdcreg.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/at91/at91_pio.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/at91/at91_pio_rm9200.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/at91/at91_pioreg.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/at91/at91_piovar.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/at91/at91_pmc.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/at91/at91_pmcreg.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/at91/at91_pmcvar.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/at91/at91_rtc.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/at91/at91_rtcreg.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/at91/at91_spi.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/at91/at91_spireg.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/at91/at91_ssc.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/at91/at91_sscreg.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/at91/at91_st.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/at91/at91_streg.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/at91/at91_twi.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/at91/at91_twiio.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/at91/at91_twireg.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/at91/at91_usartreg.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/at91/at91rm92reg.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/at91/at91var.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/at91/files.at91#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/at91/files.kb920x#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/at91/hints.at91rm9200#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/at91/hints.at91sam9261#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/at91/if_ate.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/at91/if_atereg.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/at91/kb920x_machdep.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/at91/ohci_atmelarm.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/at91/std.at91#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/at91/std.kb920x#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/at91/uart_bus_at91usart.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/at91/uart_cpu_at91rm9200usart.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/at91/uart_dev_at91usart.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/compile/.cvsignore#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/conf/.cvsignore#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/conf/AVILA#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/conf/AVILA.hints#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/conf/BWCT#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/conf/BWCT.hints#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/conf/EP80219#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/conf/IQ31244#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/conf/KB920X#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/conf/KB920X.hints#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/conf/SIMICS#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/conf/SKYEYE#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/_bus.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/_inttypes.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/_limits.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/_stdint.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/_types.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/armreg.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/asm.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/asmacros.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/atomic.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/blockio.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/bootconfig.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/bus.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/bus_dma.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/clock.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/cpu.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/cpuconf.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/cpufunc.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/db_machdep.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/disassem.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/elf.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/endian.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/exec.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/fiq.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/float.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/floatingpoint.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/fp.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/frame.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/gdb_machdep.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/ieee.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/ieeefp.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/in_cksum.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/intr.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/katelib.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/kdb.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/limits.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/machdep.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/md_var.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/memdev.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/metadata.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/mutex.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/param.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/pcb.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/pcpu.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/pmap.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/pmc_mdep.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/proc.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/profile.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/psl.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/pte.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/ptrace.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/reg.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/reloc.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/resource.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/runq.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/setjmp.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/sf_buf.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/sigframe.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/signal.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/smp.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/stdarg.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/swi.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/sysarch.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/trap.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/ucontext.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/undefined.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/utrap.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/include/vmparam.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/sa11x0/assabet_machdep.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/sa11x0/files.sa11x0#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/sa11x0/sa11x0.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/sa11x0/sa11x0_dmacreg.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/sa11x0/sa11x0_gpioreg.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/sa11x0/sa11x0_io.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/sa11x0/sa11x0_io_asm.S#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/sa11x0/sa11x0_irq.S#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/sa11x0/sa11x0_irqhandler.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/sa11x0/sa11x0_ost.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/sa11x0/sa11x0_ostreg.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/sa11x0/sa11x0_ppcreg.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/sa11x0/sa11x0_reg.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/sa11x0/sa11x0_var.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/sa11x0/std.sa11x0#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/sa11x0/uart_bus_sa1110.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/sa11x0/uart_cpu_sa1110.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/sa11x0/uart_dev_sa1110.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/sa11x0/uart_dev_sa1110.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/i80321/ep80219_machdep.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/i80321/files.ep80219#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/i80321/files.i80219#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/i80321/files.i80321#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/i80321/files.iq31244#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/i80321/i80321.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/i80321/i80321_aau.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/i80321/i80321_dma.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/i80321/i80321_intr.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/i80321/i80321_mcu.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/i80321/i80321_pci.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/i80321/i80321_space.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/i80321/i80321_timer.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/i80321/i80321_wdog.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/i80321/i80321reg.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/i80321/i80321var.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/i80321/iq31244_7seg.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/i80321/iq31244_machdep.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/i80321/iq80321.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/i80321/iq80321reg.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/i80321/iq80321var.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/i80321/obio.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/i80321/obio_space.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/i80321/obiovar.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/i80321/std.ep80219#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/i80321/std.i80219#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/i80321/std.i80321#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/i80321/std.iq31244#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/i80321/uart_bus_i80321.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/i80321/uart_cpu_i80321.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/ixp425/avila_ata.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/ixp425/avila_led.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/ixp425/avila_machdep.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/ixp425/files.avila#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/ixp425/files.ixp425#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/ixp425/if_npe.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/ixp425/if_npereg.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/ixp425/ixdp425_pci.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/ixp425/ixdp425reg.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/ixp425/ixp425.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/ixp425/ixp425_a4x_io.S#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/ixp425/ixp425_a4x_space.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/ixp425/ixp425_iic.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/ixp425/ixp425_intr.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/ixp425/ixp425_mem.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/ixp425/ixp425_npe.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/ixp425/ixp425_npereg.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/ixp425/ixp425_npevar.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/ixp425/ixp425_pci.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/ixp425/ixp425_pci_asm.S#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/ixp425/ixp425_pci_space.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/ixp425/ixp425_qmgr.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/ixp425/ixp425_qmgr.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/ixp425/ixp425_space.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/ixp425/ixp425_timer.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/ixp425/ixp425_wdog.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/ixp425/ixp425reg.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/ixp425/ixp425var.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/ixp425/std.avila#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/ixp425/std.ixp425#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/ixp425/uart_bus_ixp425.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/ixp425/uart_cpu_ixp425.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/std.xscale#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/xscalereg.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/arm/xscale/xscalevar.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/Makefile#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/README#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/Makefile#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/Makefile#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/Makefile.inc#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/boot0/Makefile#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/boot0/README#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/boot0/linker.cfg#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/boot0/main.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/boot0iic/Makefile#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/boot0iic/main.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/boot0spi/Makefile#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/boot0spi/main.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/boot2/Makefile#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/boot2/board.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/boot2/boot2.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/boot2/kb920x_board.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/bootiic/Makefile#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/bootiic/README#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/bootiic/env_vars.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/bootiic/env_vars.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/bootiic/loader_prompt.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/bootiic/loader_prompt.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/bootiic/main.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/bootspi/Makefile#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/bootspi/README#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/bootspi/ee.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/bootspi/ee.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/bootspi/env_vars.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/bootspi/env_vars.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/bootspi/loader_prompt.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/bootspi/loader_prompt.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/bootspi/main.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/libat91/Makefile#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/libat91/arm_init.S#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/libat91/at91rm9200.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/libat91/delay.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/libat91/eeprom.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/libat91/emac.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/libat91/emac.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/libat91/emac_init.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/libat91/getc.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/libat91/lib.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/libat91/lib_AT91RM9200.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/libat91/mci_device.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/libat91/memcmp.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/libat91/memcpy.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/libat91/memset.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/libat91/p_string.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/libat91/printf.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/libat91/putchar.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/libat91/reset.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/libat91/sd-card.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/libat91/sd-card.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/libat91/spi_flash.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/libat91/spi_flash.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/libat91/strcmp.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/libat91/strcpy.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/libat91/strcvt.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/libat91/strlen.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/libat91/tag_list.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/libat91/tag_list.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/libat91/xmodem.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/arm/at91/linker.cfg#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/common/Makefile.inc#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/common/bcache.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/common/boot.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/common/bootstrap.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/common/commands.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/common/console.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/common/dev_net.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/common/dev_net.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/common/devopen.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/common/help.common#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/common/interp.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/common/interp_backslash.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/common/interp_forth.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/common/interp_parse.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/common/isapnp.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/common/isapnp.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/common/load.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/common/load_elf.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/common/load_elf32.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/common/load_elf32_obj.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/common/load_elf64.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/common/load_elf64_obj.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/common/load_elf_obj.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/common/loader.8#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/common/ls.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/common/merge_help.awk#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/common/misc.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/common/module.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/common/newvers.sh#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/common/panic.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/common/pnp.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/common/reloc_elf.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/common/reloc_elf32.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/common/reloc_elf64.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/common/ufsread.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/efi/Makefile#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/efi/Makefile.inc#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/efi/include/README#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/efi/include/efi.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/efi/include/efi_nii.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/efi/include/efiapi.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/efi/include/eficon.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/efi/include/efidebug.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/efi/include/efidef.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/efi/include/efidevp.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/efi/include/efierr.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/efi/include/efifpswa.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/efi/include/efifs.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/efi/include/efilib.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/efi/include/efinet.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/efi/include/efipart.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/efi/include/efiprot.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/efi/include/efipxebc.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/efi/include/efiser.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/efi/include/efistdarg.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/efi/include/i386/efibind.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/efi/include/i386/pe.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/efi/include/ia64/efibind.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/efi/include/ia64/pe.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/efi/libefi/Makefile#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/efi/libefi/delay.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/efi/libefi/efi_console.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/efi/libefi/efifs.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/efi/libefi/efinet.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/efi/libefi/errno.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/efi/libefi/handles.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/efi/libefi/libefi.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/efi/libefi/time.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ficl/Makefile#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ficl/arm/sysdep.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ficl/arm/sysdep.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ficl/dict.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ficl/ficl.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ficl/ficl.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ficl/fileaccess.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ficl/float.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ficl/i386/sysdep.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ficl/i386/sysdep.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ficl/ia64/sysdep.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ficl/ia64/sysdep.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ficl/loader.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ficl/math64.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ficl/math64.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ficl/powerpc/sysdep.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ficl/powerpc/sysdep.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ficl/prefix.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ficl/search.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ficl/softwords/classes.fr#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ficl/softwords/ficlclass.fr#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ficl/softwords/ficllocal.fr#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ficl/softwords/fileaccess.fr#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ficl/softwords/forml.fr#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ficl/softwords/freebsd.fr#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ficl/softwords/ifbrack.fr#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ficl/softwords/jhlocal.fr#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ficl/softwords/marker.fr#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ficl/softwords/oo.fr#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ficl/softwords/prefix.fr#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ficl/softwords/softcore.awk#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ficl/softwords/softcore.fr#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ficl/softwords/string.fr#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ficl/sparc64/sysdep.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ficl/sparc64/sysdep.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ficl/stack.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ficl/testmain.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ficl/tools.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ficl/unix.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ficl/vm.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ficl/words.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/forth/beastie.4th#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/forth/frames.4th#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/forth/loader.4th#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/forth/loader.4th.8#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/forth/loader.conf#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/forth/loader.conf.5#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/forth/loader.rc#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/forth/pnp.4th#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/forth/screen.4th#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/forth/support.4th#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/Makefile#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/Makefile.inc#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/boot0/Makefile#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/boot0/boot0.S#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/boot0/boot0ext.S#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/boot0ext/Makefile#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/boot0sio/Makefile#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/boot2/Makefile#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/boot2/boot1.S#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/boot2/boot2.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/boot2/lib.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/boot2/sio.S#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/btx/Makefile#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/btx/Makefile.inc#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/btx/btx/Makefile#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/btx/btx/btx.S#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/btx/btxldr/Makefile#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/btx/btxldr/btxldr.S#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/btx/lib/Makefile#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/btx/lib/btxcsu.s#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/btx/lib/btxsys.s#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/btx/lib/btxv86.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/btx/lib/btxv86.s#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/cdboot/Makefile#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/cdboot/cdboot.s#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/kgzldr/Makefile#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/kgzldr/boot.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/kgzldr/crt.s#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/kgzldr/kgzldr.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/kgzldr/lib.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/kgzldr/sio.s#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/kgzldr/start.s#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/libfirewire/Makefile#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/libfirewire/dconsole.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/libfirewire/firewire.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/libfirewire/fwohci.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/libfirewire/fwohci.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/libfirewire/fwohcireg.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/libi386/Makefile#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/libi386/amd64_tramp.S#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/libi386/biosacpi.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/libi386/bioscd.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/libi386/biosdisk.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/libi386/biosmem.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/libi386/biospci.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/libi386/biospnp.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/libi386/biossmap.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/libi386/bootinfo.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/libi386/bootinfo32.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/libi386/bootinfo64.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/libi386/comconsole.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/libi386/devicename.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/libi386/elf32_freebsd.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/libi386/elf64_freebsd.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/libi386/i386_copy.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/libi386/i386_module.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/libi386/libi386.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/libi386/nullconsole.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/libi386/pread.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/libi386/pxe.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/libi386/pxe.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/libi386/pxetramp.s#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/libi386/smbios.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/libi386/time.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/libi386/vidconsole.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/loader/Makefile#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/loader/conf.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/loader/help.i386#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/loader/loader.rc#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/loader/main.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/loader/version#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/mbr/Makefile#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/mbr/mbr.s#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/pxeldr/Makefile#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/pxeldr/pxeboot.8#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/i386/pxeldr/pxeldr.S#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ia64/Makefile#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ia64/Makefile.inc#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ia64/common/Makefile#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ia64/common/autoload.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ia64/common/bootinfo.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ia64/common/copy.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ia64/common/devicename.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ia64/common/exec.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ia64/common/libia64.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ia64/efi/Makefile#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ia64/efi/conf.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ia64/efi/efimd.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ia64/efi/ldscript.ia64#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ia64/efi/main.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ia64/efi/start.S#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ia64/efi/version#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ia64/ski/Makefile#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ia64/ski/acpi_stub.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ia64/ski/conf.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ia64/ski/delay.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ia64/ski/efi_stub.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ia64/ski/exit.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ia64/ski/ldscript.ia64#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ia64/ski/libski.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ia64/ski/main.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ia64/ski/pal_stub.S#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ia64/ski/sal_stub.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ia64/ski/skiconsole.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ia64/ski/skifs.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ia64/ski/skiload.cmd#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ia64/ski/skimd.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ia64/ski/ssc.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ia64/ski/start.S#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ia64/ski/time.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ia64/ski/version#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ofw/Makefile#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ofw/common/Makefile.inc#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ofw/common/main.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ofw/libofw/Makefile#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ofw/libofw/devicename.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ofw/libofw/elf_freebsd.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ofw/libofw/libofw.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ofw/libofw/ofw_console.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ofw/libofw/ofw_copy.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ofw/libofw/ofw_disk.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ofw/libofw/ofw_memory.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ofw/libofw/ofw_module.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ofw/libofw/ofw_net.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ofw/libofw/ofw_reboot.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ofw/libofw/ofw_time.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ofw/libofw/openfirm.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ofw/libofw/openfirm.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/ofw/libofw/openfirm_mmu.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/Makefile#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/Makefile.inc#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/boot0.5/Makefile#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/boot0.5/boot.s#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/boot0.5/boot0.5.s#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/boot0.5/disk.s#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/boot0.5/ldscript#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/boot0.5/putssjis.s#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/boot0.5/selector.s#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/boot0.5/start.s#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/boot0.5/support.s#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/boot0.5/syscons.s#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/boot0/Makefile#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/boot0/boot0.s#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/boot2/Makefile#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/boot2/README.serial.98#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/boot2/asm.S#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/boot2/asm.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/boot2/bios.S#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/boot2/boot.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/boot2/boot.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/boot2/boot2.S#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/boot2/dinode.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/boot2/disk.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/boot2/fs.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/boot2/inode.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/boot2/io.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/boot2/probe_keyboard.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/boot2/quota.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/boot2/serial.S#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/boot2/serial_16550.S#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/boot2/serial_8251.S#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/boot2/start.S#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/boot2/sys.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/boot2/table.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/btx/Makefile#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/btx/Makefile.inc#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/btx/btx/Makefile#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/btx/btx/btx.S#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/btx/btxldr/Makefile#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/btx/btxldr/btxldr.S#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/btx/lib/Makefile#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/btx/lib/btxcsu.s#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/btx/lib/btxsys.s#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/btx/lib/btxv86.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/btx/lib/btxv86.s#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/cdboot/Makefile#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/cdboot/cdboot.s#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/kgzldr/Makefile#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/kgzldr/crt.s#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/libpc98/Makefile#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/libpc98/bioscd.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/libpc98/biosdisk.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/libpc98/biosmem.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/libpc98/biossmap.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/libpc98/comconsole.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/libpc98/i386_module.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/libpc98/time.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/libpc98/vidconsole.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/loader/Makefile#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/loader/conf.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/loader/help.pc98#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/pc98/loader/main.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/powerpc/Makefile#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/powerpc/loader/Makefile#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/powerpc/loader/conf.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/powerpc/loader/help.ofw#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/powerpc/loader/ldscript.powerpc#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/powerpc/loader/metadata.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/powerpc/loader/start.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/powerpc/loader/version#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/sparc64/Makefile#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/sparc64/Makefile.inc#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/sparc64/boot1/Makefile#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/sparc64/boot1/_start.s#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/sparc64/boot1/boot1.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/sparc64/loader/Makefile#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/sparc64/loader/help.sparc64#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/sparc64/loader/locore.S#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/sparc64/loader/main.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/sparc64/loader/metadata.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/boot/sparc64/loader/version#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/bsm/audit.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/bsm/audit_internal.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/bsm/audit_kevents.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/bsm/audit_record.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/README.quirks#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/cam.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/cam.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/cam_ccb.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/cam_debug.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/cam_periph.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/cam_periph.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/cam_queue.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/cam_queue.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/cam_sim.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/cam_sim.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/cam_xpt.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/cam_xpt.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/cam_xpt_periph.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/cam_xpt_sim.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/scsi/scsi_all.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/scsi/scsi_all.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/scsi/scsi_cd.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/scsi/scsi_cd.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/scsi/scsi_ch.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/scsi/scsi_ch.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/scsi/scsi_da.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/scsi/scsi_da.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/scsi/scsi_dvcfg.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/scsi/scsi_iu.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/scsi/scsi_low.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/scsi/scsi_low.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/scsi/scsi_low_pisa.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/scsi/scsi_low_pisa.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/scsi/scsi_message.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/scsi/scsi_pass.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/scsi/scsi_pass.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/scsi/scsi_pt.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/scsi/scsi_pt.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/scsi/scsi_sa.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/scsi/scsi_sa.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/scsi/scsi_ses.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/scsi/scsi_ses.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/scsi/scsi_sg.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/scsi/scsi_sg.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/scsi/scsi_targ_bh.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/scsi/scsi_target.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/cam/scsi/scsi_targetio.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/coda/00READ#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/coda/README#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/coda/TODO#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/coda/cnode.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/coda/coda.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/coda/coda_fbsd.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/coda/coda_io.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/coda/coda_kernel.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/coda/coda_namecache.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/coda/coda_namecache.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/coda/coda_opstats.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/coda/coda_pioctl.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/coda/coda_psdev.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/coda/coda_psdev.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/coda/coda_subr.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/coda/coda_subr.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/coda/coda_venus.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/coda/coda_venus.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/coda/coda_vfsops.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/coda/coda_vfsops.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/coda/coda_vnops.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/coda/coda_vnops.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/freebsd32/Makefile#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/freebsd32/freebsd32.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/freebsd32/freebsd32_misc.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/freebsd32/freebsd32_proto.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/freebsd32/freebsd32_signal.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/freebsd32/freebsd32_syscall.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/freebsd32/freebsd32_syscalls.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/freebsd32/freebsd32_sysent.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/freebsd32/freebsd32_util.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/freebsd32/syscalls.conf#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/freebsd32/syscalls.master#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/ia32/ia32_genassym.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/ia32/ia32_reg.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/ia32/ia32_signal.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/ia32/ia32_sysvec.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/ia32/ia32_util.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/linprocfs/linprocfs.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/linsysfs/linsysfs.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/linux/linux_emul.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/linux/linux_emul.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/linux/linux_file.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/linux/linux_futex.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/linux/linux_futex.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/linux/linux_getcwd.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/linux/linux_ioctl.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/linux/linux_ioctl.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/linux/linux_ipc.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/linux/linux_ipc.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/linux/linux_mib.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/linux/linux_mib.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/linux/linux_misc.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/linux/linux_misc.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/linux/linux_signal.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/linux/linux_signal.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/linux/linux_socket.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/linux/linux_socket.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/linux/linux_stats.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/linux/linux_sysctl.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/linux/linux_sysproto.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/linux/linux_time.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/linux/linux_uid16.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/linux/linux_util.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/linux/linux_util.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/ndis/cfg_var.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/ndis/hal_var.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/ndis/kern_ndis.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/ndis/kern_windrv.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/ndis/ndis_var.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/ndis/ntoskrnl_var.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/ndis/pe_var.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/ndis/resource_var.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/ndis/subr_hal.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/ndis/subr_ndis.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/ndis/subr_ntoskrnl.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/ndis/subr_pe.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/ndis/subr_usbd.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/ndis/usbd_var.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/ndis/winx32_wrap.S#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/ndis/winx64_wrap.S#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/netbsd/dvcfg.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/netbsd/physio_proc.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/kern/opensolaris_kmem.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/kern/opensolaris_kobj.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/kern/opensolaris_kstat.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/kern/opensolaris_misc.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/kern/opensolaris_policy.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/kern/opensolaris_string.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/kern/opensolaris_vfs.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/kern/opensolaris_zone.c#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/machine/endian.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/rpc/xdr.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/sys/acl.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/sys/byteorder.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/sys/callb.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/sys/cmn_err.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/sys/cred.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/sys/debug.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/sys/dirent.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/sys/dkio.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/sys/dnlc.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/sys/kcondvar.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/sys/kmem.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/sys/kobj.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/sys/kstat.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/sys/lock.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/sys/misc.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/sys/mntent.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/sys/mnttab.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/sys/mount.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/sys/mutex.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/sys/policy.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/sys/proc.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/sys/random.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/sys/rwlock.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/sys/sdt.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/sys/string.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/sys/sunddi.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/sys/sysmacros.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/sys/systm.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/sys/taskq.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/sys/taskq_impl.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/sys/time.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/sys/types.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/sys/uio.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/sys/varargs.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/sys/vfs.h#2 delete .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/zhouzhouyi_mactest_soc/sys/compat/opensolaris/sys/vnode.h#2 delete >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jun 24 08:08:34 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7436116A4ED; Sun, 24 Jun 2007 08:08:34 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0ABF716A400 for ; Sun, 24 Jun 2007 08:08:34 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id EE0A013C448 for ; Sun, 24 Jun 2007 08:08:33 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5O88Xti085924 for ; Sun, 24 Jun 2007 08:08:33 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5O88XTx085921 for perforce@freebsd.org; Sun, 24 Jun 2007 08:08:33 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sun, 24 Jun 2007 08:08:33 GMT Message-Id: <200706240808.l5O88XTx085921@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 122220 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Jun 2007 08:08:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=122220 Change 122220 by rdivacky@rdivacky_witten on 2007/06/24 08:07:41 Fexecve syscall. o modify exec_copyin_args to accept NULL fname argument o introduce fexecve() syscall o modify do_execve to use namei() only when fname != NULL and to use binvp instead of ndp->ni_vp Two problems with this: I am not sure about locking and the fexecve-ed process will have "fexec neco" as a process name. The POSIX draft does not specify what I should use as the name. Affected files ... .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/init_sysent.c#4 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_exec.c#4 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/syscalls.c#4 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/syscalls.master#4 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/systrace_args.c#4 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/imgact.h#2 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/syscall.h#4 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/syscall.mk#4 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/sysproto.h#4 edit Differences ... ==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/init_sysent.c#4 (text+ko) ==== @@ -507,4 +507,5 @@ { AS(faccessat_args), (sy_call_t *)faccessat, AUE_ACCESS, NULL, 0, 0 }, /* 475 = faccessat */ { AS(fchmodat_args), (sy_call_t *)fchmodat, AUE_CHMOD, NULL, 0, 0 }, /* 476 = fchmodat */ { AS(fchownat_args), (sy_call_t *)fchownat, AUE_CHOWN, NULL, 0, 0 }, /* 477 = fchownat */ + { AS(fexecve_args), (sy_call_t *)fexecve, AUE_EXECVE, NULL, 0, 0 }, /* 478 = fexecve */ }; ==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_exec.c#4 (text+ko) ==== @@ -188,6 +188,27 @@ } #ifndef _SYS_SYSPROTO_H_ +struct fexecve_args { + int fd; + char **argv; + char **envv; +} +#endif +int +fexecve(struct thread *td, struct fexecve_args *uap) +{ + int error; + struct image_args args; + + error = exec_copyin_args(&args, NULL, UIO_SYSSPACE, + uap->argv, uap->envv); + args.fd = uap->fd; + if (error == 0) + error = kern_execve(td, &args, NULL); + return (error); +} + +#ifndef _SYS_SYSPROTO_H_ struct __mac_execve_args { char *fname; char **argv; @@ -293,7 +314,7 @@ struct vnode *tracevp = NULL; struct ucred *tracecred = NULL; #endif - struct vnode *textvp = NULL; + struct vnode *textvp = NULL, *binvp = NULL; int credential_changing; int vfslocked; int textset; @@ -354,17 +375,29 @@ * XXXAUDIT: It would be desirable to also audit the name of the * interpreter if this is an interpreted binary. */ - ndp = &nd; - NDINIT(ndp, LOOKUP, ISOPEN | LOCKLEAF | FOLLOW | SAVENAME | MPSAFE | - AUDITVNODE1, UIO_SYSSPACE, args->fname, td); + if (args->fname != NULL) { + ndp = &nd; + NDINIT(ndp, LOOKUP, ISOPEN | LOCKLEAF | FOLLOW | SAVENAME + | MPSAFE | AUDITVNODE1, UIO_SYSSPACE, args->fname, td); + } interpret: - error = namei(ndp); - if (error) - goto exec_fail; + if (args->fname != NULL) { + error = namei(ndp); + if (error) + goto exec_fail; - vfslocked = NDHASGIANT(ndp); - imgp->vp = ndp->ni_vp; + vfslocked = NDHASGIANT(ndp); + binvp = ndp->ni_vp; + imgp->vp = binvp; + } else { + error = fgetvp(td, args->fd, &binvp); + if (error) + goto exec_fail; + VOP_LOCK(binvp, LK_EXCLUSIVE, td); + vfslocked = VFS_NEEDSGIANT(binvp->v_mount); + imgp->vp = binvp; + } /* * Check file permissions (also 'opens' file) @@ -436,12 +469,13 @@ */ imgp->vp->v_vflag &= ~VV_TEXT; /* free name buffer and old vnode */ - NDFREE(ndp, NDF_ONLY_PNBUF); + if (args->fname != NULL) + NDFREE(ndp, NDF_ONLY_PNBUF); #ifdef MAC interplabel = mac_vnode_label_alloc(); - mac_copy_vnode_label(ndp->ni_vp->v_label, interplabel); + mac_copy_vnode_label(binvp->v_label, interplabel); #endif - vput(ndp->ni_vp); + vput(binvp); vm_object_deallocate(imgp->object); imgp->object = NULL; VFS_UNLOCK_GIANT(vfslocked); @@ -449,6 +483,7 @@ /* set new name to that of the interpreter */ NDINIT(ndp, LOOKUP, LOCKLEAF | FOLLOW | SAVENAME | MPSAFE, UIO_SYSSPACE, imgp->interpreter_name, td); + args->fname = imgp->interpreter_name; goto interpret; } @@ -494,7 +529,7 @@ vn_lock(imgp->vp, LK_EXCLUSIVE | LK_RETRY, td); /* Get a reference to the vnode prior to locking the proc */ - VREF(ndp->ni_vp); + VREF(binvp); /* * For security and other reasons, signal handlers cannot @@ -520,8 +555,14 @@ execsigs(p); /* name this process - nameiexec(p, ndp) */ - len = min(ndp->ni_cnd.cn_namelen,MAXCOMLEN); - bcopy(ndp->ni_cnd.cn_nameptr, p->p_comm, len); + /* XXX: what for fexecve? */ + if (args->fname) { + len = min(ndp->ni_cnd.cn_namelen,MAXCOMLEN); + bcopy(ndp->ni_cnd.cn_nameptr, p->p_comm, len); + } else { + len = 10; + bcopy("fexec neco", p->p_comm, 10); + } p->p_comm[len] = 0; /* @@ -650,7 +691,7 @@ * to locking the proc lock. */ textvp = p->p_textvp; - p->p_textvp = ndp->ni_vp; + p->p_textvp = binvp; /* * Notify others that we exec'd, and clear the P_INEXEC flag @@ -733,8 +774,8 @@ vrele(textvp); VFS_UNLOCK_GIANT(tvfslocked); } - if (ndp->ni_vp && error != 0) - vrele(ndp->ni_vp); + if (binvp && error != 0) + vrele(binvp); #ifdef KTRACE if (tracevp != NULL) { int tvfslocked; @@ -763,7 +804,8 @@ exec_unmap_first_page(imgp); if (imgp->vp != NULL) { - NDFREE(ndp, NDF_ONLY_PNBUF); + if (args->fname) + NDFREE(ndp, NDF_ONLY_PNBUF); vput(imgp->vp); } @@ -981,11 +1023,14 @@ /* * Copy the file name. */ - error = (segflg == UIO_SYSSPACE) ? - copystr(fname, args->fname, PATH_MAX, &length) : - copyinstr(fname, args->fname, PATH_MAX, &length); - if (error != 0) - goto err_exit; + if (fname != NULL) { + error = (segflg == UIO_SYSSPACE) ? + copystr(fname, args->fname, PATH_MAX, &length) : + copyinstr(fname, args->fname, PATH_MAX, &length); + if (error != 0) + goto err_exit; + } else + args->fname = NULL; /* * extract arguments first ==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/syscalls.c#4 (text+ko) ==== @@ -485,4 +485,5 @@ "faccessat", /* 475 = faccessat */ "fchmodat", /* 476 = fchmodat */ "fchownat", /* 477 = fchownat */ + "fexecve", /* 478 = fexecve */ }; ==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/syscalls.master#4 (text+ko) ==== @@ -838,5 +838,6 @@ 475 AUE_ACCESS STD { int faccessat(int dirfd, char *path, int mode, int flag); } 476 AUE_CHMOD STD { int fchmodat(int dirfd, char *path, mode_t mode, int flag); } 477 AUE_CHOWN STD { int fchownat(int dirfd, char *path, uid_t uid, gid_t gid, int flag); } +478 AUE_EXECVE STD { int fexecve(int fd, char **argv, char **envv); } ; Please copy any additions and changes to the following compatability tables: ; sys/compat/freebsd32/syscalls.master ==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/systrace_args.c#4 (text+ko) ==== @@ -2836,6 +2836,15 @@ *n_args = 5; break; } + /* fexecve */ + case 478: { + struct fexecve_args *p = params; + iarg[0] = p->fd; /* int */ + uarg[1] = (intptr_t) p->argv; /* char ** */ + uarg[2] = (intptr_t) p->envv; /* char ** */ + *n_args = 3; + break; + } default: *n_args = 0; break; ==== //depot/projects/soc2007/rdivacky/linux_at/sys/sys/imgact.h#2 (text+ko) ==== @@ -45,6 +45,7 @@ int stringspace; /* space left in arg & env buffer */ int argc; /* count of argument strings */ int envc; /* count of environment strings */ + int fd; /* file descriptor of the executable */ }; struct image_params { ==== //depot/projects/soc2007/rdivacky/linux_at/sys/sys/syscall.h#4 (text+ko) ==== @@ -397,4 +397,5 @@ #define SYS_faccessat 475 #define SYS_fchmodat 476 #define SYS_fchownat 477 -#define SYS_MAXSYSCALL 478 +#define SYS_fexecve 478 +#define SYS_MAXSYSCALL 479 ==== //depot/projects/soc2007/rdivacky/linux_at/sys/sys/syscall.mk#4 (text+ko) ==== @@ -338,4 +338,5 @@ sctp_generic_recvmsg.o \ faccessat.o \ fchmodat.o \ - fchownat.o + fchownat.o \ + fexecve.o ==== //depot/projects/soc2007/rdivacky/linux_at/sys/sys/sysproto.h#4 (text+ko) ==== @@ -1501,6 +1501,11 @@ char gid_l_[PADL_(gid_t)]; gid_t gid; char gid_r_[PADR_(gid_t)]; char flag_l_[PADL_(int)]; int flag; char flag_r_[PADR_(int)]; }; +struct fexecve_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char argv_l_[PADL_(char **)]; char ** argv; char argv_r_[PADR_(char **)]; + char envv_l_[PADL_(char **)]; char ** envv; char envv_r_[PADR_(char **)]; +}; int nosys(struct thread *, struct nosys_args *); void sys_exit(struct thread *, struct sys_exit_args *); int fork(struct thread *, struct fork_args *); @@ -1836,6 +1841,7 @@ int faccessat(struct thread *, struct faccessat_args *); int fchmodat(struct thread *, struct fchmodat_args *); int fchownat(struct thread *, struct fchownat_args *); +int fexecve(struct thread *, struct fexecve_args *); #ifdef COMPAT_43 @@ -2390,6 +2396,7 @@ #define SYS_AUE_faccessat AUE_ACCESS #define SYS_AUE_fchmodat AUE_CHMOD #define SYS_AUE_fchownat AUE_CHOWN +#define SYS_AUE_fexecve AUE_EXECVE #undef PAD_ #undef PADL_ From owner-p4-projects@FreeBSD.ORG Sun Jun 24 08:48:45 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CA27C16A47E; Sun, 24 Jun 2007 08:48:44 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2543C16A41F for ; Sun, 24 Jun 2007 08:48:44 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 12C8D13C45B for ; Sun, 24 Jun 2007 08:48:44 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5O8miAh098466 for ; Sun, 24 Jun 2007 08:48:44 GMT (envelope-from zhouzhouyi@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5O8mhi8098450 for perforce@freebsd.org; Sun, 24 Jun 2007 08:48:43 GMT (envelope-from zhouzhouyi@FreeBSD.org) Date: Sun, 24 Jun 2007 08:48:43 GMT Message-Id: <200706240848.l5O8mhi8098450@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zhouzhouyi@FreeBSD.org using -f From: Zhouyi ZHOU To: Perforce Change Reviews Cc: Subject: PERFORCE change 122221 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Jun 2007 08:48:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=122221 Change 122221 by zhouzhouyi@zhouzhouyi_mactest on 2007/06/24 08:44:45 Edit the zhouzhouyi_mactest_soc to begin a new construction of MAC test log mechanism for user space application to analysis Affected files ... .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/README#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/TODO#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/acct/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/acct/pack.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/acct/regress.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/aio/aiotest/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/aio/aiotest/aiotest.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/aio/kqueue/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/aio/kqueue/aio_kqueue.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/aio/kqueue/lio/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/aio/kqueue/lio/lio_kqueue.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/atm/Funcs.sh#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/atm/README#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/atm/RunTest.sh#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/atm/harp/atm_udp.ng#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/atm/harp/memory_leak.sh#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/atm/proto_cc/RunTest.sh#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/atm/proto_sscfu/RunTest.sh#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/atm/proto_sscop/RunTest.sh#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/atm/proto_uni/RunTest.sh#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/audit/audit_pipe_ioctl/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/audit/audit_pipe_ioctl/audit_pipe_ioctl.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/builtins/alias.0#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/builtins/alias.0.stdout#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/builtins/alias.1#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/builtins/alias.1.stderr#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/builtins/command1.0#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/builtins/command2.0#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/builtins/command3.0#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/builtins/command3.0.stdout#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/builtins/command4.127#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/builtins/command5.0#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/builtins/command5.0.stdout#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/builtins/hash1.0#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/builtins/hash1.0.stdout#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/builtins/hash2.0#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/builtins/hash2.0.stdout#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/builtins/hash3.0#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/builtins/hash3.0.stdout#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/builtins/return1.0#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/builtins/return2.1#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/builtins/return3.1#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/builtins/type1.0#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/builtins/type1.0.stdout#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/builtins/unalias.0#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/builtins/var-assign.0#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/errors/bad-parm-exp1.0#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/errors/bad-parm-exp2.2#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/errors/bad-parm-exp2.2.stderr#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/errors/bad-parm-exp3.2#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/errors/bad-parm-exp3.2.stderr#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/errors/bad-parm-exp4.2#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/errors/bad-parm-exp4.2.stderr#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/errors/bad-parm-exp5.2#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/errors/bad-parm-exp5.2.stderr#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/errors/option-error.0#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/errors/redirection-error.0#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/regress.sh#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/regress.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/set-e/and1.0#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/set-e/and2.1#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/set-e/and3.0#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/set-e/and4.0#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/set-e/background1.0#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/set-e/cmd1.0#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/set-e/cmd2.1#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/set-e/elif1.0#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/set-e/elif2.0#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/set-e/for1.0#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/set-e/func1.0#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/set-e/func2.1#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/set-e/if1.0#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/set-e/if2.0#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/set-e/if3.0#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/set-e/not1.0#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/set-e/not2.0#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/set-e/or1.0#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/set-e/or2.0#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/set-e/or3.1#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/set-e/pipe1.1#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/set-e/pipe2.0#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/set-e/return1.0#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/set-e/semi1.1#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/set-e/semi2.1#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/set-e/subshell1.0#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/set-e/subshell2.1#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/set-e/until1.0#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/set-e/until2.0#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/set-e/until3.0#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/set-e/while1.0#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/set-e/while2.0#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/bin/sh/set-e/while3.0#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/ccd/layout/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/ccd/layout/a.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/ccd/layout/b.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/ccd/layout/ccd.sh#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/ccd/layout/ccd0.sh#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/ccd/layout/ref.128k_128k_128k_128k_0_0#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/ccd/layout/ref.128k_128k_128k_128k_0_4#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/ccd/layout/ref.128k_128k_128k_128k_4_0#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/ccd/layout/ref.128k_128k_128k_128k_4_2#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/ccd/layout/ref.128k_128k_128k_128k_4_4#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/ccd/layout/ref.256k_128k_128k_128k_0_0#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/ccd/layout/ref.256k_128k_128k_128k_0_4#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/ccd/layout/ref.256k_128k_128k_128k_4_0#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/ccd/layout/ref.256k_128k_128k_128k_4_2#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/ccd/layout/ref.256k_128k_128k_128k_4_4#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/ccd/layout/ref.256k_128k_384k_128k_0_0#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/ccd/layout/ref.256k_128k_384k_128k_0_4#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/ccd/layout/ref.256k_128k_384k_128k_16_0#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/ccd/layout/ref.256k_128k_384k_128k_16_2#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/ccd/layout/ref.256k_128k_384k_128k_16_4#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/ccd/layout/ref.256k_128k_384k_128k_4_0#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/ccd/layout/ref.256k_128k_384k_128k_4_2#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/ccd/layout/ref.256k_128k_384k_128k_4_4#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/ethernet/ethermulti/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/ethernet/ethermulti/ethermulti.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/execve/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/execve/doexec.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/execve/execve.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/execve/tests/badinterplen#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/execve/tests/devnullscript#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/execve/tests/goodaout.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/execve/tests/goodscript#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/execve/tests/nonexistshell#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/execve/tests/scriptarg#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/execve/tests/scriptarg-nospace#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fifo/fifo_create/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fifo/fifo_create/fifo_create.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fifo/fifo_io/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fifo/fifo_io/fifo_io.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fifo/fifo_misc/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fifo/fifo_misc/fifo_misc.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fifo/fifo_open/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fifo/fifo_open/fifo_open.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/file/dup/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/file/dup/dup.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/file/dup/dup.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/file/ftruncate/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/file/ftruncate/ftruncate.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/LICENSE#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/README#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/fstest.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/chflags/00.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/chflags/01.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/chflags/02.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/chflags/03.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/chflags/04.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/chflags/05.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/chflags/06.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/chflags/07.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/chflags/08.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/chflags/09.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/chflags/10.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/chflags/11.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/chflags/12.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/chflags/13.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/chmod/00.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/chmod/01.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/chmod/02.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/chmod/03.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/chmod/04.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/chmod/05.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/chmod/06.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/chmod/07.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/chmod/08.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/chmod/09.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/chmod/10.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/chmod/11.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/chown/00.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/chown/01.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/chown/02.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/chown/03.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/chown/04.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/chown/05.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/chown/06.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/chown/07.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/chown/08.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/chown/09.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/chown/10.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/conf#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/link/00.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/link/01.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/link/02.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/link/03.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/link/04.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/link/05.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/link/06.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/link/07.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/link/08.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/link/09.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/link/10.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/link/11.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/link/12.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/link/13.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/link/14.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/link/15.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/link/16.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/link/17.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/misc.sh#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/mkdir/00.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/mkdir/01.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/mkdir/02.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/mkdir/03.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/mkdir/04.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/mkdir/05.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/mkdir/06.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/mkdir/07.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/mkdir/08.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/mkdir/09.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/mkdir/10.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/mkdir/11.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/mkdir/12.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/mkfifo/00.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/mkfifo/01.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/mkfifo/02.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/mkfifo/03.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/mkfifo/04.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/mkfifo/05.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/mkfifo/06.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/mkfifo/07.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/mkfifo/08.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/mkfifo/09.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/mkfifo/10.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/mkfifo/11.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/mkfifo/12.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/open/00.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/open/01.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/open/02.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/open/03.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/open/04.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/open/05.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/open/06.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/open/07.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/open/08.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/open/09.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/open/10.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/open/11.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/open/12.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/open/13.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/open/14.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/open/15.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/open/16.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/open/17.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/open/18.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/open/19.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/open/20.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/open/21.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/open/22.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/open/23.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/rename/00.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/rename/01.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/rename/02.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/rename/03.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/rename/04.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/rename/05.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/rename/06.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/rename/07.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/rename/08.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/rename/09.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/rename/10.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/rename/11.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/rename/12.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/rename/13.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/rename/14.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/rename/15.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/rename/16.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/rename/17.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/rename/18.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/rename/19.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/rename/20.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/rmdir/00.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/rmdir/01.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/rmdir/02.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/rmdir/03.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/rmdir/04.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/rmdir/05.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/rmdir/06.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/rmdir/07.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/rmdir/08.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/rmdir/09.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/rmdir/10.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/rmdir/11.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/rmdir/12.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/rmdir/13.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/rmdir/14.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/rmdir/15.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/symlink/00.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/symlink/01.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/symlink/02.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/symlink/03.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/symlink/04.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/symlink/05.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/symlink/06.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/symlink/07.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/symlink/08.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/symlink/09.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/symlink/10.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/symlink/11.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/symlink/12.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/truncate/00.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/truncate/01.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/truncate/02.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/truncate/03.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/truncate/04.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/truncate/05.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/truncate/06.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/truncate/07.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/truncate/08.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/truncate/09.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/truncate/10.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/truncate/11.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/truncate/12.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/truncate/13.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/truncate/14.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/unlink/00.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/unlink/01.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/unlink/02.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/unlink/03.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/unlink/04.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/unlink/05.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/unlink/06.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/unlink/07.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/unlink/08.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/unlink/09.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/unlink/10.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/unlink/11.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/unlink/12.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fstest/tests/unlink/13.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fsx/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/fsx/fsx.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/gaithrstress/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/gaithrstress/gaithrstress.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/ConfCmp/ConfCmp.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/ConfCmp/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/ConfCmp/a1.conf#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/ConfCmp/a1a.conf#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/ConfCmp/a1b.conf#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/ConfCmp/a1c.conf#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/ConfCmp/a1d.conf#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/ConfCmp/a2.conf#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/ConfCmp/a2a.conf#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/ConfCmp/a2b.conf#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/ConfCmp/a2c.conf#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/ConfCmp/a2d.conf#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/Data/disk.alpha.da0.xml#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/Data/disk.alpha2.da0.xml#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/Data/disk.apple.xml#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/Data/disk.beast.da0.xml#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/Data/disk.critter.ad0.xml#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/Data/disk.empty.flp.xml#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/Data/disk.far.ad0.xml#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/Data/disk.flat.da1.xml#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/Data/disk.kern.flp.xml#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/Data/disk.msdos.ext.xml#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/Data/disk.msdos.flp.xml#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/Data/disk.pc98.wdc0.xml#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/Data/disk.sun.da0.xml#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/Data/disk.sun.da1.xml#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/Data/disk.typo.ad0.xml#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/MdLoad/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/MdLoad/MdLoad.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/Ref/disk.alpha.da0.xml#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/Ref/disk.alpha2.da0.xml#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/Ref/disk.apple.xml#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/Ref/disk.beast.da0.xml#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/Ref/disk.critter.ad0.xml#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/Ref/disk.empty.flp.xml#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/Ref/disk.far.ad0.xml#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/Ref/disk.flat.da1.xml#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/Ref/disk.kern.flp.xml#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/Ref/disk.msdos.ext.xml#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/Ref/disk.msdos.flp.xml#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/Ref/disk.pc98.wdc0.xml#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/Ref/disk.sun.da0.xml#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/Ref/disk.sun.da1.xml#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/Ref/disk.typo.ad0.xml#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/RunTest.sh#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom/RunTest.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_concat/conf.sh#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_concat/test-1.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_concat/test-2.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_eli/attach-d.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_eli/configure-b-B.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_eli/delkey.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_eli/detach-l.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_eli/init-a.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_eli/init-i-P.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_eli/init.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_eli/integrity-copy.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_eli/integrity-data.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_eli/integrity-hmac.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_eli/kill.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_eli/nokey.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_eli/onetime-a.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_eli/onetime-d.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_eli/onetime.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_eli/readonly.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_eli/setkey.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_gate/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_gate/runtests.sh#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_gate/test-1.sh#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_gate/test-1.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_gate/test-2.sh#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_gate/test-2.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_gate/test-3.sh#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_gate/test-3.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_gpt/gctl.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_gpt/test.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_mirror/conf.sh#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_mirror/test-1.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_mirror/test-2.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_mirror/test-3.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_mirror/test-4.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_mirror/test-5.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_mirror/test-6.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_mirror/test-7.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_nop/conf.sh#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_nop/test-1.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_nop/test-2.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_raid3/conf.sh#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_raid3/test-1.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_raid3/test-10.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_raid3/test-11.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_raid3/test-12.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_raid3/test-2.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_raid3/test-3.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_raid3/test-4.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_raid3/test-5.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_raid3/test-6.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_raid3/test-7.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_raid3/test-8.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_raid3/test-9.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_shsec/conf.sh#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_shsec/test-1.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_shsec/test-2.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_stripe/conf.sh#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_stripe/test-1.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_stripe/test-2.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_subr.sh#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_uzip/.cvsignore#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_uzip/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_uzip/etalon/etalon.txt#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_uzip/runtests.sh#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_uzip/test-1.img.uzip.uue#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_uzip/test-1.sh#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/geom_uzip/test-2.sh#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/ia64/emulated/brl.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/ia64/emulated/test.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/ia64/unaligned/test.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/ia64/unaligned/unaligned.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/include/tgmath/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/include/tgmath/tgmath.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/include/tgmath/tgmath.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/ipsec/ipsec.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/ipsec/ipsec6.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/gen/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/gen/test-fpclassify.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/gen/test-wordexp.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/locale/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/locale/test-btowc.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/locale/test-btowc.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/locale/test-iswctype.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/locale/test-iswctype.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/locale/test-mblen.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/locale/test-mblen.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/locale/test-mbrlen.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/locale/test-mbrlen.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/locale/test-mbrtowc.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/locale/test-mbrtowc.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/locale/test-mbsnrtowcs.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/locale/test-mbsnrtowcs.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/locale/test-mbsrtowcs.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/locale/test-mbsrtowcs.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/locale/test-mbstowcs.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/locale/test-mbstowcs.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/locale/test-mbtowc.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/locale/test-mbtowc.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/locale/test-towctrans.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/locale/test-towctrans.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/locale/test-wcrtomb.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/locale/test-wcrtomb.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/locale/test-wcsnrtombs.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/locale/test-wcsnrtombs.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/locale/test-wcsrtombs.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/locale/test-wcsrtombs.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/locale/test-wcstombs.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/locale/test-wcstombs.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/locale/test-wctomb.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/locale/test-wctomb.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/net/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/net/test-ether.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/net/test-ether.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/net/test-eui64.h#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/net/test-eui64_aton.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/net/test-eui64_aton.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/net/test-eui64_line.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/net/test-eui64_line.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/net/test-eui64_ntoa.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/net/test-eui64_ntoa.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/nss/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/nss/README#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/nss/mach#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/nss/test-getaddr.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/nss/test-getaddr.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/nss/test-getgr.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/nss/test-getgr.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/nss/test-gethostby.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/nss/test-gethostby.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/nss/test-getproto.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/nss/test-getproto.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/nss/test-getpw.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/nss/test-getpw.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/nss/test-getrpc.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/nss/test-getrpc.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/nss/test-getserv.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/nss/test-getserv.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/nss/test-getusershell.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/nss/test-getusershell.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/nss/testutil.h#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/regex/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/resolv/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/resolv/mach#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/resolv/resolv.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/resolv/resolv.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/stdio/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/stdio/test-perror.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/stdio/test-perror.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/stdio/test-printfloat.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/stdio/test-printfloat.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/stdio/test-scanfloat.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/stdio/test-scanfloat.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/stdlib/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/stdlib/test-heapsort.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/stdlib/test-heapsort.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/stdlib/test-mergesort.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/stdlib/test-mergesort.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/stdlib/test-qsort.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/stdlib/test-qsort.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/stdlib/test-sort.h#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/string/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/string/test-strerror.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libc/string/test-strerror.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libmp/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libmp/test-libmp.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libmp/test-libmp.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libutil/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libutil/test-trimdomain-nodomain.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libutil/test-trimdomain-nodomain.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libutil/test-trimdomain.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/libutil/test-trimdomain.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/msun/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/msun/test-fenv.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/msun/test-fenv.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/msun/test-ilogb.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/msun/test-ilogb.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/msun/test-lrint.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/msun/test-lrint.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/msun/test-lround.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/msun/test-lround.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/msun/test-next.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/msun/test-next.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/msun/test-rem.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/lib/msun/test-rem.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mac/mac_bsdextended/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mac/mac_bsdextended/test_matches.sh#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mac/mac_bsdextended/test_ugidfw.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mlock/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mlock/mlock.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mqueue/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mqueue/mqtest1/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mqueue/mqtest1/mqtest1.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mqueue/mqtest2/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mqueue/mqtest2/mqtest2.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mqueue/mqtest3/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mqueue/mqtest3/mqtest3.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mqueue/mqtest4/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mqueue/mqtest4/mqtest4.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mqueue/mqtest5/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mqueue/mqtest5/mqtest5.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/msdosfs/msdosfstest-2.sh#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/msdosfs/msdosfstest-3.sh#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/msdosfs/msdosfstest-4.sh#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/msdosfs/msdosfstest-5.sh#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/msdosfs/msdosfstest-6.sh#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/msdosfs/msdosfstest.sh#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/net80211/ccmp/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/net80211/ccmp/test_ccmp.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/net80211/tkip/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/net80211/tkip/test_tkip.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/net80211/wep/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/net80211/wep/test_wep.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netatalk/simple_send/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netatalk/simple_send/simple_send.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netinet/ipbroadcast/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netinet/ipbroadcast/ipbroadcast.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netinet/ipmulticast/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netinet/ipmulticast/ipmulticast.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netinet/ipsockopt/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netinet/ipsockopt/ipsockopt.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netinet/ipsockopt/ipsockopt.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netinet/msocket/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netinet/msocket/msocket.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netinet/msocket_ifnet_remove/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netinet/msocket_ifnet_remove/msocket_ifnet_remove.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netinet/rawconnect/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netinet/rawconnect/rawconnect.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netinet/rawconnect/rawconnect.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netinet/tcpconnect/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netinet/tcpconnect/tcpconnect.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netinet/tcpdrop/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netinet/tcpdrop/tcpdrop.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netinet/tcpfullwindowrst/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netinet/tcpfullwindowrst/tcpfullwindowrst.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netinet/tcpfullwindowrst/tcpfullwindowrsttest.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netinet/tcpsockclosebeforeaccept/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netinet/tcpsockclosebeforeaccept/tcpsockclosebeforeaccept.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netinet/tcpsocktimewait/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netinet/tcpsocktimewait/tcpsocktimewait.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netinet/tcpstream/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netinet/tcpstream/README#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netinet/tcpstream/tcpstream.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netinet/udpconnectjail/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netinet/udpconnectjail/udpconnectjail.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netinet6/inet6_rth/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netinet6/inet6_rth/inet6_rth-segments.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netinet6/inet6_rth/test_subr.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netinet6/inet6_rth/test_subr.h#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netinet6/ip6_sockets/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netinet6/ip6_sockets/ip6_sockets.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netipx/README#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netipx/ipxdgramloopback/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netipx/ipxdgramloopback/ipxdgramloopback.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netipx/ipxsocket/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netipx/ipxsocket/ipxsocket.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netipx/spxabort/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netipx/spxabort/spxabort.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netipx/spxloopback/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/netipx/spxloopback/spxloopback.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/nfsmmap/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/nfsmmap/README#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/nfsmmap/test1/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/nfsmmap/test1/test1.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/nfsmmap/test1/test1.good.uu#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/nfsmmap/test1/test1.zeros.uu#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/nfsmmap/test2/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/nfsmmap/test2/test2.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/nfsmmap/test2/test2.good.uu#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/nfsmmap/test2/test2.zeros.uu#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/p1003_1b/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/p1003_1b/README#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/p1003_1b/fifo.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/p1003_1b/main.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/p1003_1b/memlock.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/p1003_1b/p26.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/p1003_1b/prutil.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/p1003_1b/prutil.h#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/p1003_1b/sched.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/p1003_1b/yield.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/pipe/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/pipe/bigpipetest.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/pipe/bigpipetest.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/pipe/pipe-fstatbug.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/pipe/pipe-overcommit1.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/pipe/pipe-overcommit2.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/pipe/pipe-reverse.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/pipe/pipe-wraparound.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/priv/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/priv/main.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/priv/main.h#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/priv/priv_acct.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/priv/priv_adjtime.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/priv/priv_clock_settime.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/priv/priv_io.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/priv/priv_kenv_set.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/priv/priv_kenv_unset.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/priv/priv_proc_setlogin.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/priv/priv_proc_setrlimit.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/priv/priv_sched_rtprio.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/priv/priv_sched_setpriority.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/priv/priv_settimeofday.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/priv/priv_sysctl_write.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/priv/priv_vfs_admin.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/priv/priv_vfs_chown.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/priv/priv_vfs_chroot.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/priv/priv_vfs_clearsugid.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/priv/priv_vfs_extattr_system.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/priv/priv_vfs_fhopen.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/priv/priv_vfs_fhstat.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/priv/priv_vfs_fhstatfs.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/priv/priv_vfs_generation.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/priv/priv_vfs_getfh.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/priv/priv_vfs_read_write.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/priv/priv_vfs_setgid.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/priv/priv_vfs_stickyfile.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/priv/priv_vm_madv_protect.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/priv/priv_vm_mlock.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/priv/priv_vm_munlock.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/priv/test_utimes.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/pthread/cv_cancel1/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/pthread/cv_cancel1/cv_cancel1.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/redzone9/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/redzone9/README#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/redzone9/redzone.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/redzone9/test.sh#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/security/access/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/security/access/testaccess.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/security/proc_to_proc/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/security/proc_to_proc/README#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/security/proc_to_proc/scenario.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/security/proc_to_proc/scenario.h#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/security/proc_to_proc/testuid.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sigqueue/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sigqueue/sigqtest1/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sigqueue/sigqtest1/sigqtest1.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sigqueue/sigqtest2/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sigqueue/sigqtest2/sigqtest2.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/accept_fd_leak/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/accept_fd_leak/accept_fd_leak.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/accept_fd_leak/accept_fd_leak.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/accf_data_attach/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/accf_data_attach/accf_data_attach.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/accf_data_attach/accf_data_attach.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/kqueue/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/kqueue/kqueue.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/kqueue/kqueue.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/listen_backlog/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/listen_backlog/listen_backlog.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/listenclose/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/listenclose/listenclose.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/pr_atomic/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/pr_atomic/pr_atomic.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/reconnect/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/reconnect/reconnect.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/rtsocket/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/rtsocket/rtsocket.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/sblock/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/sblock/sblock.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/sendfile/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/sendfile/sendfile.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/shutdown/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/shutdown/shutdown.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/sigpipe/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/sigpipe/sigpipe.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/socketpair/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/socketpair/socketpair.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/unix_bindconnect/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/unix_bindconnect/unix_bindconnect.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/unix_cmsg/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/unix_cmsg/README#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/unix_cmsg/unix_cmsg.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/unix_cmsg/unix_cmsg.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/unix_passfd/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/unix_passfd/unix_passfd.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/unix_sendtorace/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/unix_sendtorace/unix_sendtorace.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/unix_socket/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/unix_socket/unix_socket.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/zerosend/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sockets/zerosend/zerosend.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sysvmsg/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sysvmsg/README#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sysvmsg/msgtest.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sysvsem/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sysvsem/README#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sysvsem/semtest.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sysvshm/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sysvshm/README#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/sysvshm/shmtest.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tls/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tls/Makefile.inc#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tls/libxx/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tls/libxx/xx.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tls/libyy/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tls/libyy/yy.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tls/ttls1/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tls/ttls1/ttls1.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tls/ttls2/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tls/ttls2/ttls2.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tls/ttls3/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tls/ttls3/elftls.S#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tls/ttls3/tls-test-lib.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tls/ttls3/tls-test.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tls/ttls4/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tls/ttls4/ttls4.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tmpfs/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tmpfs/h_funcs.subr#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tmpfs/h_tools.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tmpfs/t_create#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tmpfs/t_dots#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tmpfs/t_exec#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tmpfs/t_id_gen#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tmpfs/t_link#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tmpfs/t_mkdir#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tmpfs/t_mount#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tmpfs/t_pipes#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tmpfs/t_read_write#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tmpfs/t_readdir#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tmpfs/t_remove#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tmpfs/t_rename#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tmpfs/t_rmdir#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tmpfs/t_setattr#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tmpfs/t_sizes#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tmpfs/t_sockets#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tmpfs/t_statvfs#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tmpfs/t_symlink#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tmpfs/t_times#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tmpfs/t_trail_slash#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tmpfs/t_truncate#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tmpfs/t_vnd#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/tmpfs/t_vnode_leak#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/ufs/uprintf/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/ufs/uprintf/ufs_uprintf.c#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/calendar/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/calendar/calendar.calibrate#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/calendar/regress.a1.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/calendar/regress.a2.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/calendar/regress.a3.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/calendar/regress.a4.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/calendar/regress.a5.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/calendar/regress.b1.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/calendar/regress.b2.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/calendar/regress.b3.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/calendar/regress.b4.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/calendar/regress.b5.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/calendar/regress.s1.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/calendar/regress.s2.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/calendar/regress.s3.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/calendar/regress.s4.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/calendar/regress.sh#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/calendar/regress.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/calendar/regress.w0-1.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/calendar/regress.w0-2.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/calendar/regress.w0-3.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/calendar/regress.w0-4.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/calendar/regress.w0-5.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/calendar/regress.w0-6.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/calendar/regress.w0-7.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/calendar/regress.wn-1.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/calendar/regress.wn-2.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/calendar/regress.wn-3.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/calendar/regress.wn-4.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/calendar/regress.wn-5.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/calendar/regress.wn-6.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/calendar/regress.wn-7.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/env/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/env/regress-env.rgdata#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/env/regress-sb.rb#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/file2c/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/file2c/regress.1.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/file2c/regress.2.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/file2c/regress.3.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/file2c/regress.4.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/file2c/regress.5.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/file2c/regress.6.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/file2c/regress.7.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/file2c/regress.8.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/file2c/regress.9.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/file2c/regress.in#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/file2c/regress.sh#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/file2c/regress.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/join/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/join/regress.1.in#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/join/regress.2.in#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/join/regress.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/join/regress.sh#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/join/regress.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.ascii.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.block.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.dddh.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.ddhd.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.ddhd2.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.ddhh.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.ddhh2.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.dhdd.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.dhdh.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.dhhd.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.dhhd2.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.dhhh.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.dhhh2.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.ed.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.grep.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.hddd.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.hddd2.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.hddh.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.hddh2.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.hdhd.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.hdhd2.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.hdhh.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.hdhh2.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.hhdd.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.hhdd2.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.hhdh.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.hhdh2.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.hhhd.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.hhhd2.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.hhhh.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.hhhh2.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.n21.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.sh#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.stutter.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.tabs.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.wX.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.wXl.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.wc.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.wdl.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.wdn.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.we.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.wf.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.wg.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.wgd.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.wo.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.wp1.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.wp2.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.wp3.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.wp4.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.wp5.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.wp6.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.wu.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.wwe.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.wx.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.wxn.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.x.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.xaa.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/jot/regress.yes.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/lastcomm/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/lastcomm/README#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/lastcomm/regress.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/lastcomm/v1-amd64-acct.in#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/lastcomm/v1-amd64.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/lastcomm/v1-i386-acct.in#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/lastcomm/v1-i386.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/lastcomm/v1-sparc64-acct.in#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/lastcomm/v1-sparc64.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/lastcomm/v2-amd64-acct.in#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/lastcomm/v2-amd64.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/lastcomm/v2-i386-acct.in#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/lastcomm/v2-i386.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/lastcomm/v2-sparc64-acct.in#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/lastcomm/v2-sparc64.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/lastcomm/values.sh#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/m4/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/m4/regress.changecom.in#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/m4/regress.changecom.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/m4/regress.gchangecom.out#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/m4/regress.sh#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/m4/regress.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/make/README#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/make/all.sh#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/make/archives/fmt_44bsd/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/make/archives/fmt_44bsd/expected.status.1#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/make/archives/fmt_44bsd/expected.status.2#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/make/archives/fmt_44bsd/expected.status.3#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/make/archives/fmt_44bsd/expected.status.4#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/make/archives/fmt_44bsd/expected.status.5#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/make/archives/fmt_44bsd/expected.status.6#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/make/archives/fmt_44bsd/expected.status.7#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.1#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.2#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.3#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.4#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.5#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.6#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/make/archives/fmt_44bsd/expected.stderr.7#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.1#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.2#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.3#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.4#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.5#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.6#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/make/archives/fmt_44bsd/expected.stdout.7#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/make/archives/fmt_44bsd/libtest.a#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/make/archives/fmt_44bsd/test.t#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/make/archives/fmt_44bsd_mod/Makefile#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.1#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.2#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.3#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.4#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.5#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.6#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.status.7#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.1#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.2#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.3#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.4#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.5#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.6#1 branch .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/usr.bin/make/archives/fmt_44bsd_mod/expected.stderr.7#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Jun 24 08:57:56 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 182AD16A46B; Sun, 24 Jun 2007 08:57:56 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id DEE2616A400 for ; Sun, 24 Jun 2007 08:57:55 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id CD92D13C458 for ; Sun, 24 Jun 2007 08:57:55 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5O8vtPt099088 for ; Sun, 24 Jun 2007 08:57:55 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5O8vtqx099085 for perforce@freebsd.org; Sun, 24 Jun 2007 08:57:55 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sun, 24 Jun 2007 08:57:55 GMT Message-Id: <200706240857.l5O8vtqx099085@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 122222 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Jun 2007 08:57:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=122222 Change 122222 by rdivacky@rdivacky_witten on 2007/06/24 08:57:35 Add fstatat, futimesat, linkat, mkdirat, mkfifoat, mknodat, openat, readlinkat, renameat, symlinkat and unlinkat. Unlinkat AT_REMOVEDIR support is incomplete, we lack checking for non-emptiness of the dir in question. None if these is tested by something else but compilation. Affected files ... .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_file.c#12 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/init_sysent.c#5 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/syscalls.c#5 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/syscalls.master#5 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/systrace_args.c#5 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#28 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/syscall.h#5 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/syscall.mk#5 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/syscallsubr.h#12 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/sysproto.h#5 edit Differences ... ==== //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_file.c#12 (text+ko) ==== @@ -1018,7 +1018,7 @@ args->newdfd, to, args->flags); #endif - error = kern_linkat(td, path, to, UIO_SYSSPACE, olddfd, newdfd); + error = kern_linkat(td, path, to, UIO_SYSSPACE, olddfd, newdfd, FOLLOW); LFREEPATH(path); LFREEPATH(to); return (error); ==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/init_sysent.c#5 (text+ko) ==== @@ -508,4 +508,15 @@ { AS(fchmodat_args), (sy_call_t *)fchmodat, AUE_CHMOD, NULL, 0, 0 }, /* 476 = fchmodat */ { AS(fchownat_args), (sy_call_t *)fchownat, AUE_CHOWN, NULL, 0, 0 }, /* 477 = fchownat */ { AS(fexecve_args), (sy_call_t *)fexecve, AUE_EXECVE, NULL, 0, 0 }, /* 478 = fexecve */ + { AS(fstatat_args), (sy_call_t *)fstatat, AUE_STAT, NULL, 0, 0 }, /* 479 = fstatat */ + { AS(futimesat_args), (sy_call_t *)futimesat, AUE_UTIMES, NULL, 0, 0 }, /* 480 = futimesat */ + { AS(linkat_args), (sy_call_t *)linkat, AUE_LINK, NULL, 0, 0 }, /* 481 = linkat */ + { AS(mkdirat_args), (sy_call_t *)mkdirat, AUE_MKDIR, NULL, 0, 0 }, /* 482 = mkdirat */ + { AS(mkfifoat_args), (sy_call_t *)mkfifoat, AUE_MKFIFO, NULL, 0, 0 }, /* 483 = mkfifoat */ + { AS(mknodat_args), (sy_call_t *)mknodat, AUE_MKNOD, NULL, 0, 0 }, /* 484 = mknodat */ + { AS(openat_args), (sy_call_t *)openat, AUE_OPEN_RWTC, NULL, 0, 0 }, /* 485 = openat */ + { AS(readlinkat_args), (sy_call_t *)readlinkat, AUE_READLINK, NULL, 0, 0 }, /* 486 = readlinkat */ + { AS(renameat_args), (sy_call_t *)renameat, AUE_RENAME, NULL, 0, 0 }, /* 487 = renameat */ + { AS(symlinkat_args), (sy_call_t *)symlinkat, AUE_SYMLINK, NULL, 0, 0 }, /* 488 = symlinkat */ + { AS(unlinkat_args), (sy_call_t *)unlinkat, AUE_UNLINK, NULL, 0, 0 }, /* 489 = unlinkat */ }; ==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/syscalls.c#5 (text+ko) ==== @@ -486,4 +486,15 @@ "fchmodat", /* 476 = fchmodat */ "fchownat", /* 477 = fchownat */ "fexecve", /* 478 = fexecve */ + "fstatat", /* 479 = fstatat */ + "futimesat", /* 480 = futimesat */ + "linkat", /* 481 = linkat */ + "mkdirat", /* 482 = mkdirat */ + "mkfifoat", /* 483 = mkfifoat */ + "mknodat", /* 484 = mknodat */ + "openat", /* 485 = openat */ + "readlinkat", /* 486 = readlinkat */ + "renameat", /* 487 = renameat */ + "symlinkat", /* 488 = symlinkat */ + "unlinkat", /* 489 = unlinkat */ }; ==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/syscalls.master#5 (text+ko) ==== @@ -839,5 +839,17 @@ 476 AUE_CHMOD STD { int fchmodat(int dirfd, char *path, mode_t mode, int flag); } 477 AUE_CHOWN STD { int fchownat(int dirfd, char *path, uid_t uid, gid_t gid, int flag); } 478 AUE_EXECVE STD { int fexecve(int fd, char **argv, char **envv); } +479 AUE_STAT STD { int fstatat(int fd, char *path, struct stat *buf, int flag); } +480 AUE_UTIMES STD { int futimesat(int fd, char *path, struct timeval *times); } +481 AUE_LINK STD { int linkat(int fd1, char *path1, int fd2, char *path2, int flag); } +482 AUE_MKDIR STD { int mkdirat(int fd, char *path, mode_t mode); } +483 AUE_MKFIFO STD { int mkfifoat(int fd, char *path, mode_t mode); } +484 AUE_MKNOD STD { int mknodat(int fd, char *path, mode_t mode, dev_t dev); } +; XXX: see the comment for open +485 AUE_OPEN_RWTC STD { int openat(int fd, char *path, int flag, mode_t mode); } +486 AUE_READLINK STD { ssize_t readlinkat(int fd, char *path, char *buf, size_t bufsize); } +487 AUE_RENAME STD { int renameat(int oldfd, char *old, int newfd, char *new); } +488 AUE_SYMLINK STD { int symlinkat(char *path1, int fd, char *path2); } +489 AUE_UNLINK STD { int unlinkat(int fd, char *path, int flag); } ; Please copy any additions and changes to the following compatability tables: ; sys/compat/freebsd32/syscalls.master ==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/systrace_args.c#5 (text+ko) ==== @@ -2845,6 +2845,112 @@ *n_args = 3; break; } + /* fstatat */ + case 479: { + struct fstatat_args *p = params; + iarg[0] = p->fd; /* int */ + uarg[1] = (intptr_t) p->path; /* char * */ + uarg[2] = (intptr_t) p->buf; /* struct stat * */ + iarg[3] = p->flag; /* int */ + *n_args = 4; + break; + } + /* futimesat */ + case 480: { + struct futimesat_args *p = params; + iarg[0] = p->fd; /* int */ + uarg[1] = (intptr_t) p->path; /* char * */ + uarg[2] = (intptr_t) p->times; /* struct timeval * */ + *n_args = 3; + break; + } + /* linkat */ + case 481: { + struct linkat_args *p = params; + iarg[0] = p->fd1; /* int */ + uarg[1] = (intptr_t) p->path1; /* char * */ + iarg[2] = p->fd2; /* int */ + uarg[3] = (intptr_t) p->path2; /* char * */ + iarg[4] = p->flag; /* int */ + *n_args = 5; + break; + } + /* mkdirat */ + case 482: { + struct mkdirat_args *p = params; + iarg[0] = p->fd; /* int */ + uarg[1] = (intptr_t) p->path; /* char * */ + iarg[2] = p->mode; /* mode_t */ + *n_args = 3; + break; + } + /* mkfifoat */ + case 483: { + struct mkfifoat_args *p = params; + iarg[0] = p->fd; /* int */ + uarg[1] = (intptr_t) p->path; /* char * */ + iarg[2] = p->mode; /* mode_t */ + *n_args = 3; + break; + } + /* mknodat */ + case 484: { + struct mknodat_args *p = params; + iarg[0] = p->fd; /* int */ + uarg[1] = (intptr_t) p->path; /* char * */ + iarg[2] = p->mode; /* mode_t */ + iarg[3] = p->dev; /* dev_t */ + *n_args = 4; + break; + } + /* openat */ + case 485: { + struct openat_args *p = params; + iarg[0] = p->fd; /* int */ + uarg[1] = (intptr_t) p->path; /* char * */ + iarg[2] = p->flag; /* int */ + iarg[3] = p->mode; /* mode_t */ + *n_args = 4; + break; + } + /* readlinkat */ + case 486: { + struct readlinkat_args *p = params; + iarg[0] = p->fd; /* int */ + uarg[1] = (intptr_t) p->path; /* char * */ + uarg[2] = (intptr_t) p->buf; /* char * */ + uarg[3] = p->bufsize; /* size_t */ + *n_args = 4; + break; + } + /* renameat */ + case 487: { + struct renameat_args *p = params; + iarg[0] = p->oldfd; /* int */ + uarg[1] = (intptr_t) p->old; /* char * */ + iarg[2] = p->newfd; /* int */ + uarg[3] = (intptr_t) p->new; /* char * */ + *n_args = 4; + break; + } + /* symlinkat */ + case 488: { + struct symlinkat_args *p = params; + uarg[0] = (intptr_t) p->path1; /* char * */ + iarg[1] = p->fd; /* int */ + uarg[2] = (intptr_t) p->path2; /* char * */ + *n_args = 3; + break; + } + /* unlinkat */ + case 489: { + struct unlinkat_args *p = params; + iarg[0] = p->fd; /* int */ + uarg[1] = (intptr_t) p->path; /* char * */ + iarg[2] = p->flag; /* int */ + *n_args = 3; + break; + } default: *n_args = 0; break; ==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#28 (text+ko) ==== @@ -955,7 +955,21 @@ return kern_open(td, uap->path, UIO_USERSPACE, uap->flags, uap->mode); } +#ifndef _SYS_SYSPROTO_H_ +struct openat_args { + int fd; + char *path; + int flag; + int mode; +}; +#endif int +openat(struct thread *td, struct openat_args *args) +{ + return kern_openat(td, args->path, UIO_USERSPACE, args->flag, args->mode, args->fd); +} + +int kern_open(struct thread *td, char *path, enum uio_seg pathseg, int flags, int mode) { @@ -1200,6 +1214,19 @@ return (kern_mknod(td, uap->path, UIO_USERSPACE, uap->mode, uap->dev)); } +#ifndef _SYS_SYSPROTO_H_ +struct mknodat_args { + char *path; + mode_t mode; + dev_t dev; +}; +#endif +int +mknodat(struct thread *td, struct mknodat_args *args) +{ + return kern_mknodat(td, args->path, UIO_USERSPACE, args->mode, args->dev, args->fd); +} + int kern_mknod(struct thread *td, char *path, enum uio_seg pathseg, int mode, int dev) @@ -1348,6 +1375,19 @@ return (kern_mkfifo(td, uap->path, UIO_USERSPACE, uap->mode)); } +#ifndef _SYS_SYSPROTO_H_ +struct mkfifoat_args { + int fd; + char *path; + mode_t mode; +}; +#endif +int +mkfifoat(struct thread *td, struct mkfifoat_args *args) +{ + return kern_mkfifoat(td, args->path, UIO_USERSPACE, args->mode, args->fd); +} + int kern_mkfifo(struct thread *td, char *path, enum uio_seg pathseg, int mode) { @@ -1453,6 +1493,27 @@ return (error); } +#ifndef _SYS_SYSPROTO_H_ +struct linkat_args { + int fd1; + char *path1; + int fd2; + char *path2; + int flag; +}; +#endif +int +linkat(struct thread *td, struct linkat_args *args) +{ + if (args->flag & ~AT_SYMLINK_NOFOLLOW) + return (EINVAL); + + if (args->flag & AT_SYMLINK_NOFOLLOW) + return kern_linkat(td, args->path1, args->path2, UIO_USERSPACE, args->fd1, args->fd2, 0); + else + return kern_linkat(td, args->path1, args->path2, UIO_USERSPACE, args->fd1, args->fd2, FOLLOW); +} + static int hardlink_check_uid = 0; SYSCTL_INT(_security_bsd, OID_AUTO, hardlink_check_uid, CTLFLAG_RW, &hardlink_check_uid, 0, @@ -1495,12 +1556,12 @@ int kern_link(struct thread *td, char *path, char *link, enum uio_seg segflg) { - return kern_linkat(td, path, link, segflg, AT_FDCWD, AT_FDCWD); + return kern_linkat(td, path, link, segflg, AT_FDCWD, AT_FDCWD, FOLLOW); } int kern_linkat(struct thread *td, char *path, char *link, enum uio_seg segflg, - int olddirfd, int newdirfd) + int olddirfd, int newdirfd, int follow) { struct nameidata ndp, ndl; int error; @@ -1514,7 +1575,7 @@ if (error && !kern_absolute_path(path, segflg)) return (error); - NDINIT_AT(&ndp, LOOKUP, ((error) ? ATBADF : 0) | FOLLOW | MPSAFE + NDINIT_AT(&ndp, LOOKUP, ((error) ? ATBADF : 0) | follow | MPSAFE | AUDITVNODE1, segflg, path, td, pdir_vn); error = kern_get_at(td, newdirfd, &ldir_vn); @@ -1601,7 +1662,20 @@ return (kern_symlink(td, uap->path, uap->link, UIO_USERSPACE)); } +#ifndef _SYS_SYSPROTO_H_ +struct symlinkat_args { + char *path; + int fd; + char *path2; +}; +#endif int +symlinkat(struct thread *td, struct symlinkat_args *args) +{ + return kern_symlinkat(td, args->path1, args->path2, UIO_USERSPACE, args->fd); +} + +int kern_symlink(struct thread *td, char *path, char *link, enum uio_seg segflg) { return kern_symlinkat(td, path, link, segflg, AT_FDCWD); @@ -1761,6 +1835,25 @@ return (error); } +#ifndef _SYS_SYSPROTO_H_ +struct unlinkat_args { + int fd; + char *path; + int flag; +}; +#endif +int +unlinkat(struct thread *td, struct unlinkat_args *args) +{ + if (args->flag & ~AT_REMOVEDIR) + return (EINVAL); + + if (args->flag & AT_REMOVEDIR) + return kern_rmdirat(td, args->path, UIO_USERSPACE, args->fd); + else + return kern_unlinkat(td, args->path, UIO_USERSPACE, args->fd); +} + int kern_unlink(struct thread *td, char *path, enum uio_seg pathseg) { @@ -2249,6 +2342,26 @@ return (error); } +#ifndef _SYS_SYSPROTO_H_ +struct fstatat_args { + int fd; + char *path; + struct stat *buf; + int flag; +} +#endif +int +fstatat(struct thread *td, struct fstatat_args *args) +{ + if (args->flag & ~AT_SYMLINK_NOFOLLOW) + return (EINVAL); + + if (args->flag & AT_SYMLINK_NOFOLLOW) + return kern_lstatat(td, args->path, UIO_USERSPACE, args->buf, args->fd); + else + return kern_statat(td, args->path, UIO_USERSPACE, args->buf, args->fd); +} + int kern_stat(struct thread *td, char *path, enum uio_seg pathseg, struct stat *sbp) { @@ -2506,6 +2619,20 @@ return (kern_readlink(td, uap->path, UIO_USERSPACE, uap->buf, UIO_USERSPACE, uap->count)); } +#ifndef _SYS_SYSPROTO_H_ +struct readlinkat_args { + int fd; + char *path; + char *buf; + size_t bufsize; +}; +#endif +ssize_t +readlinkat(struct thread *td, struct readlinkat_args *args) +{ + return kern_readlinkat(td, args->path, UIO_USERSPACE, + args->buf, UIO_USERSPACE, args->bufsize, args->fd); +} int kern_readlink(struct thread *td, char *path, enum uio_seg pathseg, char *buf, @@ -3199,7 +3326,15 @@ UIO_USERSPACE)); } +#ifndef _SYS_SYSPROTO_H_ +#endif int +futimesat(struct thread *td, struct futimesat_args *args) +{ + return kern_utimesat(td, args->path, UIO_USERSPACE, args->times, UIO_USERSPACE, args->fd); +} + +int kern_utimes(struct thread *td, char *path, enum uio_seg pathseg, struct timeval *tptr, enum uio_seg tptrseg) { @@ -3581,6 +3716,20 @@ return (kern_rename(td, uap->from, uap->to, UIO_USERSPACE)); } +#ifndef _SYS_SYSPROTO_H_ +struct renameat_args { + int oldfd; + char *old; + int newfd; + char *new; +}; +#endif +int +renameat(struct thread *td, struct renameat_args *args) +{ + return kern_renameat(td, args->old, args->new, UIO_USERSPACE, args->oldfd, args->newfd); +} + int kern_rename(struct thread *td, char *from, char *to, enum uio_seg pathseg) { @@ -3737,6 +3886,19 @@ return (kern_mkdir(td, uap->path, UIO_USERSPACE, uap->mode)); } +#ifndef _SYS_SYSPROTO_H_ +struct mkdirat_args { + int fd; + char *path; + mode_t mode; +}; +#endif +int +mkdirat(struct thread *td, struct mkdirat_args *args) +{ + return kern_mkdirat(td, args->path, UIO_USERSPACE, args->mode, args->fd); +} + int kern_mkdir(struct thread *td, char *path, enum uio_seg segflg, int mode) { ==== //depot/projects/soc2007/rdivacky/linux_at/sys/sys/syscall.h#5 (text+ko) ==== @@ -398,4 +398,15 @@ #define SYS_fchmodat 476 #define SYS_fchownat 477 #define SYS_fexecve 478 -#define SYS_MAXSYSCALL 479 +#define SYS_fstatat 479 +#define SYS_futimesat 480 +#define SYS_linkat 481 +#define SYS_mkdirat 482 +#define SYS_mkfifoat 483 +#define SYS_mknodat 484 +#define SYS_openat 485 +#define SYS_readlinkat 486 +#define SYS_renameat 487 +#define SYS_symlinkat 488 +#define SYS_unlinkat 489 +#define SYS_MAXSYSCALL 490 ==== //depot/projects/soc2007/rdivacky/linux_at/sys/sys/syscall.mk#5 (text+ko) ==== @@ -339,4 +339,15 @@ faccessat.o \ fchmodat.o \ fchownat.o \ - fexecve.o + fexecve.o \ + fstatat.o \ + futimesat.o \ + linkat.o \ + mkdirat.o \ + mkfifoat.o \ + mknodat.o \ + openat.o \ + readlinkat.o \ + renameat.o \ + symlinkat.o \ + unlinkat.o ==== //depot/projects/soc2007/rdivacky/linux_at/sys/sys/syscallsubr.h#12 (text+ko) ==== @@ -115,7 +115,7 @@ int kern_link(struct thread *td, char *path, char *link, enum uio_seg segflg); int kern_linkat(struct thread *td, char *path, char *link, - enum uio_seg segflg, int olddfd, int newdfd); + enum uio_seg segflg, int olddfd, int newdfd, int follow); int kern_lstat(struct thread *td, char *path, enum uio_seg pathseg, struct stat *sbp); int kern_lstatat(struct thread *td, char *path, enum uio_seg pathseg, ==== //depot/projects/soc2007/rdivacky/linux_at/sys/sys/sysproto.h#5 (text+ko) ==== @@ -1506,6 +1506,68 @@ char argv_l_[PADL_(char **)]; char ** argv; char argv_r_[PADR_(char **)]; char envv_l_[PADL_(char **)]; char ** envv; char envv_r_[PADR_(char **)]; }; +struct fstatat_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; + char buf_l_[PADL_(struct stat *)]; struct stat * buf; char buf_r_[PADR_(struct stat *)]; + char flag_l_[PADL_(int)]; int flag; char flag_r_[PADR_(int)]; +}; +struct futimesat_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; + char times_l_[PADL_(struct timeval *)]; struct timeval * times; char times_r_[PADR_(struct timeval *)]; +}; +struct linkat_args { + char fd1_l_[PADL_(int)]; int fd1; char fd1_r_[PADR_(int)]; + char path1_l_[PADL_(char *)]; char * path1; char path1_r_[PADR_(char *)]; + char fd2_l_[PADL_(int)]; int fd2; char fd2_r_[PADR_(int)]; + char path2_l_[PADL_(char *)]; char * path2; char path2_r_[PADR_(char *)]; + char flag_l_[PADL_(int)]; int flag; char flag_r_[PADR_(int)]; +}; +struct mkdirat_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; + char mode_l_[PADL_(mode_t)]; mode_t mode; char mode_r_[PADR_(mode_t)]; +}; +struct mkfifoat_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; + char mode_l_[PADL_(mode_t)]; mode_t mode; char mode_r_[PADR_(mode_t)]; +}; +struct mknodat_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; + char mode_l_[PADL_(mode_t)]; mode_t mode; char mode_r_[PADR_(mode_t)]; + char dev_l_[PADL_(dev_t)]; dev_t dev; char dev_r_[PADR_(dev_t)]; +}; +struct openat_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; + char flag_l_[PADL_(int)]; int flag; char flag_r_[PADR_(int)]; + char mode_l_[PADL_(mode_t)]; mode_t mode; char mode_r_[PADR_(mode_t)]; +}; +struct readlinkat_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; + char buf_l_[PADL_(char *)]; char * buf; char buf_r_[PADR_(char *)]; + char bufsize_l_[PADL_(size_t)]; size_t bufsize; char bufsize_r_[PADR_(size_t)]; +}; +struct renameat_args { + char oldfd_l_[PADL_(int)]; int oldfd; char oldfd_r_[PADR_(int)]; + char old_l_[PADL_(char *)]; char * old; char old_r_[PADR_(char *)]; + char newfd_l_[PADL_(int)]; int newfd; char newfd_r_[PADR_(int)]; + char new_l_[PADL_(char *)]; char * new; char new_r_[PADR_(char *)]; +}; +struct symlinkat_args { + char path1_l_[PADL_(char *)]; char * path1; char path1_r_[PADR_(char *)]; + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char path2_l_[PADL_(char *)]; char * path2; char path2_r_[PADR_(char *)]; +}; +struct unlinkat_args { + char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; + char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; + char flag_l_[PADL_(int)]; int flag; char flag_r_[PADR_(int)]; +}; int nosys(struct thread *, struct nosys_args *); void sys_exit(struct thread *, struct sys_exit_args *); int fork(struct thread *, struct fork_args *); @@ -1842,6 +1904,17 @@ int fchmodat(struct thread *, struct fchmodat_args *); int fchownat(struct thread *, struct fchownat_args *); int fexecve(struct thread *, struct fexecve_args *); +int fstatat(struct thread *, struct fstatat_args *); +int futimesat(struct thread *, struct futimesat_args *); +int linkat(struct thread *, struct linkat_args *); +int mkdirat(struct thread *, struct mkdirat_args *); +int mkfifoat(struct thread *, struct mkfifoat_args *); +int mknodat(struct thread *, struct mknodat_args *); +int openat(struct thread *, struct openat_args *); +int readlinkat(struct thread *, struct readlinkat_args *); +int renameat(struct thread *, struct renameat_args *); +int symlinkat(struct thread *, struct symlinkat_args *); +int unlinkat(struct thread *, struct unlinkat_args *); #ifdef COMPAT_43 @@ -2397,6 +2470,17 @@ #define SYS_AUE_fchmodat AUE_CHMOD #define SYS_AUE_fchownat AUE_CHOWN #define SYS_AUE_fexecve AUE_EXECVE +#define SYS_AUE_fstatat AUE_STAT +#define SYS_AUE_futimesat AUE_UTIMES +#define SYS_AUE_linkat AUE_LINK +#define SYS_AUE_mkdirat AUE_MKDIR +#define SYS_AUE_mkfifoat AUE_MKFIFO +#define SYS_AUE_mknodat AUE_MKNOD +#define SYS_AUE_openat AUE_OPEN_RWTC +#define SYS_AUE_readlinkat AUE_READLINK +#define SYS_AUE_renameat AUE_RENAME +#define SYS_AUE_symlinkat AUE_SYMLINK +#define SYS_AUE_unlinkat AUE_UNLINK #undef PAD_ #undef PADL_ From owner-p4-projects@FreeBSD.ORG Sun Jun 24 12:58:55 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CB64716A421; Sun, 24 Jun 2007 12:58:54 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9104416A400 for ; Sun, 24 Jun 2007 12:58:54 +0000 (UTC) (envelope-from mharvan@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 7F9EA13C44C for ; Sun, 24 Jun 2007 12:58:54 +0000 (UTC) (envelope-from mharvan@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5OCwsqP030996 for ; Sun, 24 Jun 2007 12:58:54 GMT (envelope-from mharvan@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5OCws3V030993 for perforce@freebsd.org; Sun, 24 Jun 2007 12:58:54 GMT (envelope-from mharvan@FreeBSD.org) Date: Sun, 24 Jun 2007 12:58:54 GMT Message-Id: <200706241258.l5OCws3V030993@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mharvan@FreeBSD.org using -f From: Matus Harvan To: Perforce Change Reviews Cc: Subject: PERFORCE change 122228 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Jun 2007 12:58:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=122228 Change 122228 by mharvan@mharvan_home on 2007/06/24 12:58:32 rewrite to use libevent to report errors plugins now call a special function in the daemon Affected files ... .. //depot/projects/soc2007/mharvan-mtund/mtund.src/Makefile#2 edit .. //depot/projects/soc2007/mharvan-mtund/mtund.src/plugin.h#2 edit .. //depot/projects/soc2007/mharvan-mtund/mtund.src/plugin_tcp.c#2 edit .. //depot/projects/soc2007/mharvan-mtund/mtund.src/plugin_udp.c#2 edit .. //depot/projects/soc2007/mharvan-mtund/mtund.src/tunneld.c#2 edit .. //depot/projects/soc2007/mharvan-mtund/mtund.src/tunneld.h#2 edit Differences ... ==== //depot/projects/soc2007/mharvan-mtund/mtund.src/Makefile#2 (text+ko) ==== @@ -1,6 +1,10 @@ # Linux needs -ldl -#LIBS= -ldl -CFLAGS=-Wall -rdynamic -g +#LIBS+= -ldl + +LIBS=-L/usr/local/lib -levent +CFLAGS=-Wall -rdynamic +CFLAGS+=-g +CFLAGS+=-I/usr/local/include all: tunneld plugin_tcp.so plugin_udp.so ==== //depot/projects/soc2007/mharvan-mtund/mtund.src/plugin.h#2 (text+ko) ==== @@ -57,7 +57,7 @@ * from the client was accepted, return >0 so that it becomes the * current_pl! */ -int plugin_receive(plugint *pl); +void plugin_receive(int fd, short ev_type, void *arg); /* * Send the data. ==== //depot/projects/soc2007/mharvan-mtund/mtund.src/plugin_tcp.c#2 (text+ko) ==== @@ -228,7 +228,7 @@ } if (data->fd != -1) { - register_select_fd(data->fd); + register_select_fd(data->fd, plugin_receive, pl); return 0; } else return -1; } @@ -240,7 +240,8 @@ data->state = PLUGIN_STATE_UNINITIALIZED; } -int plugin_receive(plugint *pl) { +void plugin_receive(int fd, short ev_type, void *arg) { + plugint *pl = (plugint *) arg; plugin_tcp_datat *data = (plugin_tcp_datat*) pl->data; int n = 0; char packet[PACKETLEN]; @@ -249,41 +250,38 @@ //fprintf(stderr, "state: %d\n", data->state); if (! (data->state == PLUGIN_STATE_CONNECTED || data->state == PLUGIN_STATE_INITIALIZED)) { - return -1; + report_plugin_error(pl, PLUGIN_ERROR_RECEIVE); } - if (fd_isset(data->fd)) { - //fprintf(stderr, "data on plugin fd\n"); - - if (data->state != PLUGIN_STATE_CONNECTED) { - new_fd = tcp_accept(data->fd); - if (new_fd == -1) { - fprintf(stderr, "accept failed\n"); - return -1; - } else { - unregister_select_fd(data->fd); - tcp_close(data->fd); - data->fd = new_fd; - register_select_fd(data->fd); - data->state = PLUGIN_STATE_CONNECTED; - fprintf(stderr, "new client connection accepted\n"); - return 1; - } + //fprintf(stderr, "data on plugin fd\n"); + if (data->state != PLUGIN_STATE_CONNECTED) { + new_fd = tcp_accept(fd); + if (new_fd == -1) { + fprintf(stderr, "accept failed\n"); + report_plugin_error(pl, PLUGIN_ERROR_RECEIVE); } else { - //n = read(data->fd, packet, sizeof(packet)); - n = recv(data->fd, packet, sizeof(packet),0); - fprintf(stderr, "n: %d\n", n); - if (n <= 0) { - /* client disconnected */ - unregister_select_fd(data->fd); - data->state = PLUGIN_STATE_DISCONNECTED; - return -1; - } else if (n > 0) { - return tun_send(packet, n); - } + unregister_select_fd(data->fd); + tcp_close(data->fd); + data->fd = new_fd; + register_select_fd(data->fd, plugin_receive, pl); + data->state = PLUGIN_STATE_CONNECTED; + fprintf(stderr, "new client connection accepted\n"); + //report_plugin_error(pl, PLUGIN_ERROR_SUCCESS); + } + } else { + //n = read(data->fd, packet, sizeof(packet)); + n = recv(fd, packet, sizeof(packet),0); + //fprintf(stderr, "n: %d\n", n); + if (n <= 0) { + /* client disconnected */ + unregister_select_fd(fd); + data->state = PLUGIN_STATE_DISCONNECTED; + report_plugin_error(pl, PLUGIN_ERROR_RECEIVE); + } else if (n > 0) { + process_data_from_plugin(pl, packet, n); } } - return 0; + //report_plugin_error(pl, PLUGIN_ERROR_SUCCESS); } /* @@ -299,8 +297,11 @@ } else { //n = write(datapl->fd, data, len); n = send(datapl->fd, data, len, 0); - fprintf(stderr, "plugin_send: fd: %d\n", datapl->fd); - fprintf(stderr, "plugin_send: write returned %d\n", n); + //fprintf(stderr, "plugin_send: fd: %d\n", datapl->fd); + //fprintf(stderr, "plugin_send: write returned %d\n", n); + } + if (n < 0 || (len != 0 && n == 0) ) { + report_plugin_error(pl, PLUGIN_ERROR_RECEIVE); } return n; } ==== //depot/projects/soc2007/mharvan-mtund/mtund.src/plugin_udp.c#2 (text+ko) ==== @@ -165,7 +165,7 @@ if (server) { data->fd = udp_open(port); if (data->fd != -1) { - register_select_fd(data->fd); + register_select_fd(data->fd, plugin_receive, pl); data->state = PLUGIN_STATE_INITIALIZED; return 0; } @@ -174,7 +174,7 @@ if (data->fd != -1) { //n = send(fd,"test",5,0); //if (n == 5) { - register_select_fd(data->fd); + register_select_fd(data->fd, plugin_receive, pl); data->state = PLUGIN_STATE_CONNECTED; return 0; //} @@ -190,7 +190,8 @@ data->state = PLUGIN_STATE_UNINITIALIZED; } -int plugin_receive(plugint *pl) { +void plugin_receive(int fd, short ev_type, void *arg) { + plugint *pl = (plugint *) arg; plugin_udp_datat *data = (plugin_udp_datat*) pl->data; int n = 0; char packet[PACKETLEN]; @@ -201,46 +202,45 @@ if (! (data->state == PLUGIN_STATE_CONNECTED || data->state == PLUGIN_STATE_INITIALIZED)) { - return -1; + //return -1; } - if (fd_isset(data->fd)) { - fprintf(stderr, "data on plugin fd\n"); + fprintf(stderr, "data on plugin fd\n"); - if (data->state != PLUGIN_STATE_CONNECTED) { - /* client connecting for the first time, connect back */ - n = recvfrom(data->fd, packet, sizeof(packet), 0, - (struct sockaddr *) &from, &fromlen); - - if (getnameinfo((struct sockaddr *) &from, fromlen, - host, sizeof(host), serv, sizeof(serv), - NI_NUMERICHOST | NI_DGRAM) ) { - fprintf(stderr, "getnameinfo failed: %s\n", - gai_strerror(errno)); - } else { - fprintf(stderr, "received traffic from client %s:%s\n", - host, serv); - } - - if (connect(data->fd, (struct sockaddr *) &from, fromlen) == 0) { - data->state = PLUGIN_STATE_CONNECTED; - fprintf(stderr, "connected to client %s:%s\n", host, serv); + if (data->state != PLUGIN_STATE_CONNECTED) { + /* client connecting for the first time, connect back */ + n = recvfrom(data->fd, packet, sizeof(packet), 0, + (struct sockaddr *) &from, &fromlen); + + if (getnameinfo((struct sockaddr *) &from, fromlen, + host, sizeof(host), serv, sizeof(serv), + NI_NUMERICHOST | NI_DGRAM) ) { + fprintf(stderr, "getnameinfo failed: %s\n", + gai_strerror(errno)); + } else { + fprintf(stderr, "received traffic from client %s:%s\n", + host, serv); + } + + if (connect(data->fd, (struct sockaddr *) &from, fromlen) == 0) { + data->state = PLUGIN_STATE_CONNECTED; + fprintf(stderr, "connected to client %s:%s\n", host, serv); } else { fprintf(stderr, "failed to connect to client %s:%s\n", host, serv); } - } else { - n = recv(data->fd, packet, sizeof(packet), 0); - } - - if (n == -1) { - return -1; - } else if (n > 0) { - return tun_send(packet, n); - } - fprintf(stderr, "plugin_receive: recv return 0\n"); + } else { + n = recv(data->fd, packet, sizeof(packet), 0); + } + + if (n == -1) { + //return -1; + } else if (n > 0) { + process_data_from_plugin(pl, packet, n); + //return tun_send(packet, n); } - return 0; + fprintf(stderr, "plugin_receive: recv return 0\n"); + //return 0; } int plugin_send(plugint *pl, char *data, int len) { ==== //depot/projects/soc2007/mharvan-mtund/mtund.src/tunneld.c#2 (text+ko) ==== @@ -16,8 +16,11 @@ #include #include -#include +//#include #include +#include +#include +#include #include "tun_dev.h" @@ -28,11 +31,17 @@ int server = 0; /* are we a server or a client? */ plugint *plugins = NULL; /* linked list of loaded plugins */ -int tun_fd = 0; /* tunnel device */ int pl_fd = 0; /* plugin socket */ plugint *current_pl = NULL; /* currently active plugin if we are a client */ fd_set fdset; +char tun_dev[16]; +int tun_fd = 0; /* tunnel device */ +struct event tun_ev; +char *host; +char *port = "12345"; + + /* * helper function to register/unregisted/check file descriptors to be * watched by select @@ -41,20 +50,14 @@ /* helper structure to put file descriptors into a linked list */ typedef struct _fdlt { int fd; + struct event ev; struct _fdlt *next; } fdlt; fdlt *fdl; -static void update_fdset() { - fdlt *p; - - FD_ZERO(&fdset); - for(p = fdl; p; p=p->next) { - FD_SET(p->fd, &fdset); - } -} - -void register_select_fd(int fd) { +void register_select_fd(int fd, + void (*ev_callback)(int, short, void *arg), void *arg) +{ fdlt* nfdl = malloc(sizeof(fdlt)); if (!nfdl) { fprintf(stderr, "failed to malloc an fdlt: out of mem!\n"); @@ -63,7 +66,11 @@ nfdl->fd = fd; nfdl->next = fdl; fdl = nfdl; + //update_fdset(); + + event_set(&nfdl->ev, fd, EV_PERSIST | EV_READ, ev_callback, arg); + event_add(&nfdl->ev, NULL); } void unregister_select_fd(int fd) { @@ -71,6 +78,11 @@ for(q = &fdl, p = fdl; p; q = &(p->next), p=p->next) { if (p->fd == fd) { *q = p->next; + + //event_set(&nfdl->ev, fd, EV_READ, ev_callback, arg); + event_set(&p->ev, fd, EV_READ, NULL, NULL); + event_del(&p->ev); + free(p); break; } @@ -82,94 +94,55 @@ return FD_ISSET(fd, &fdset); } -static int max_fd() { - int m = -1; - fdlt *p; - for(p = fdl;p;p=p->next) { - fprintf(stderr, "p->fd: %d\n", p->fd); - if (p->fd > m) - m = p->fd; - } - fprintf(stderr, "maxfd: %d\n", m); - return m; +int +ssystem(const char *fmt, ...) +{ + char cmd[128]; + va_list ap; + va_start(ap, fmt); + vsnprintf(cmd, sizeof(cmd), fmt, ap); + va_end(ap); + fprintf(stderr, "%s\n", cmd); + //fflush(stderr); + //fflush(stdout); + return system(cmd); } /* tun functions - this could be turned into a plugin as well */ -int tun_receive() { +void tun_receive(int fd, short ev_type, void *arg) { char packet[PACKETLEN]; int result = 0; - if (fd_isset(tun_fd)) { - /* data available on tunnel device */ - memset(packet, 0, sizeof(packet)); - result = tun_read(tun_fd, packet, PACKETLEN); - if (!result) { - return 0; - } else if (result==-1) { - perror ("read"); - return -1; - } - fprintf(stderr, "data on tun interface\n"); - if (current_pl == NULL) { - fprintf(stderr, "no plugin connected yet, discarding tun data\n"); - return 0; - } - result = current_pl->send(current_pl, packet, result); - if (result==-1) { - perror ("plugin_send returned -1"); - } + /* data available on tunnel device */ + memset(packet, 0, sizeof(packet)); + result = tun_read(tun_fd, packet, PACKETLEN); + + if (!result) { + //return 0; + } else if (result==-1) { + perror ("read"); + //return -1; } - return result; + //fprintf(stderr, "data on tun interface\n"); + process_data_from_tun(packet, result); + //return result; } int tun_send(char *data, int len) { int n; n = tun_write(tun_fd, data, len); - fprintf(stderr, "tun_send: send returned %d\n", n); + /* + if (n != len) { + fprintf(stderr, "tun_send: tun_write wrote less bytes (%d) than " + "requested (%d)\n", n, len); + // report error + } + */ return n; } /* - * sit in select - * call tun_receive and plugin_receive when select fires - */ -static int tunnel_select() { - int result_tun = 0; - int result_plugin = 0; - int n = 0; - plugint *pl; - - while (result_tun >= 0 && result_plugin >= 0) { - update_fdset(); - select (max_fd()+1, &fdset, NULL, NULL, NULL); - fprintf(stderr, "tunnel_select: select fired\n"); - - fprintf(stderr, "tunnel_select: server: %d\n", server); - - result_tun = tun_receive(); - if (server) { - /* check all plugins */ - result_plugin = -1; - for (pl=plugins; pl; pl = pl->next) { - fprintf(stderr, "select - calling \"%s\"->receive()...", - pl->name); - n = pl->receive(pl); - fprintf(stderr, "%d\n", n); - if (n > 0) current_pl = pl; - if (n > result_plugin) result_plugin = n; - } - } else { - result_plugin = (current_pl->receive)(current_pl); - } - - fprintf(stderr, "tunnel_select: result_tun: %d, result_plugin: %d\n", - result_tun, result_plugin); - } - return 0; -} - -/* * BUGS: if dlclose() is called, I get a segfault when trying to use * the loaded functions. Maybe I'm not passing the right flags to * dlopen()? Well, RTLD_NODELETE seems to help here, at least on @@ -214,6 +187,87 @@ return 2; } +/* + * Pass data received by the plugin to the daemon. + */ +void process_data_from_plugin(plugint *pl, char *data, int len) +{ + tun_send(data, len); +} + +/* + * Pass data received from the tun interface to the daemon. + */ +void process_data_from_tun(char *data, int len) +{ + int n; + + if (current_pl == NULL) { + fprintf(stderr, "no plugin connected yet, discarding tun data\n"); + report_plugin_error(NULL, PLUGIN_ERROR_BOOTSTRAP); + } + + n = current_pl->send(current_pl, data, len); + + if (n < len) { + fprintf(stderr, "process_data_from_tun: plugind sent less " + "bytes (%d) than requested (%d)\n", n, len); + } +} + +void report_plugin_error(plugint *pl, int err) +{ + if (err == PLUGIN_ERROR_SUCCESS) { + return; + } + + if (!server) { + if (pl) { + /* deinitialize the broken plugin */ + fprintf(stderr, "plugin failed: %s\n", pl->name); + pl->deinitialize(pl); + } + + /* scan - find a working plugin */ + //for (pl=plugins; pl; pl = pl->next) { + if (!pl) pl=plugins; + for (; pl; pl = pl->next) { + /* try to initialize plugin */ + //if (((pl->initialize)(server, host, port)) == 0) { + fprintf(stderr, "initalizing plugin: %s...\n", pl->name); + if (((pl->initialize)(pl, server, host, pl->name+4)) == 0) { + fprintf(stderr, "found a working plugin: %s\n", pl->name); + current_pl = pl; + return; + } else { + fprintf(stderr, "plugin %s failed to initialize\n", pl->name); + } + } + } +} + +void cleanup() +{ + plugint *pl; + + event_del(&tun_ev); + tun_close(tun_fd, tun_dev); + + /* deinitialize all plugins and free memory */ + while(plugins) { + pl = plugins; + plugins=plugins->next; + pl->deinitialize(pl); + free(pl); + } + exit(0); +} + +void sigcb(int sig) +{ + cleanup(); +} + void usage() { fprintf(stderr, "usage:\n"); fprintf(stderr, "server: tunneld -s -p port\n"); @@ -221,13 +275,9 @@ } int main(int argc, char **argv) { - char dev[16]; plugint *pl; char opt; - char *host; - char *port = "12345"; - /* argument parsing */ while((opt=getopt(argc, argv, "scp:")) != EOF) { switch(opt) { @@ -263,15 +313,33 @@ } } + /* Initalize the event library */ + event_init(); + /* create the tunnel device */ - dev[0] = 0; - tun_fd = tun_open(dev); + tun_dev[0] = 0; + tun_fd = tun_open(tun_dev); if (tun_fd < 1) { printf("Could not create tunnel device\n"); return 1; } - register_select_fd(tun_fd); - printf("Created tunnel device: %s\n", dev); + /* Initalize one event */ + event_set(&tun_ev, tun_fd, EV_PERSIST | EV_READ, tun_receive, NULL); + /* Add it to the active events, without a timeout */ + event_add(&tun_ev, NULL); + //register_select_fd(tun_fd); + printf("Created tunnel device: %s\n", tun_dev); + + /* setup the tun interface */ + if (server) { + system("ifconfig tun0 mtu 1400 192.168.0.1 192.168.0.2"); + } else { + system("ifconfig tun0 mtu 1400 192.168.0.2 192.168.0.1"); + } + + signal(SIGHUP, sigcb); + signal(SIGINT, sigcb); + signal(SIGTERM, sigcb); /* load plugins */ load_plugin("./plugin_udp.so"); @@ -282,7 +350,7 @@ plugins->name = "tcp_2222"; load_plugin("./plugin_tcp.so"); plugins->name = "tcp_3333"; - + if (server) { /* initialize all plugins */ for (pl=plugins; pl; pl = pl->next) { @@ -290,43 +358,14 @@ (void) (pl->initialize)(pl, server, host, pl->name+4); /* we should unload plugins which fail to initialize */ } - /* - * start tunneling - * - wait in select to see which plugin will be used (its fd will fire) - */ - tunnel_select(); - - /* deinitialize all plugins */ - for (pl=plugins; pl; pl = pl->next) { - pl->deinitialize(pl); - } } else { - /* scan - find a working plugin */ - for (pl=plugins; pl; pl = pl->next) { - /* try to initialize plugin */ - //if (((pl->initialize)(server, host, port)) == 0) { - if (((pl->initialize)(pl, server, host, pl->name+4)) == 0) { - fprintf(stderr, "found a working plugin: %s\n", pl->name); - current_pl = pl; - - /* start tunneling */ - tunnel_select(); - - fprintf(stderr, "plugin failed: %s\n", pl->name); - pl->deinitialize(pl); - } else { - fprintf(stderr, "plugin %s failed to initialize\n", pl->name); - } - } + /* initialize a working plugin */ + report_plugin_error(NULL, PLUGIN_ERROR_BOOTSTRAP); } - tun_close(tun_fd, dev); - - while(plugins) { - pl = plugins; - plugins=plugins->next; - free(pl); - } - - return 0; + /* start tunneling */ + event_dispatch(); + + cleanup(); + return 1; } ==== //depot/projects/soc2007/mharvan-mtund/mtund.src/tunneld.h#2 (text+ko) ==== @@ -18,16 +18,25 @@ int (*initialize)(struct _plugint*, int, char*, char*); void (*deinitialize)(struct _plugint*); int (*send)(struct _plugint*, char*, int); - int (*receive)(struct _plugint*); /* select fired on some fd - check for data */ + void (*receive)(int fd, short ev_type, void *arg); /* select fired on some fd - check for data */ void* data; struct _plugint *next; } plugint; +enum { + PLUGIN_ERROR_SUCCESS = 0, + PLUGIN_ERROR_BOOTSTRAP, + PLUGIN_ERROR_SEND, + PLUGIN_ERROR_RECEIVE, + PLUGIN_ERROR_TIMEOUT +}; + /* --- select() --- */ /* * Register file descriptor fd to be watched by the main select(). */ -void register_select_fd(int fd); +void register_select_fd(int fd, + void (*ev_callback)(int, short, void *arg), void *arg); /* * Unregister file descriptor fd to no longer be watched by the main * select(). @@ -36,12 +45,27 @@ /* * Check whether select fired on the file descriptor - wrapper for FD_ISSET. */ -int fd_isset(int fd); +//int fd_isset(int fd); /* --- tunnel --- */ /* * Send data over the tun interface. */ -int tun_send(char *data, int len); +//int tun_send(char *data, int len); + +/* + * Pass data received by the plugin to the daemon. + */ +void process_data_from_plugin(plugint *pl, char *data, int len); + +/* + * Pass data received from the tun interface to the daemon. + */ +void process_data_from_tun(char *data, int len); + +/* + * Report a problem in the plugin to the daemon. + */ +void report_plugin_error(plugint *pl, int err); #endif From owner-p4-projects@FreeBSD.ORG Sun Jun 24 15:14:05 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8B79416A476; Sun, 24 Jun 2007 15:14:05 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3E5F516A468 for ; Sun, 24 Jun 2007 15:14:05 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 0673513C448 for ; Sun, 24 Jun 2007 15:14:04 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5OFE4O7044146 for ; Sun, 24 Jun 2007 15:14:04 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5OFE4Km044143 for perforce@freebsd.org; Sun, 24 Jun 2007 15:14:04 GMT (envelope-from gabor@freebsd.org) Date: Sun, 24 Jun 2007 15:14:04 GMT Message-Id: <200706241514.l5OFE4Km044143@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 122231 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Jun 2007 15:14:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=122231 Change 122231 by gabor@gabor_server on 2007/06/24 15:13:24 - Use targets, this part will be improved a bit later - This change also rids away a warning we had before Affected files ... .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#25 edit Differences ... ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#25 (text+ko) ==== @@ -1094,7 +1094,19 @@ # .if defined(DESTDIR) && !empty(DESTDIR) && !defined(CHROOTED) -.BEGIN: + +.for _target in ${.TARGETS} +${_target}: pre-chroot do-chroot post-chroot + @${TRUE} +.endfor + +.if !target(pre-chroot) +pre-chroot: + @${TRUE} +.endif + +.if !target(do-chroot) +do-chroot: ${MKDIR} ${DESTDIR}${PORTSDIR} # found=0; \ # for i in `${MOUNT} | ${AWK} {'print $$3'}` ; do \ @@ -1112,6 +1124,13 @@ .endif ${ECHO_CMD} "===> Starting chrooted make in ${DESTDIR}..."; \ ${CHROOT} ${DESTDIR} ${SH} -c "(cd ${.CURDIR}; ${MAKE} DESTDIR= CHROOTED=YES ${.TARGETS})" +.endif + +.if !target(post-chroot) +post-chroot: + @${TRUE} +.endif + .else # Look for ${WRKSRC}/.../*.orig files, and (re-)create From owner-p4-projects@FreeBSD.ORG Sun Jun 24 15:38:36 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 06DBF16A46D; Sun, 24 Jun 2007 15:38:36 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C592616A46B for ; Sun, 24 Jun 2007 15:38:35 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id B604613C480 for ; Sun, 24 Jun 2007 15:38:35 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5OFcZso045813 for ; Sun, 24 Jun 2007 15:38:35 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5OFcZ64045808 for perforce@freebsd.org; Sun, 24 Jun 2007 15:38:35 GMT (envelope-from gabor@freebsd.org) Date: Sun, 24 Jun 2007 15:38:35 GMT Message-Id: <200706241538.l5OFcZ64045808@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 122232 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Jun 2007 15:38:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=122232 Change 122232 by gabor@gabor_server on 2007/06/24 15:38:09 - Move DESTDIR part to bsd.destdir.mk Affected files ... .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.destdir.mk#1 add .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#26 edit Differences ... ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#26 (text+ko) ==== @@ -1095,41 +1095,7 @@ .if defined(DESTDIR) && !empty(DESTDIR) && !defined(CHROOTED) -.for _target in ${.TARGETS} -${_target}: pre-chroot do-chroot post-chroot - @${TRUE} -.endfor - -.if !target(pre-chroot) -pre-chroot: - @${TRUE} -.endif - -.if !target(do-chroot) -do-chroot: - ${MKDIR} ${DESTDIR}${PORTSDIR} -# found=0; \ -# for i in `${MOUNT} | ${AWK} {'print $$3'}` ; do \ -# if [ `${REALPATH} ${DESTDIR}${PORTSDIR}` == `${REALPATH} $${i}` ]; then \ -# found=1; \ -# fi ; \ -# done ; \ -# if [ $${found} != 1 ]; then \ -# ${ECHO_CMD} "===> Nullmounting ${PORTSDIR} into ${DESTDIR}..."; \ -# ${MOUNT} -t nullfs ${PORTSDIR} ${DESTDIR}${PORTSDIR}; \ -# fi -.if !exists (${DESTDIR}/dev/null) - ${ECHO_CMD} "===> Mounting devfs into ${DESTDIR}..."; \ - ${MOUNT} -t devfs devfs ${DESTDIR}/dev -.endif - ${ECHO_CMD} "===> Starting chrooted make in ${DESTDIR}..."; \ - ${CHROOT} ${DESTDIR} ${SH} -c "(cd ${.CURDIR}; ${MAKE} DESTDIR= CHROOTED=YES ${.TARGETS})" -.endif - -.if !target(post-chroot) -post-chroot: - @${TRUE} -.endif +.include "${PORTSDIR}/Mk/bsd.destdir.mk" .else From owner-p4-projects@FreeBSD.ORG Sun Jun 24 16:37:51 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D9AA216A46E; Sun, 24 Jun 2007 16:37:50 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id AD9A516A494 for ; Sun, 24 Jun 2007 16:37:50 +0000 (UTC) (envelope-from ivoras@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 9A7B913C447 for ; Sun, 24 Jun 2007 16:37:50 +0000 (UTC) (envelope-from ivoras@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5OGboIL051939 for ; Sun, 24 Jun 2007 16:37:50 GMT (envelope-from ivoras@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5OGbord051936 for perforce@freebsd.org; Sun, 24 Jun 2007 16:37:50 GMT (envelope-from ivoras@FreeBSD.org) Date: Sun, 24 Jun 2007 16:37:50 GMT Message-Id: <200706241637.l5OGbord051936@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ivoras@FreeBSD.org using -f From: Ivan Voras To: Perforce Change Reviews Cc: Subject: PERFORCE change 122233 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Jun 2007 16:37:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=122233 Change 122233 by ivoras@ivoras_finstall on 2007/06/24 16:37:17 Silence most of the warnings on the LiveCD Affected files ... .. //depot/projects/soc2007/ivoras_finstall/makeimage/makeimage.py#3 edit Differences ... ==== //depot/projects/soc2007/ivoras_finstall/makeimage/makeimage.py#3 (text+ko) ==== @@ -37,7 +37,7 @@ raise MakeImageException("This utility requires mkisofs(8) (install ports/sysutils/cdrtools)") def usage(): - print "usage: %s -d WORKDIR [-s SRCDIR] [-k KERNEL]" % sys.argv[0] + print "usage: %s -d WORKDIR [-s SRCDIR] [-k KERNEL] [-b] [-c] [-i ISOFILE]" % sys.argv[0] sys.exit(1) WORKDIR = None # Working directory. Will create DESTDIR inside it. @@ -45,9 +45,11 @@ SRCDIR = "/usr/src" KERNEL = "GENERIC" DoBuild = False +DoMakeRoot = True # Create / install livecd tree LABEL = "FreeBSD7" +ISO = None -opts, args = getopt(sys.argv[1:], "d:s:bh") +opts, args = getopt(sys.argv[1:], "d:s:i:bch") for o,a in opts: if o == "-d": WORKDIR = a @@ -63,6 +65,10 @@ KERNEL = a elif o == "-b": DoBuild = True + elif o == "-c": + DoMakeRoot = False + elif o == "-i": + ISO = a elif o == "-h": usage() @@ -74,39 +80,67 @@ os.makedirs(WORKDIR) DESTDIR = "%s/livecd" % WORKDIR -if os.path.exists(DESTDIR): - if not os.path.exists("%s/COPYRIGHT" % DESTDIR): - print "--> %s doesn't look like a FreeBSD root" % DESTDIR - resp = raw_input("Delete it anyway? (y/N) ").upper() - if resp != "Y": - print "Canceling" - sys.exit(1) - else: - print "Wiping out %s" % DESTDIR - nukedir(DESTDIR) + +if DoMakeRoot: + if os.path.exists(DESTDIR): + if not os.path.exists("%s/COPYRIGHT" % DESTDIR): + print "--> %s doesn't look like a FreeBSD root" % DESTDIR + resp = raw_input("Delete it anyway? (y/N) ").upper() + if resp != "Y": + print "Canceling" + sys.exit(1) + else: + print "Wiping out %s" % DESTDIR + nukedir(DESTDIR) + + os.makedirs(DESTDIR) -os.makedirs(DESTDIR) + initutils() -initutils() + printmsg("Using '%s' as source directory" % SRCDIR) + printmsg("Using '%s' as working directory (root on '%s')" % (WORKDIR, DESTDIR)) + printmsg("Using '%s' kernel" % KERNEL) -printmsg("Using '%s' as source directory" % SRCDIR) -printmsg("Using '%s' as working directory (root on '%s')" % (WORKDIR, DESTDIR)) -printmsg("Using '%s' kernel" % KERNEL) -printmsg("Random message to test scrolling") + os.chdir(SRCDIR) + if DoBuild: + execute("make buildworld") + execute("make installworld DESTDIR=%s" % DESTDIR) + execute("make distribution DESTDIR=%s" % DESTDIR) + execute("make installkernel KERNCONF=%s DESTDIR=%s" % (KERNEL, DESTDIR)) +else: + if not os.path.exists(DESTDIR) or not os.path.exists("%s/COPYRIGHT" % DESTDIR): + print "%s doesn't look like existing livecd root" % DESTDIR + sys.exit(1) -os.chdir(SRCDIR) -if DoBuild: - execute("make buildworld") -execute("make installworld DESTDIR=%s" % DESTDIR) -execute("make distribution DESTDIR=%s" % DESTDIR) -execute("make installkernel KERNCONF=%s DESTDIR=%s" % (KERNEL, DESTDIR)) +str_time = strftime("%Y-%m-%d %H:%M") +printmsg("Creating config files") +# Edit loader.conf lc = file("%s/boot/loader.conf" % DESTDIR, "w+") -lc.write("# /boot/loader.conf generated by finstall makeimage.py on %s\n" % strftime("%Y-%m-%d %H:%M")) +lc.write("# /boot/loader.conf generated by finstall makeimage.py on %s\n" % str_time) lc.write('rootdev="iso9660/%s"\n' % LABEL) lc.write('boot_cdrom="1"\n') lc.close() +# Edit fstab +f = file("%s/etc/fstab" % DESTDIR, "w+") +f.write("# /etc/fstab generated by finstall makeimage.py on %s\n" % str_time) +f.write("/dev/iso9660/%s / cd9660 ro 0 0\n" % LABEL) +f.write("md /tmp mfs rw,-S,-s32m 0 0\n") +f.write("/tmp /etc unionfs rw,copymode=transparent 0 0\n") +f.close() + +# Edit rc.conf +f = file("%s/etc/rc.conf" % DESTDIR, "w+") +f.write("# /etc/rc.conf generated by finstall makeimage.py on %s\n" % str_time) +f.write('rc_debug="NO"\n') +f.write('hostname="finstall"\n') +f.write('background_fsck="NO"\n') +f.write('syslogd_flags="-C"\n') +f.close() + os.chdir(WORKDIR) -execute("mkisofs -l -nobak -V %s -T -J -r -ldots -b boot/cdboot -no-emul-boot -o %s/image.iso %s" % (LABEL, WORKDIR, DESTDIR)) +if ISO == None: + ISO = "%s/image.iso" % WORKDIR +execute("mkisofs -l -nobak -V %s -T -J -r -ldots -b boot/cdboot -no-emul-boot -o %s %s" % (LABEL, ISO, DESTDIR)) From owner-p4-projects@FreeBSD.ORG Sun Jun 24 17:46:17 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2D79416A481; Sun, 24 Jun 2007 17:46:17 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B247416A4A6 for ; Sun, 24 Jun 2007 17:46:16 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 3A14713C4CC for ; Sun, 24 Jun 2007 17:46:16 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5OHkG47066339 for ; Sun, 24 Jun 2007 17:46:16 GMT (envelope-from lulf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5OHkFIU066336 for perforce@freebsd.org; Sun, 24 Jun 2007 17:46:15 GMT (envelope-from lulf@FreeBSD.org) Date: Sun, 24 Jun 2007 17:46:15 GMT Message-Id: <200706241746.l5OHkFIU066336@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lulf@FreeBSD.org using -f From: Ulf Lilleengen To: Perforce Change Reviews Cc: Subject: PERFORCE change 122234 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Jun 2007 17:46:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=122234 Change 122234 by lulf@lulf_carrot on 2007/06/24 17:45:27 - Fix a bug where using state instead of flags. - Fix a bug where parity bio_data is not copied into the parity BIO. Affected files ... .. //depot/projects/soc2007/lulf/gvinum_fixup/sbin/gvinum/gvinum.c#9 edit .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum.c#19 edit .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_raid5.c#6 edit .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_raid5.h#4 edit .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_state.c#12 edit .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_volume.c#8 edit Differences ... ==== //depot/projects/soc2007/lulf/gvinum_fixup/sbin/gvinum/gvinum.c#9 (text+ko) ==== ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum.c#19 (text+ko) ==== ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_raid5.c#6 (text+ko) ==== @@ -445,6 +445,7 @@ cbp = gv_raid5_clone_bio(bp, parity, wp, NULL, 1); if (cbp == NULL) return (ENOMEM); + bcopy(addr, cbp->bio_data, wp->length); wp->parity = cbp; /* ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_raid5.h#4 (text+ko) ==== ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_state.c#12 (text+ko) ==== ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_volume.c#8 (text+ko) ==== @@ -101,7 +101,7 @@ case BIO_DELETE: /* Delay write-requests if any plex is synchronizing. */ LIST_FOREACH(p, &v->plexes, in_volume) { - if (p->state == GV_PLEX_SYNCING) { + if (p->flags & GV_PLEX_SYNCING) { bioq_insert_tail(v->wqueue, bp); return; } From owner-p4-projects@FreeBSD.ORG Sun Jun 24 22:15:58 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4617516A46C; Sun, 24 Jun 2007 22:15:58 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id F3D8416A421 for ; Sun, 24 Jun 2007 22:15:57 +0000 (UTC) (envelope-from mharvan@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id E450413C46C for ; Sun, 24 Jun 2007 22:15:57 +0000 (UTC) (envelope-from mharvan@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5OMFvJu003431 for ; Sun, 24 Jun 2007 22:15:57 GMT (envelope-from mharvan@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5OMFvcJ003428 for perforce@freebsd.org; Sun, 24 Jun 2007 22:15:57 GMT (envelope-from mharvan@FreeBSD.org) Date: Sun, 24 Jun 2007 22:15:57 GMT Message-Id: <200706242215.l5OMFvcJ003428@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mharvan@FreeBSD.org using -f From: Matus Harvan To: Perforce Change Reviews Cc: Subject: PERFORCE change 122248 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Jun 2007 22:15:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=122248 Change 122248 by mharvan@mharvan_home on 2007/06/24 22:15:37 bugfix for the server - correctly update current_pl s/AF_UNSPEC/AF_INET/g Affected files ... .. //depot/projects/soc2007/mharvan-mtund/mtund.src/Makefile#3 edit .. //depot/projects/soc2007/mharvan-mtund/mtund.src/plugin_tcp.c#3 edit .. //depot/projects/soc2007/mharvan-mtund/mtund.src/plugin_udp.c#3 edit .. //depot/projects/soc2007/mharvan-mtund/mtund.src/tunneld.c#3 edit Differences ... ==== //depot/projects/soc2007/mharvan-mtund/mtund.src/Makefile#3 (text+ko) ==== @@ -19,7 +19,7 @@ gcc $(CFLAGS) -shared -o plugin_udp.so plugin_udp.c clean: - rm -f tunneld plugin_tcp.so plugin_udp.so + rm -f tunneld plugin_tcp.so plugin_udp.so *.core backup: rsync -a `pwd` meat:backup/ ==== //depot/projects/soc2007/mharvan-mtund/mtund.src/plugin_tcp.c#3 (text+ko) ==== @@ -44,7 +44,8 @@ memset(&hints, 0, sizeof(hints)); hints.ai_flags = AI_PASSIVE; - hints.ai_family = AF_UNSPEC; + //hints.ai_family = AF_UNSPEC; + hints.ai_family = AF_INET; hints.ai_socktype = SOCK_STREAM; n = getaddrinfo(NULL, port, &hints, &ai_list); @@ -131,7 +132,8 @@ struct timeval tv; memset(&hints, 0, sizeof(hints)); - hints.ai_family = AF_UNSPEC; + //hints.ai_family = AF_UNSPEC; + hints.ai_family = AF_INET; hints.ai_socktype = SOCK_STREAM; n = getaddrinfo(host, port, &hints, &ai_list); ==== //depot/projects/soc2007/mharvan-mtund/mtund.src/plugin_udp.c#3 (text+ko) ==== @@ -35,7 +35,8 @@ int n, fd = 0; memset(&hints, 0, sizeof(hints)); - hints.ai_family = AF_UNSPEC; + //hints.ai_family = AF_UNSPEC; + hints.ai_family = AF_INET; hints.ai_socktype = SOCK_DGRAM; n = getaddrinfo(host, port, &hints, &ai_list); @@ -82,7 +83,8 @@ memset(&hints, 0, sizeof(hints)); hints.ai_flags = AI_PASSIVE; - hints.ai_family = AF_UNSPEC; + //hints.ai_family = AF_UNSPEC; + hints.ai_family = AF_INET; hints.ai_socktype = SOCK_DGRAM; n = getaddrinfo(NULL, port, &hints, &ai_list); ==== //depot/projects/soc2007/mharvan-mtund/mtund.src/tunneld.c#3 (text+ko) ==== @@ -192,6 +192,9 @@ */ void process_data_from_plugin(plugint *pl, char *data, int len) { + if (len > 0) { + current_pl = pl; + } tun_send(data, len); } @@ -205,13 +208,13 @@ if (current_pl == NULL) { fprintf(stderr, "no plugin connected yet, discarding tun data\n"); report_plugin_error(NULL, PLUGIN_ERROR_BOOTSTRAP); - } + } else { + n = current_pl->send(current_pl, data, len); - n = current_pl->send(current_pl, data, len); - - if (n < len) { - fprintf(stderr, "process_data_from_tun: plugind sent less " - "bytes (%d) than requested (%d)\n", n, len); + if (n < len) { + fprintf(stderr, "process_data_from_tun: plugind sent less " + "bytes (%d) than requested (%d)\n", n, len); + } } } From owner-p4-projects@FreeBSD.ORG Sun Jun 24 23:46:50 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AF08F16A46C; Sun, 24 Jun 2007 23:46:50 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6CE5E16A469 for ; Sun, 24 Jun 2007 23:46:50 +0000 (UTC) (envelope-from mharvan@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 5DA2E13C465 for ; Sun, 24 Jun 2007 23:46:50 +0000 (UTC) (envelope-from mharvan@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5ONko6v011335 for ; Sun, 24 Jun 2007 23:46:50 GMT (envelope-from mharvan@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5ONkoll011332 for perforce@freebsd.org; Sun, 24 Jun 2007 23:46:50 GMT (envelope-from mharvan@FreeBSD.org) Date: Sun, 24 Jun 2007 23:46:50 GMT Message-Id: <200706242346.l5ONkoll011332@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mharvan@FreeBSD.org using -f From: Matus Harvan To: Perforce Change Reviews Cc: Subject: PERFORCE change 122249 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Jun 2007 23:46:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=122249 Change 122249 by mharvan@mharvan_home on 2007/06/24 23:46:47 server should not segfault when client disconnects Affected files ... .. //depot/projects/soc2007/mharvan-mtund/mtund.src/plugin_tcp.c#4 edit .. //depot/projects/soc2007/mharvan-mtund/mtund.src/tunneld.c#4 edit Differences ... ==== //depot/projects/soc2007/mharvan-mtund/mtund.src/plugin_tcp.c#4 (text+ko) ==== @@ -24,7 +24,7 @@ */ typedef struct { - int fd; /* udp socket to the other endpoint */ + int fd; /* tcp socket to the other endpoint */ int state; /* is a client connected? */ } plugin_tcp_datat; @@ -253,6 +253,7 @@ if (! (data->state == PLUGIN_STATE_CONNECTED || data->state == PLUGIN_STATE_INITIALIZED)) { report_plugin_error(pl, PLUGIN_ERROR_RECEIVE); + return; } //fprintf(stderr, "data on plugin fd\n"); ==== //depot/projects/soc2007/mharvan-mtund/mtund.src/tunneld.c#4 (text+ko) ==== @@ -80,7 +80,7 @@ *q = p->next; //event_set(&nfdl->ev, fd, EV_READ, ev_callback, arg); - event_set(&p->ev, fd, EV_READ, NULL, NULL); + //event_set(&p->ev, fd, EV_READ, NULL, NULL); event_del(&p->ev); free(p); From owner-p4-projects@FreeBSD.ORG Mon Jun 25 04:31:52 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 72E1916A46B; Mon, 25 Jun 2007 04:31:52 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1D20116A400; Mon, 25 Jun 2007 04:31:52 +0000 (UTC) (envelope-from bright@elvis.mu.org) Received: from elvis.mu.org (elvis.mu.org [192.203.228.196]) by mx1.freebsd.org (Postfix) with ESMTP id 0CDEC13C447; Mon, 25 Jun 2007 04:31:52 +0000 (UTC) (envelope-from bright@elvis.mu.org) Received: by elvis.mu.org (Postfix, from userid 1192) id 6BD9E1A4D8E; Sun, 24 Jun 2007 20:58:50 -0700 (PDT) Date: Sun, 24 Jun 2007 20:58:50 -0700 From: Alfred Perlstein To: Peter Wemm Message-ID: <20070625035850.GI55189@elvis.mu.org> References: <200706222138.l5MLcjxa021194@repoman.freebsd.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <200706222138.l5MLcjxa021194@repoman.freebsd.org> User-Agent: Mutt/1.4.2.2i Cc: Perforce Change Reviews Subject: Re: PERFORCE change 122167 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Jun 2007 04:31:52 -0000 er, can't you just do a signal(SIGSYS, SIG_IGN)? * Peter Wemm [070622 14:38] wrote: > http://perforce.freebsd.org/chv.cgi?CH=122167 > > Change 122167 by peter@peter_daintree on 2007/06/22 21:38:41 > > Add kern.do_sigsys to control whether an enosys() also causes SIGSYS. This would > have been very useful to probe for presence of syscalls. Avoids the need to install > a sigsys handler. If only this was present for the last 10 years.... > > Affected files ... > > .. //depot/projects/hammer/sys/kern/kern_sig.c#80 edit > > Differences ... > > ==== //depot/projects/hammer/sys/kern/kern_sig.c#80 (text+ko) ==== > > @@ -111,6 +111,10 @@ > SYSCTL_INT(_kern, OID_AUTO, forcesigexit, CTLFLAG_RW, > &kern_forcesigexit, 0, "Force trap signal to be handled"); > > +static int kern_do_sigsys = 1; > +SYSCTL_INT(_kern, OID_AUTO, do_sigsys, CTLFLAG_RW, > + &kern_do_sigsys, 0, "Have the kernel send SIGSYS on a bad syscall"); > + > SYSCTL_NODE(_kern, OID_AUTO, sigqueue, CTLFLAG_RW, 0, "POSIX real time signal"); > > static int max_pending_per_proc = 128; > @@ -3168,9 +3172,11 @@ > { > struct proc *p = td->td_proc; > > - PROC_LOCK(p); > - psignal(p, SIGSYS); > - PROC_UNLOCK(p); > + if (kern_do_sigsys) { > + PROC_LOCK(p); > + psignal(p, SIGSYS); > + PROC_UNLOCK(p); > + } > return (ENOSYS); > } > -- - Alfred Perlstein From owner-p4-projects@FreeBSD.ORG Mon Jun 25 07:19:58 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6E86816A421; Mon, 25 Jun 2007 07:19:58 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 288FB16A400 for ; Mon, 25 Jun 2007 07:19:58 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 184B713C448 for ; Mon, 25 Jun 2007 07:19:58 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5P7JvJV084697 for ; Mon, 25 Jun 2007 07:19:57 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5P7JvEo084683 for perforce@freebsd.org; Mon, 25 Jun 2007 07:19:57 GMT (envelope-from mjacob@freebsd.org) Date: Mon, 25 Jun 2007 07:19:57 GMT Message-Id: <200706250719.l5P7JvEo084683@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 122268 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Jun 2007 07:19:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=122268 Change 122268 by mjacob@mjexp_sparc64 on 2007/06/25 07:19:06 Yet another bug- when we have 2k login firmware, we need to put out a ispreqt3e_t structure onto the request queue- not a ispreqt3_t structure. We weren't. This turns out only to really matter for big endian machines. Affected files ... .. //depot/projects/mjexp/sys/dev/isp/isp_pci.c#29 edit Differences ... ==== //depot/projects/mjexp/sys/dev/isp/isp_pci.c#29 (text+ko) ==== @@ -2849,8 +2849,14 @@ case RQSTYPE_T2RQS: isp_put_request_t2(isp, (ispreqt2_t *) rq, (ispreqt2_t *) qep); break; + case RQSTYPE_T3RQS: + if (FCPARAM(isp)->isp_2klogin) { + isp_put_request_t3e(isp, + (ispreqt3e_t *) rq, (ispreqt3e_t *) qep); + break; + } + /* FALLTHROUGH */ case RQSTYPE_A64: - case RQSTYPE_T3RQS: isp_put_request_t3(isp, (ispreqt3_t *) rq, (ispreqt3_t *) qep); break; case RQSTYPE_T7RQS: From owner-p4-projects@FreeBSD.ORG Mon Jun 25 09:43:00 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2A55916A469; Mon, 25 Jun 2007 09:43:00 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E0ADA16A400 for ; Mon, 25 Jun 2007 09:42:59 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id BA16C13C457 for ; Mon, 25 Jun 2007 09:42:59 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5P9gxoh011529 for ; Mon, 25 Jun 2007 09:42:59 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5P9gxDe011526 for perforce@freebsd.org; Mon, 25 Jun 2007 09:42:59 GMT (envelope-from mjacob@freebsd.org) Date: Mon, 25 Jun 2007 09:42:59 GMT Message-Id: <200706250942.l5P9gxDe011526@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 122273 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Jun 2007 09:43:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=122273 Change 122273 by mjacob@mjexp on 2007/06/25 09:42:37 Remove debug message that crept in. Affected files ... .. //depot/projects/mjexp/sys/dev/isp/isp.c#23 edit Differences ... ==== //depot/projects/mjexp/sys/dev/isp/isp.c#23 (text+ko) ==== @@ -855,7 +855,7 @@ for (;;) { uint32_t nxtaddr; - isp_prt(isp, ISP_LOGALL, + isp_prt(isp, ISP_LOGDEBUG0, "load 0x%x words of code at load address 0x%x", ptr[3], la); From owner-p4-projects@FreeBSD.ORG Mon Jun 25 09:58:20 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 51DFE16A468; Mon, 25 Jun 2007 09:58:20 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id EE75916A469 for ; Mon, 25 Jun 2007 09:58:19 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id DDDF013C480 for ; Mon, 25 Jun 2007 09:58:19 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5P9wJcP012510 for ; Mon, 25 Jun 2007 09:58:19 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5P9wJXG012507 for perforce@freebsd.org; Mon, 25 Jun 2007 09:58:19 GMT (envelope-from rpaulo@FreeBSD.org) Date: Mon, 25 Jun 2007 09:58:19 GMT Message-Id: <200706250958.l5P9wJXG012507@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 122274 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Jun 2007 09:58:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=122274 Change 122274 by rpaulo@rpaulo_epsilon on 2007/06/25 09:57:41 IFC Affected files ... .. //depot/projects/soc2007/rpaulo-macbook/boot/forth/loader.conf#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/conf/NOTES#8 integrate .. //depot/projects/soc2007/rpaulo-macbook/conf/files#15 integrate .. //depot/projects/soc2007/rpaulo-macbook/conf/options#8 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/ata/ata-chipset.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/ata/ata-pci.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/ata/ata-usb.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/ath/if_ath.c#6 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/isp/isp.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/sym/sym_hipd.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/if_aue.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/if_cdce.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/if_cue.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/if_kue.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/if_ural.c#7 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/ucom.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/ukbd.c#8 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/umodem.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/usbdevs#9 integrate .. //depot/projects/soc2007/rpaulo-macbook/fs/umapfs/umap.h#2 delete .. //depot/projects/soc2007/rpaulo-macbook/fs/umapfs/umap_subr.c#2 delete .. //depot/projects/soc2007/rpaulo-macbook/fs/umapfs/umap_vfsops.c#2 delete .. //depot/projects/soc2007/rpaulo-macbook/fs/umapfs/umap_vnops.c#3 delete .. //depot/projects/soc2007/rpaulo-macbook/kern/Make.tags.inc#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/Makefile#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/modules/acpi/acpi_video/Makefile#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/modules/i2c/controllers/alpm/Makefile#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/modules/i2c/controllers/viapm/Makefile#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/modules/umapfs/Makefile#2 delete .. //depot/projects/soc2007/rpaulo-macbook/net/bridgestp.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/net80211/ieee80211_freebsd.h#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/netatm/atm_cm.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/netatm/ipatm/ipatm_event.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/netatm/spans/spans_proto.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/netatm/uni/sscf_uni_lower.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/netatm/uni/uniarp.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/netatm/uni/uniarp_timer.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/netatm/uni/unisig_decode.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/netatm/uni/unisig_proto.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/netgraph/bluetooth/drivers/ubt/ng_ubt.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/netgraph/ng_parse.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/vm/swap_pager.c#6 integrate Differences ... ==== //depot/projects/soc2007/rpaulo-macbook/boot/forth/loader.conf#2 (text+ko) ==== @@ -6,7 +6,7 @@ # # All arguments must be in double quotes. # -# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.120 2007/04/09 22:09:09 pjd Exp $ +# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.121 2007/06/25 05:06:55 rafan Exp $ ############################################################## ### Basic configuration options ############################ @@ -135,7 +135,6 @@ portalfs_load="NO" # Portal filesystem procfs_load="NO" # Process filesystem reiserfs_load="NO" # ReiserFS -#umapfs_load="NO" # User-id map filesystem unionfs_load="NO" # Union filesystem xfs_load="NO" # XFS zfs_load="NO" # ZFS ==== //depot/projects/soc2007/rpaulo-macbook/conf/NOTES#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1434 2007/06/16 04:57:03 alc Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1436 2007/06/25 05:06:55 rafan Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -938,10 +938,12 @@ # currently be demand-loaded.) Some people still prefer to statically # compile other filesystems as well. # -# NB: The NULL, PORTAL, UMAP and UNION filesystems are known to be -# buggy, and WILL panic your system if you attempt to do anything with -# them. They are included here as an incentive for some enterprising -# soul to sit down and fix them. +# NB: The PORTAL filesystem is known to be buggy, and WILL panic your +# system if you attempt to do anything with it. It is included here +# as an incentive for some enterprising soul to sit down and fix it. +# The UNION filesystem was known to be buggy in the past. It is now +# being actively maintained, although there are still some issues being +# resolved. # # One of these is mandatory: @@ -964,8 +966,6 @@ options PSEUDOFS_TRACE #Debugging support for PSEUDOFS options SMBFS #SMB/CIFS filesystem options UDF #Universal Disk Format -# Broken (seriously (functionally) broken): -#options UMAPFS #UID map filesystem options UNIONFS #Union filesystem # The xFS_ROOT options REQUIRE the associated ``options xFS'' options NFS_ROOT #NFS usable as root device ==== //depot/projects/soc2007/rpaulo-macbook/conf/files#15 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1222 2007/06/16 04:57:04 alc Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1223 2007/06/25 05:06:55 rafan Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1200,9 +1200,6 @@ fs/udf/udf_iconv.c optional udf_iconv fs/udf/udf_vfsops.c optional udf fs/udf/udf_vnops.c optional udf -fs/umapfs/umap_subr.c optional umapfs -fs/umapfs/umap_vfsops.c optional umapfs -fs/umapfs/umap_vnops.c optional umapfs fs/unionfs/union_subr.c optional unionfs fs/unionfs/union_vfsops.c optional unionfs fs/unionfs/union_vnops.c optional unionfs ==== //depot/projects/soc2007/rpaulo-macbook/conf/options#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.596 2007/06/16 04:57:04 alc Exp $ +# $FreeBSD: src/sys/conf/options,v 1.597 2007/06/25 05:06:55 rafan Exp $ # # On the handling of kernel options # @@ -198,7 +198,6 @@ SMBFS opt_dontuse.h TMPFS opt_dontuse.h UDF opt_dontuse.h -UMAPFS opt_dontuse.h UNIONFS opt_dontuse.h # Pseudofs debugging ==== //depot/projects/soc2007/rpaulo-macbook/dev/ata/ata-chipset.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.197 2007/06/13 17:44:49 bms Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.198 2007/06/25 08:21:21 sos Exp $"); #include "opt_ata.h" #include @@ -2890,6 +2890,10 @@ { ATA_NFORCE_MCP55, 0, AMDNVIDIA, NVIDIA, ATA_UDMA6, "nForce MCP55" }, { ATA_NFORCE_MCP55_S1, 0, 0, NV4|NVQ, ATA_SA300, "nForce MCP55" }, { ATA_NFORCE_MCP55_S2, 0, 0, NV4|NVQ, ATA_SA300, "nForce MCP55" }, + { ATA_NFORCE_MCP61, 0, AMDNVIDIA, NVIDIA, ATA_UDMA6, "nForce MCP61" }, + { ATA_NFORCE_MCP61_S1, 0, 0, NV4|NVQ, ATA_SA300, "nForce MCP61" }, + { ATA_NFORCE_MCP61_S2, 0, 0, NV4|NVQ, ATA_SA300, "nForce MCP61" }, + { ATA_NFORCE_MCP61_S3, 0, 0, NV4|NVQ, ATA_SA300, "nForce MCP61" }, { 0, 0, 0, 0, 0, 0}} ; char buffer[64] ; ==== //depot/projects/soc2007/rpaulo-macbook/dev/ata/ata-pci.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ata/ata-pci.h,v 1.76 2007/03/09 22:23:39 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-pci.h,v 1.77 2007/06/25 08:21:21 sos Exp $ */ /* structure holding chipset config info */ @@ -222,6 +222,10 @@ #define ATA_NFORCE_MCP55 0x036e10de #define ATA_NFORCE_MCP55_S1 0x037e10de #define ATA_NFORCE_MCP55_S2 0x037f10de +#define ATA_NFORCE_MCP61 0x03ec10de +#define ATA_NFORCE_MCP61_S1 0x03e710de +#define ATA_NFORCE_MCP61_S2 0x03f610de +#define ATA_NFORCE_MCP61_S3 0x03f710de #define ATA_PROMISE_ID 0x105a #define ATA_PDC20246 0x4d33105a ==== //depot/projects/soc2007/rpaulo-macbook/dev/ata/ata-usb.c#2 (text) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-usb.c,v 1.6 2007/02/21 19:07:18 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-usb.c,v 1.7 2007/06/23 21:52:05 imp Exp $"); #include "opt_ata.h" #include @@ -45,6 +45,7 @@ #include #include #include +#include #include #include #include ==== //depot/projects/soc2007/rpaulo-macbook/dev/ath/if_ath.c#6 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.171 2007/06/11 03:36:49 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.172 2007/06/24 01:57:20 sam Exp $"); /* * Driver for the Atheros Wireless LAN controller. @@ -4798,8 +4798,10 @@ bf->bf_node = NULL; if (ni != NULL) { /* - * Reclaim node reference. + * Do any callback and reclaim the node reference. */ + if (bf->bf_m->m_flags & M_TXCB) + ieee80211_process_callback(ni, bf->bf_m, -1); ieee80211_free_node(ni); } m_freem(bf->bf_m); ==== //depot/projects/soc2007/rpaulo-macbook/dev/isp/isp.c#3 (text+ko) ==== @@ -46,7 +46,7 @@ #endif #ifdef __FreeBSD__ #include -__FBSDID("$FreeBSD: src/sys/dev/isp/isp.c,v 1.146 2007/05/05 20:17:22 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/isp/isp.c,v 1.147 2007/06/24 01:41:16 mjacob Exp $"); #include #endif #ifdef __OpenBSD__ @@ -812,7 +812,7 @@ } cp = isp->isp_rquest; for (i = 0; i < nw; i++) { - cp[i] = ptr[wi++]; + ISP_IOXPUT_32(isp, ptr[wi++], &cp[i]); wl--; } MEMORYBARRIER(isp, SYNC_REQUEST, @@ -875,7 +875,7 @@ } cp = isp->isp_rquest; for (i = 0; i < nw; i++) { - cp[i] = ptr[wi++]; + ISP_IOXPUT_16(isp, ptr[wi++], &cp[i]); wl--; } MEMORYBARRIER(isp, SYNC_REQUEST, ==== //depot/projects/soc2007/rpaulo-macbook/dev/sym/sym_hipd.c#3 (text+ko) ==== @@ -56,7 +56,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/sym/sym_hipd.c,v 1.65 2007/06/17 05:55:52 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/sym/sym_hipd.c,v 1.66 2007/06/23 00:02:19 mjacob Exp $"); #define SYM_DRIVER_NAME "sym-1.6.5-20000902" @@ -202,7 +202,7 @@ } #define sym_que_entry(ptr, type, member) \ - ((type *)((char *)(ptr)-(unsigned int)(&((type *)0)->member))) + ((type *)((char *)(ptr)-(size_t)(&((type *)0)->member))) #define sym_insque(new, pos) __sym_que_add(new, pos, (pos)->flink) ==== //depot/projects/soc2007/rpaulo-macbook/dev/usb/if_aue.c#4 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/if_aue.c,v 1.115 2007/06/22 05:20:11 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/if_aue.c,v 1.117 2007/06/23 05:59:53 imp Exp $"); /* * ADMtek AN986 Pegasus and AN8511 Pegasus II USB to ethernet driver. @@ -142,6 +142,10 @@ {{ USB_VENDOR_ADMTEK, USB_PRODUCT_ADMTEK_PEGASUSII}, PII }, {{ USB_VENDOR_ADMTEK, USB_PRODUCT_ADMTEK_PEGASUSII_2}, PII }, {{ USB_VENDOR_ADMTEK, USB_PRODUCT_ADMTEK_PEGASUSII_3}, PII }, + {{ USB_VENDOR_ADMTEK, USB_PRODUCT_ADMTEK_PEGASUSII_4}, PII }, + {{ USB_VENDOR_AEI, USB_PRODUCT_AEI_FASTETHERNET}, PII }, + {{ USB_VENDOR_ALLIEDTELESYN, USB_PRODUCT_ALLIEDTELESYN_ATUSB100}, PII }, + {{ USB_VENDOR_ATEN, USB_PRODUCT_ATEN_UC110T}, PII }, {{ USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_USB2LAN}, PII }, {{ USB_VENDOR_BILLIONTON, USB_PRODUCT_BILLIONTON_USB100}, 0 }, {{ USB_VENDOR_BILLIONTON, USB_PRODUCT_BILLIONTON_USBLP100}, PNA }, @@ -156,6 +160,7 @@ {{ USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650TX3}, LSYS|PII }, {{ USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650TX2}, LSYS|PII }, {{ USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650}, LSYS }, + {{ USB_VENDOR_ELCON, USB_PRODUCT_ELCON_PLAN}, PNA|PII }, {{ USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSB20}, PII }, {{ USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSBTX0}, 0 }, {{ USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSBTX1}, LSYS }, @@ -163,6 +168,7 @@ {{ USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSBTX3}, LSYS }, {{ USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSBLTX}, PII }, {{ USB_VENDOR_ELSA, USB_PRODUCT_ELSA_USB2ETHERNET}, 0 }, + {{ USB_VENDOR_GIGABYTE, USB_PRODUCT_GIGABYTE_GNBR402W}, 0 }, {{ USB_VENDOR_HAWKING, USB_PRODUCT_HAWKING_UF100}, PII }, {{ USB_VENDOR_HP, USB_PRODUCT_HP_HN210E}, PII }, {{ USB_VENDOR_IODATA, USB_PRODUCT_IODATA_USBETTX}, 0 }, @@ -174,16 +180,18 @@ {{ USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB100H1}, LSYS|PNA }, {{ USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB10TA}, LSYS }, {{ USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB10TX2}, LSYS|PII }, - {{ USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_MN110}, PII }, {{ USB_VENDOR_MELCO, USB_PRODUCT_MELCO_LUATX1}, 0 }, {{ USB_VENDOR_MELCO, USB_PRODUCT_MELCO_LUATX5}, 0 }, {{ USB_VENDOR_MELCO, USB_PRODUCT_MELCO_LUA2TX5}, PII }, + {{ USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_MN110}, PII }, {{ USB_VENDOR_NETGEAR, USB_PRODUCT_NETGEAR_FA101}, PII }, {{ USB_VENDOR_SIEMENS, USB_PRODUCT_SIEMENS_SPEEDSTREAM}, PII }, + {{ USB_VENDOR_SIIG2, USB_PRODUCT_SIIG2_USBTOETHER}, PII }, {{ USB_VENDOR_SMARTBRIDGES, USB_PRODUCT_SMARTBRIDGES_SMARTNIC},PII }, {{ USB_VENDOR_SMC, USB_PRODUCT_SMC_2202USB}, 0 }, {{ USB_VENDOR_SMC, USB_PRODUCT_SMC_2206USB}, PII }, {{ USB_VENDOR_SOHOWARE, USB_PRODUCT_SOHOWARE_NUB100}, 0 }, + {{ USB_VENDOR_SOHOWARE, USB_PRODUCT_SOHOWARE_NUB110}, PII }, }; #define aue_lookup(v, p) ((const struct aue_type *)usb_lookup(aue_devs, v, p)) ==== //depot/projects/soc2007/rpaulo-macbook/dev/usb/if_cdce.c#4 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/if_cdce.c,v 1.23 2007/06/17 18:46:25 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/if_cdce.c,v 1.24 2007/06/23 06:47:43 imp Exp $"); #include #include @@ -113,15 +113,19 @@ static void cdce_ifmedia_sts(struct ifnet *ifp, struct ifmediareq *ifmr); static const struct cdce_type cdce_devs[] = { + {{ USB_VENDOR_ACERLABS, USB_PRODUCT_ACERLABS_M5632 }, CDCE_NO_UNION }, + {{ USB_VENDOR_AMBIT, USB_PRODUCT_AMBIT_NTL_250 }, CDCE_NO_UNION }, + {{ USB_VENDOR_COMPAQ, USB_PRODUCT_COMPAQ_IPAQLINUX }, CDCE_NO_UNION }, + {{ USB_VENDOR_GMATE, USB_PRODUCT_GMATE_YP3X00 }, CDCE_NO_UNION }, + {{ USB_VENDOR_MOTOROLA2, USB_PRODUCT_MOTOROLA2_USBLAN }, CDCE_ZAURUS | CDCE_NO_UNION }, + {{ USB_VENDOR_MOTOROLA2, USB_PRODUCT_MOTOROLA2_USBLAN2 }, CDCE_ZAURUS | CDCE_NO_UNION }, + {{ USB_VENDOR_NETCHIP, USB_PRODUCT_NETCHIP_ETHERNETGADGET }, CDCE_NO_UNION }, {{ USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_PL2501 }, CDCE_NO_UNION }, {{ USB_VENDOR_SHARP, USB_PRODUCT_SHARP_SL5500 }, CDCE_ZAURUS }, + {{ USB_VENDOR_SHARP, USB_PRODUCT_SHARP_SL5600 }, CDCE_ZAURUS | CDCE_NO_UNION }, {{ USB_VENDOR_SHARP, USB_PRODUCT_SHARP_SLA300 }, CDCE_ZAURUS | CDCE_NO_UNION }, - {{ USB_VENDOR_SHARP, USB_PRODUCT_SHARP_SL5600 }, CDCE_ZAURUS | CDCE_NO_UNION }, {{ USB_VENDOR_SHARP, USB_PRODUCT_SHARP_SLC700 }, CDCE_ZAURUS | CDCE_NO_UNION }, {{ USB_VENDOR_SHARP, USB_PRODUCT_SHARP_SLC750 }, CDCE_ZAURUS | CDCE_NO_UNION }, - {{ USB_VENDOR_GMATE, USB_PRODUCT_GMATE_YP3X00 }, CDCE_NO_UNION }, - {{ USB_VENDOR_NETCHIP, USB_PRODUCT_NETCHIP_ETHERNETGADGET }, CDCE_NO_UNION }, - {{ USB_VENDOR_COMPAQ, USB_PRODUCT_COMPAQ_IPAQLINUX }, CDCE_NO_UNION }, }; #define cdce_lookup(v, p) ((const struct cdce_type *)usb_lookup(cdce_devs, v, p)) ==== //depot/projects/soc2007/rpaulo-macbook/dev/usb/if_cue.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/if_cue.c,v 1.71 2007/06/18 22:25:45 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/if_cue.c,v 1.72 2007/06/23 06:29:19 imp Exp $"); /* * CATC USB-EL1210A USB to ethernet driver. Used in the CATC Netmate @@ -87,6 +87,7 @@ { USB_VENDOR_CATC, USB_PRODUCT_CATC_NETMATE }, { USB_VENDOR_CATC, USB_PRODUCT_CATC_NETMATE2 }, { USB_VENDOR_SMARTBRIDGES, USB_PRODUCT_SMARTBRIDGES_SMARTLINK }, + /* Belkin F5U111 adapter covered by NETMATE entry */ { 0, 0 } }; ==== //depot/projects/soc2007/rpaulo-macbook/dev/usb/if_kue.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/if_kue.c,v 1.81 2007/06/18 22:25:45 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/if_kue.c,v 1.82 2007/06/23 06:47:43 imp Exp $"); /* * Kawasaki LSI KL5KUSB101B USB to ethernet adapter driver. @@ -103,25 +103,40 @@ * Various supported device vendors/products. */ static struct kue_type kue_devs[] = { + { USB_VENDOR_3COM, USB_PRODUCT_3COM_3C19250 }, + { USB_VENDOR_3COM, USB_PRODUCT_3COM_3C460 }, + { USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_URE450 }, + { USB_VENDOR_ADS, USB_PRODUCT_ADS_UBS10BT }, + { USB_VENDOR_ADS, USB_PRODUCT_ADS_UBS10BTX }, { USB_VENDOR_AOX, USB_PRODUCT_AOX_USB101 }, - { USB_VENDOR_KLSI, USB_PRODUCT_AOX_USB101 }, - { USB_VENDOR_ADS, USB_PRODUCT_ADS_UBS10BT }, + { USB_VENDOR_ASANTE, USB_PRODUCT_ASANTE_EA }, { USB_VENDOR_ATEN, USB_PRODUCT_ATEN_UC10T }, - { USB_VENDOR_NETGEAR, USB_PRODUCT_NETGEAR_EA101 }, - { USB_VENDOR_PERACOM, USB_PRODUCT_PERACOM_ENET }, - { USB_VENDOR_PERACOM, USB_PRODUCT_PERACOM_ENET2 }, - { USB_VENDOR_ENTREGA, USB_PRODUCT_ENTREGA_E45 }, - { USB_VENDOR_3COM, USB_PRODUCT_3COM_3C19250 }, + { USB_VENDOR_ATEN, USB_PRODUCT_ATEN_DSB650C }, { USB_VENDOR_COREGA, USB_PRODUCT_COREGA_ETHER_USB_T }, { USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650C }, - { USB_VENDOR_SMC, USB_PRODUCT_SMC_2102USB }, - { USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB10T }, + { USB_VENDOR_ENTREGA, USB_PRODUCT_ENTREGA_E45 }, + { USB_VENDOR_ENTREGA, USB_PRODUCT_ENTREGA_XX1 }, + { USB_VENDOR_ENTREGA, USB_PRODUCT_ENTREGA_XX2 }, + { USB_VENDOR_IODATA, USB_PRODUCT_IODATA_USBETT }, + { USB_VENDOR_JATON, USB_PRODUCT_JATON_EDA }, + { USB_VENDOR_KINGSTON, USB_PRODUCT_KINGSTON_XX1 }, + { USB_VENDOR_KLSI, USB_PRODUCT_AOX_USB101 }, { USB_VENDOR_KLSI, USB_PRODUCT_KLSI_DUH3E10BT }, { USB_VENDOR_KLSI, USB_PRODUCT_KLSI_DUH3E10BTN }, + { USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB10T }, + { USB_VENDOR_MOBILITY, USB_PRODUCT_MOBILITY_EA }, + { USB_VENDOR_NETGEAR, USB_PRODUCT_NETGEAR_EA101 }, + { USB_VENDOR_NETGEAR, USB_PRODUCT_NETGEAR_EA101X }, + { USB_VENDOR_PERACOM, USB_PRODUCT_PERACOM_ENET }, + { USB_VENDOR_PERACOM, USB_PRODUCT_PERACOM_ENET2 }, { USB_VENDOR_PERACOM, USB_PRODUCT_PERACOM_ENET3 }, - { USB_VENDOR_IODATA, USB_PRODUCT_IODATA_USBETT }, - { USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_URE450 }, + { USB_VENDOR_PORTGEAR, USB_PRODUCT_PORTGEAR_EA8 }, + { USB_VENDOR_PORTGEAR, USB_PRODUCT_PORTGEAR_EA9 }, + { USB_VENDOR_PORTSMITH, USB_PRODUCT_PORTSMITH_EEA }, + { USB_VENDOR_SHARK, USB_PRODUCT_SHARK_PA }, + { USB_VENDOR_SILICOM, USB_PRODUCT_SILICOM_U2E }, { USB_VENDOR_SILICOM, USB_PRODUCT_SILICOM_GPE }, + { USB_VENDOR_SMC, USB_PRODUCT_SMC_2102USB }, { 0, 0 } }; ==== //depot/projects/soc2007/rpaulo-macbook/dev/usb/if_ural.c#7 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb/if_ural.c,v 1.63 2007/06/21 14:42:33 imp Exp $ */ +/* $FreeBSD: src/sys/dev/usb/if_ural.c,v 1.64 2007/06/23 06:52:56 imp Exp $ */ /*- * Copyright (c) 2005, 2006 @@ -18,7 +18,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/if_ural.c,v 1.63 2007/06/21 14:42:33 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/if_ural.c,v 1.64 2007/06/23 06:52:56 imp Exp $"); /*- * Ralink Technology RT2500USB chipset driver @@ -106,6 +106,7 @@ { USB_VENDOR_SIEMENS3, USB_PRODUCT_SIEMENS3_WL54G }, { USB_VENDOR_SMC, USB_PRODUCT_SMC_2862WG }, { USB_VENDOR_SPAIRON, USB_PRODUCT_SPAIRON_WL54G }, + { USB_VENDOR_SURECOM, USB_PRODUCT_SURECOM_RT2570 }, { USB_VENDOR_VTECH, USB_PRODUCT_VTECH_RT2570 }, { USB_VENDOR_ZINWELL, USB_PRODUCT_ZINWELL_RT2570 } }; ==== //depot/projects/soc2007/rpaulo-macbook/dev/usb/ucom.c#5 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/ucom.c,v 1.63 2007/06/20 05:10:52 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/ucom.c,v 1.64 2007/06/25 06:40:20 imp Exp $"); /*- * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc. @@ -532,6 +532,16 @@ if (sc->sc_dying) return; + /* + * If there's no sc_oxfer, then ucomclose has removed it. The buffer + * has just been flushed in the ttyflush() in ttyclose(). ttyflush() + * then calls tt_stop(). ucomstop calls ucomstart, so the right thing + * to do here is just abort if sc_oxfer is NULL, as everything else + * is cleaned up elsewhere. + */ + if (sc->sc_oxfer == NULL) + return; + s = spltty(); if (tp->t_state & TS_TBLOCK) { ==== //depot/projects/soc2007/rpaulo-macbook/dev/usb/ukbd.c#8 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/ukbd.c,v 1.70 2007/06/21 14:42:34 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/ukbd.c,v 1.71 2007/06/23 04:20:24 imp Exp $"); /* * HID spec: http://www.usb.org/developers/devclass_docs/HID1_11.pdf @@ -148,7 +148,7 @@ static devclass_t ukbd_devclass; MODULE_DEPEND(ukbd, usb, 1, 1, 1); -DRIVER_MODULE(ukbd, uhub, ukbd_driver, ukbd_devclass, usbd_driver_load, 0); +DRIVER_MODULE(ukbd, uhub, ukbd_driver, ukbd_devclass, ukbd_driver_load, 0); static int ukbd_match(device_t self) ==== //depot/projects/soc2007/rpaulo-macbook/dev/usb/umodem.c#4 (text+ko) ==== @@ -2,7 +2,7 @@ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/umodem.c,v 1.68 2007/06/21 14:42:34 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/umodem.c,v 1.69 2007/06/23 04:18:44 imp Exp $"); /*- * Copyright (c) 2003, M. Warner Losh . * All rights reserved. @@ -292,8 +292,8 @@ sc->sc_udev = dev; sc->sc_ctl_iface = uaa->iface; + id = usbd_get_interface_descriptor(sc->sc_ctl_iface); sc->sc_ctl_iface_no = id->bInterfaceNumber; - id = usbd_get_interface_descriptor(sc->sc_ctl_iface); device_printf(self, "iclass %d/%d", id->bInterfaceClass, id->bInterfaceSubClass); ==== //depot/projects/soc2007/rpaulo-macbook/dev/usb/usbdevs#9 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/dev/usb/usbdevs,v 1.306 2007/06/22 06:02:19 imp Exp $ +$FreeBSD: src/sys/dev/usb/usbdevs,v 1.309 2007/06/23 06:52:56 imp Exp $ /* $NetBSD: usbdevs,v 1.392 2004/12/29 08:38:44 imp Exp $ */ /*- @@ -187,7 +187,7 @@ vendor ALTEC 0x04d2 Altec Lansing vendor LSI 0x04d4 LSI vendor MENTORGRAPHICS 0x04d6 Mentor Graphics -vendor ITUNERNET 0x04d8 I-Tuner Networks +vendor ITUNERNET 0x04d8 I-Tuner Networks vendor HOLTEK 0x04d9 Holtek vendor PANASONIC 0x04da Panasonic (Matsushita) vendor HUANHSIN 0x04dc Huan Hsin @@ -478,6 +478,7 @@ vendor ASIX 0x0b95 ASIX vendor O2MICRO 0x0b97 O2 Micro, Inc. vendor USR 0x0baf U.S. Robotics +vendor AMBIT 0x0bb2 Ambit Microsystems vendor REALTEK 0x0bda RealTek vendor ADDONICS2 0x0bf6 Addonics vendor AGATE 0x0c08 Agate @@ -494,6 +495,7 @@ vendor ABC 0x0d8c ABC vendor CONCEPTRONIC 0x0d8e Conceptronic vendor MSI 0x0db0 Micro Star International +vendor ELCON 0x0db7 ELCON Systemtechnik vendor SITECOMEU 0x0df6 Sitecom Europe vendor HAWKING 0x0e66 Hawking vendor FOSSIL 0x0e67 Fossil, Inc @@ -560,6 +562,7 @@ vendor HIROSE 0x2631 Hirose vendor NHJ 0x2770 NHJ vendor PLANEX 0x2c02 Planex +vendor AEI 0x3334 AEI vendor VIDZMEDIA 0x3275 VidzMedia vendor AEI 0x3334 AEI vendor PQI 0x3538 PQI @@ -624,6 +627,9 @@ /* Aceeca products */ product ACEECA MEZ1000 0x0001 Aceeca Mez1000 RDA +/* Acer Labs products */ +product ACERLABS M5632 0x5632 USB 2.0 Data Link + /* Acer Peripherals, Inc. products */ product ACERP ACERSCAN_C310U 0x12a6 Acerscan C310U product ACERP ACERSCAN_320U 0x2022 Acerscan 320U @@ -643,6 +649,7 @@ product ACTIONTEC UAT1 0x7605 UAT1 Wireless Ethernet /* ADMtek products */ +product ADMTEK PEGASUSII_4 0x07c2 AN986AEthernet product ADMTEK PEGASUS 0x0986 AN986 Ethernet product ADMTEK PEGASUSII 0x8511 AN8511 Ethernet product ADMTEK PEGASUSII_2 0x8513 AN8513 Ethernet @@ -657,7 +664,11 @@ /* ADS products */ product ADS UBS10BT 0x0008 UBS-10BT Ethernet +product ADS UBS10BTX 0x0009 UBS-10BT Ethernet +/* AEI products */ +product AEI FASTETHERNET 0x1701 Fast Ethernet + /* Agate Technologies products */ product AGATE QDRIVE 0x0378 Q-Drive @@ -691,8 +702,12 @@ product ALTEC ADA70 0x0070 ADA70 Speakers product ALTEC ASC495 0xff05 ASC495 Speakers -/* American Power Conversion products */ -product APC UPS 0x0002 Uninterruptible Power Supply +/* Allied Telesyn International products */ +product ALLIEDTELESYN ATUSB100 0xb100 AT-USB100 + +/* Ambit Microsystems products */ +product AMBIT WLAN 0x0302 WLAN +product AMBIT NTL_250 0x6098 NTL 250 cable modem /* AMIT products */ product AMIT CGWLUSB2GO 0x0002 CG-WLUSB2GO @@ -707,6 +722,9 @@ /* AOX, Inc. products */ product AOX USB101 0x0008 Ethernet +/* American Power Conversion products */ +product APC UPS 0x0002 Uninterruptible Power Supply + /* Apple Computer products */ product APPLE OPTMOUSE 0x0302 Optical mouse product APPLE SPEAKERS 0x1101 Speakers @@ -729,8 +747,11 @@ product ASAHIOPTICAL OPTIO230 0x0004 Digital camera product ASAHIOPTICAL OPTIO330 0x0006 Digital camera +/* Asante products */ +product ASANTE EA 0x1427 Ethernet + /* ASIX Electronics products */ -product ASIX AX88172 0x1720 10/100 ethernet +product ASIX AX88172 0x1720 10/100 ethernet /* ASUS products */ product ASUS WL167G 0x1707 WL-167g wireless adapter @@ -740,7 +761,10 @@ /* ATen products */ product ATEN UC1284 0x2001 Parallel printer product ATEN UC10T 0x2002 10Mbps ethernet +product ATEN UC110T 0x2007 UC-110T Ethernet product ATEN UC232A 0x2008 Serial +product ATEN UC210T 0x2000 UC-210T Ethernet +product ATEN DSB650C 0x4000 DSB-650C /* Atheros Communications products */ product ATHEROS AR5523 0x0001 AR5523 @@ -936,6 +960,9 @@ product EIZO HUB 0x0000 hub product EIZO MONITOR 0x0001 monitor +/* ELCON Systemtechnik products */ +product ELCON PLAN 0x0002 Goldpfeil P-LAN + /* Elecom products */ product ELECOM MOUSE29UO 0x0002 mouse 29UO product ELECOM LDUSBTX0 0x200c LD-USB/TX @@ -961,10 +988,12 @@ product ENTREGA 4S 0x0004 4S serial product ENTREGA E45 0x0005 E45 Ethernet product ENTREGA CENTRONICS 0x0006 Parallel Port +product ENTREGA XX1 0x0008 Ethernet product ENTREGA 1S9 0x0093 1S9 serial product ENTREGA EZUSB 0x8000 EZ-USB /*product ENTREGA SERIAL 0x8001 DB25 Serial*/ product ENTREGA 2U4S 0x8004 2U4S serial/usb hub +product ENTREGA XX2 0x8005 Ethernet /*product ENTREGA SERIAL_DB9 0x8093 DB9 Serial*/ /* Epson products */ @@ -988,12 +1017,12 @@ product EPSON 1660 0x011e Perfection 1660 scanner product EPSON 1670 0x011f Perfection 1670 scanner product EPSON 1270 0x0120 Perfection 1270 scanner -product EPSON 2480 0x0121 Perfection 2480 scanner +product EPSON 2480 0x0121 Perfection 2480 scanner product EPSON 3590 0x0122 Perfection 3590 scanner product EPSON 4990 0x012a Perfection 4990 Photo scanner product EPSON 3500 0x080e CX-3500/3600/3650 MFP product EPSON RX425 0x080f Stylus Photo RX425 scanner -product EPSON 4200 0x0820 CX4200 MP scanner +product EPSON 4200 0x0820 CX4200 MP scanner /* e-TEK Labs products */ product ETEK 1COM 0x8007 Serial @@ -1150,7 +1179,7 @@ product HP 2200C 0x0605 ScanJet 2200C product HP 5300C 0x0701 Scanjet 5300C product HP 4400C 0x0705 Scanjet 4400C -product HP 82x0C 0x0b01 Scanjet 82x0C +product HP 82x0C 0x0b01 Scanjet 82x0C product HP 2300D 0x0b17 Laserjet 2300d product HP 970CSE 0x1004 Deskjet 970Cse product HP 5400C 0x1005 Scanjet 5400C @@ -1211,6 +1240,9 @@ /* Ituner networks products */ product ITUNERNET USBLCD2X20 0x0002 USB-LCD 2x20 +/* Jaton products */ +product JATON EDA 0x5704 Ethernet + /* JVC products */ product JVC GR_DX95 0x000a GR-DX95 product JVC MP_PRX1 0x3008 MP-PRX1 Ethernet @@ -1218,19 +1250,12 @@ /* JRC products */ product JRC AH_J3001V_J3002V 0x0001 AirH PHONE AH-J3001V/J3002V -/* Kawasaki products */ -product KLSI DUH3E10BT 0x0008 USB ethernet -product KLSI DUH3E10BTN 0x0009 USB ethernet - /* Kawatsu products */ product KAWATSU MH4000P 0x0003 MiniHub 4000P /* Keisokugiken Corp. products */ product KEISOKUGIKEN USBDAQ 0x0068 HKS-0200 USBDAQ -/* Kawasaki products */ -product KLSI DUH3E10BT 0x0008 DU-H3E 10BT Ethernet - /* Kensington products */ product KENSINGTON ORBIT 0x1003 Orbit USB/PS2 trackball product KENSINGTON TURBOBALL 0x1005 TurboBall @@ -1266,8 +1291,13 @@ product KEYSPAN UIA11 0x0202 UIA-11 remote control /* Kingston products */ +product KINGSTON XX1 0x0008 Ethernet product KINGSTON KNU101TX 0x000a KNU101TX USB Ethernet +/* Kawasaki products */ +product KLSI DUH3E10BT 0x0008 USB ethernet +product KLSI DUH3E10BTN 0x0009 USB ethernet + /* Kodak products */ product KODAK DC220 0x0100 Digital Science DC220 product KODAK DC260 0x0110 Digital Science DC260 @@ -1431,11 +1461,17 @@ product MITSUMI CDRRW 0x0000 CD-R/RW Drive product MITSUMI BT_DONGLE 0x641f Bluetooth USB dongle +/* Mobility products */ +product MOBILITY EA 0x0204 Ethernet +product MOBILITY EASIDOCK 0x0304 EasiDock Ethernet + /* Motorola products */ product MOTOROLA MC141555 0x1555 MC141555 hub controller product MOTOROLA SB4100 0x4100 SB4100 USB Cable Modem -product MOTOROLA2 A41XV32X 0x2a22 A41x/V32x Mobile Phones +product MOTOROLA2 A41XV32X 0x2a22 A41x/V32x Mobile Phones product MOTOROLA2 E398 0x4810 E398 Mobile Phone +product MOTOROLA2 USBLAN 0x600c USBLAN +product MOTOROLA2 USBLAN2 0x6027 USBLAN /* MultiTech products */ product MULTITECH ATLAS 0xf101 MT5634ZBA-USB modem @@ -1474,6 +1510,7 @@ /* Netgear products */ product NETGEAR EA101 0x1001 Ethernet +product NETGEAR EA101X 0x1002 Ethernet product NETGEAR FA101 0x1020 Ethernet 10/100, USB1.1 product NETGEAR FA120 0x1040 USB 2.0 Ethernet product NETGEAR3 WG111T 0x4250 WG111T @@ -1488,7 +1525,7 @@ product NIKON LS40 0x4000 CoolScan LS40 ED /* NovaTech Products */ -product NOVATECH NV902 0x9020 NovaTech NV-902W +product NOVATECH NV902 0x9020 NovaTech NV-902W product NOVATECH RT2573 0x9021 RT2573 /* Novatel Wireless products */ @@ -1561,6 +1598,13 @@ /* PNY products */ product PNY ATTACHE2 0x0010 USB 2.0 Flash Drive +/* PortGear products */ +product PORTGEAR EA8 0x0008 Ethernet +product PORTGEAR EA9 0x0009 Ethernet + +/* Portsmith products */ +product PORTSMITH EEA 0x3003 Express Ethernet + /* Primax products */ product PRIMAX G2X300 0x0300 G2-200 scanner product PRIMAX G2E300 0x0301 G2E-300 scanner @@ -1589,7 +1633,7 @@ product PROLIFIC PL2501 0x2501 PL2501 Host-Host interface product PROLIFIC PHAROS 0xaaa0 Prolific Pharos product PROLIFIC RSAQ3 0xaaa2 PL2303 Serial adapter (IODATA USB-RSAQ3) -product PROLIFIC2 WSIM 0x2001 Willcom WSIM +product PROLIFIC2 WSIM 0x2001 Willcom WSIM /* Putercom products */ product PUTERCOM UPA100 0x047e USB-1284 BRIDGE @@ -1662,6 +1706,9 @@ product SCANLOGIC SL11R 0x0002 SL11R IDE Adapter product SCANLOGIC 336CX 0x0300 Phantom 336CX - C3 scanner +/* Shark products */ +product SHARK PA 0x0400 Pocket Adapter + /* Sharp products */ product SHARP SL5500 0x8004 Zaurus SL-5500 PDA product SHARP SLA300 0x8005 Zaurus SL-A300 PDA @@ -1694,11 +1741,14 @@ product SIGMATEL I_BEAD100 0x8008 i-Bead 100 MP3 Player /* SIIG products */ +/* Also: Omnidirectional Control Technology products */ product SIIG DIGIFILMREADER 0x0004 DigiFilm-Combo Reader product SIIG WINTERREADER 0x0330 WINTERREADER Reader +product SIIG2 USBTOETHER 0x0109 USB TO Ethernet product SIIG2 US2308 0x0421 Serial /* Silicom products */ +product SILICOM U2E 0x0001 U2E product SILICOM GPE 0x0002 Psion Gold Port Ethernet /* Silicon Portals Inc. */ @@ -1730,6 +1780,7 @@ /* SOHOware products */ product SOHOWARE NUB100 0x9100 10/100 USB Ethernet +product SOHOWARE NUB110 0x9110 10/100 USB Ethernet /* SOLID YEAR products */ product SOLIDYEAR KEYBOARD 0x2101 Solid Year USB keyboard @@ -1785,6 +1836,7 @@ product DIAMOND2 RIO800USB 0x5002 Rio 800 USB /* Surecom Technology products */ +product SURECOM RT2570 0x11f3 RT2570 product SURECOM RT2573 0x31f3 RT2573 /* System TALKS, Inc. */ @@ -1920,7 +1972,7 @@ /* Yano products */ product YANO U640MO 0x0101 U640MO-03 -product YANO FW800HD 0x05fc METALWEAR-HDD +product YANO FW800HD 0x05fc METALWEAR-HDD /* Zinwell products */ product ZINWELL RT2570 0x0260 RT2570 ==== //depot/projects/soc2007/rpaulo-macbook/kern/Make.tags.inc#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/kern/Make.tags.inc,v 1.18 2007/05/13 18:21:54 mckusick Exp $ +# $FreeBSD: src/sys/kern/Make.tags.inc,v 1.19 2007/06/25 05:06:56 rafan Exp $ # @(#)Make.tags.inc 8.1 (Berkeley) 6/11/93 SYS?= ${.CURDIR}/.. @@ -37,7 +37,6 @@ ${SYS}/fs/procfs/*.[ch] \ ${SYS}/fs/smbfs/*.[ch] \ ${SYS}/fs/udf/*.[ch] \ - ${SYS}/fs/umapfs/*.[ch] \ ${SYS}/fs/unionfs/*.[ch] \ ${SYS}/kern/*.[ch] \ ${SYS}/net/*.[ch] \ @@ -96,7 +95,6 @@ ${SYS}/fs/portalfs \ ${SYS}/fs/procfs \ ${SYS}/fs/specfs \ - ${SYS}/fs/umapfs \ ${SYS}/fs/unionfs \ ${SYS}/fs/cd9660 \ ${SYS}/ufs/ffs \ ==== //depot/projects/soc2007/rpaulo-macbook/kern/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 3/21/94 -# $FreeBSD: src/sys/kern/Makefile,v 1.13 2006/08/05 19:25:14 jb Exp $ +# $FreeBSD: src/sys/kern/Makefile,v 1.14 2007/06/25 05:06:56 rafan Exp $ # Makefile for kernel tags files, init_sysent, etc. @@ -38,7 +38,7 @@ dev dev/scsi \ fs fs/deadfs fs/fdescfs fs/fifofs \ fs/lofs fs/nullfs fs/portalfs fs/procfs \ - fs/specfs fs/umapfs fs/unionfs \ + fs/specfs fs/unionfs \ hp hp/dev hp/hpux \ kern libkern \ net netinet nfs scripts sys \ ==== //depot/projects/soc2007/rpaulo-macbook/modules/acpi/acpi_video/Makefile#2 (text+ko) ==== @@ -1,9 +1,9 @@ -# $FreeBSD: src/sys/modules/acpi/acpi_video/Makefile,v 1.6 2006/05/30 09:38:53 ru Exp $ +# $FreeBSD: src/sys/modules/acpi/acpi_video/Makefile,v 1.7 2007/06/24 20:36:51 njl Exp $ .PATH: ${.CURDIR}/../../../dev/acpica KMOD= acpi_video -CFLAGS+= -I@/contrib/dev/acpica +CFLAGS+= -I${.CURDIR}/../../../contrib/dev/acpica SRCS= acpi_video.c SRCS+= opt_acpi.h acpi_if.h bus_if.h device_if.h ==== //depot/projects/soc2007/rpaulo-macbook/modules/i2c/controllers/alpm/Makefile#2 (text+ko) ==== @@ -1,8 +1,7 @@ -# $FreeBSD: src/sys/modules/i2c/controllers/alpm/Makefile,v 1.1 2002/03/23 15:48:39 nsouch Exp $ +# $FreeBSD: src/sys/modules/i2c/controllers/alpm/Makefile,v 1.2 2007/06/24 20:35:58 njl Exp $ .PATH: ${.CURDIR}/../../../../pci KMOD = alpm -CFLAGS += -DALPM_SMBIO_BASE_ADDR=0xbc00 SRCS = device_if.h bus_if.h iicbus_if.h smbus_if.h pci_if.h \ alpm.c ==== //depot/projects/soc2007/rpaulo-macbook/modules/i2c/controllers/viapm/Makefile#2 (text+ko) ==== @@ -1,9 +1,8 @@ -# $FreeBSD: src/sys/modules/i2c/controllers/viapm/Makefile,v 1.2 2005/11/08 17:03:09 jhb Exp $ +# $FreeBSD: src/sys/modules/i2c/controllers/viapm/Makefile,v 1.3 2007/06/24 20:35:59 njl Exp $ .PATH: ${.CURDIR}/../../../../pci KMOD = viapm SRCS = device_if.h bus_if.h iicbb_if.h isa_if.h pci_if.h smbus_if.h \ opt_isa.h viapm.c -CFLAGS += -DVIAPM_BASE_ADDR=0x6000 .include ==== //depot/projects/soc2007/rpaulo-macbook/net/bridgestp.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net/bridgestp.c,v 1.36 2007/03/14 20:55:51 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/net/bridgestp.c,v 1.37 2007/06/22 23:28:33 thompsa Exp $"); #include #include @@ -916,8 +916,8 @@ if (!bs->bs_allsynced) { synced = 1; LIST_FOREACH(bp2, &bs->bs_bplist, bp_next) { - if (!(bp->bp_synced || - bp->bp_role == BSTP_ROLE_ROOT)) { + if (!(bp2->bp_synced || + bp2->bp_role == BSTP_ROLE_ROOT)) { synced = 0; break; } ==== //depot/projects/soc2007/rpaulo-macbook/net80211/ieee80211_freebsd.h#4 (text+ko) ==== @@ -22,7 +22,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/net80211/ieee80211_freebsd.h,v 1.13 2007/06/11 03:36:54 sam Exp $ + * $FreeBSD: src/sys/net80211/ieee80211_freebsd.h,v 1.14 2007/06/25 03:26:10 sam Exp $ */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jun 25 10:31:01 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2CAFE16A46C; Mon, 25 Jun 2007 10:31:01 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0182716A469 for ; Mon, 25 Jun 2007 10:31:01 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id E5B3513C448 for ; Mon, 25 Jun 2007 10:31:00 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5PAV06J019397 for ; Mon, 25 Jun 2007 10:31:00 GMT (envelope-from zhouzhouyi@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5PAV05l019390 for perforce@freebsd.org; Mon, 25 Jun 2007 10:31:00 GMT (envelope-from zhouzhouyi@FreeBSD.org) Date: Mon, 25 Jun 2007 10:31:00 GMT Message-Id: <200706251031.l5PAV05l019390@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zhouzhouyi@FreeBSD.org using -f From: Zhouyi ZHOU To: Perforce Change Reviews Cc: Subject: PERFORCE change 122275 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Jun 2007 10:31:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=122275 Change 122275 by zhouzhouyi@zhouzhouyi_mactest on 2007/06/25 10:30:44 New implementation of logging mac_test check into userspace. The handling of log in mac_test_log.c is quick and dirty, I will revise it sooner or later. Affected files ... .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/LICENSE#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/Makefile#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/README#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/macproc.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/mactest.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/mactestparser.y#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/conf#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/misc.sh#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/signal/00.t#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/conf/files#2 edit .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac/mac_policy.h#2 edit .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac/mac_vfs.c#2 edit .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac_test/mac_test.c#2 edit .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac_test/mac_test_if.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac_test/mac_test_log.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac_test/mac_test_private.h#1 add Differences ... ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/conf/files#2 (text+ko) ==== @@ -2037,6 +2037,8 @@ security/mac_seeotheruids/mac_seeotheruids.c optional mac_seeotheruids security/mac_stub/mac_stub.c optional mac_stub security/mac_test/mac_test.c optional mac_test +security/mac_test/mac_test_if.c optional mac_test +security/mac_test/mac_test_log.c optional mac_test ufs/ffs/ffs_alloc.c optional ffs ufs/ffs/ffs_balloc.c optional ffs ufs/ffs/ffs_inode.c optional ffs ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac/mac_policy.h#2 (text+ko) ==== @@ -631,6 +631,7 @@ mpo_init_bpfdesc_label_t mpo_init_bpfdesc_label; mpo_init_cred_label_t mpo_init_cred_label; mpo_init_devfs_label_t mpo_init_devfs_label; + mpo_init_devfs_label_t mpo_init_mactest_label; mpo_placeholder_t _mpo_placeholder0; mpo_init_ifnet_label_t mpo_init_ifnet_label; mpo_init_inpcb_label_t mpo_init_inpcb_label; ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac/mac_vfs.c#2 (text+ko) ==== @@ -59,13 +59,13 @@ #include #include #include - #include #include #include #include #include +#include #include #include @@ -90,11 +90,24 @@ return (label); } +static struct label * +mac_mactest_label_alloc(void) +{ + struct label *label; + + label = mac_labelzone_alloc(M_WAITOK); + MAC_PERFORM(init_devfs_label, label); + MAC_PERFORM(init_mactest_label, label); + return (label); +} + void mac_init_devfs(struct devfs_dirent *de) { - - de->de_label = mac_devfs_label_alloc(); + if (de&&de->de_dirent&&!strncmp(de->de_dirent->d_name,"mactest", 7)) + de->de_label = mac_mactest_label_alloc(); + else + de->de_label = mac_devfs_label_alloc(); } static struct label * ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac_test/mac_test.c#2 (text+ko) ==== @@ -54,13 +54,15 @@ #include #include #include +#include #include #include #include #include #include #include - +#include +#include #include #include @@ -69,14 +71,22 @@ #include #include +#include -SYSCTL_DECL(_security_mac); +//SYSCTL_DECL(_security_mac); SYSCTL_NODE(_security_mac, OID_AUTO, test, CTLFLAG_RW, 0, "TrustedBSD mac_test policy controls"); +int +mac_test_init_if(SYSCTL_HANDLER_ARGS); + +SYSCTL_PROC(_security_mac_test, OID_AUTO, pseudoinit, CTLTYPE_INT | CTLFLAG_RW, 0, 0, + mac_test_init_if, "I", "set to setup the pseudo interfaces for MAC test"); + #define MAGIC_BPF 0xfe1ad1b6 #define MAGIC_DEVFS 0x9ee79c32 +#define MAGIC_MACTESTLOG 0x9ee79c33 #define MAGIC_IFNET 0xc218b120 #define MAGIC_INPCB 0x4440f7bb #define MAGIC_IPQ 0x206188ef @@ -119,14 +129,16 @@ #define LABEL_CHECK(label, magic) do { \ if (label != NULL) { \ - KASSERT(SLOT(label) == magic || SLOT(label) == 0, \ + KASSERT(SLOT(label) == magic || SLOT(label) == 0 || \ + SLOT(label) == MAGIC_MACTESTLOG, \ ("%s: bad %s label", __func__, #magic)); \ } \ } while (0) #define LABEL_DESTROY(label, magic) do { \ - if (SLOT(label) == magic || SLOT(label) == 0) { \ - SLOT_SET(label, MAGIC_FREE); \ + if (SLOT(label) == magic || SLOT(label) == 0 || \ + SLOT(label) == MAGIC_MACTESTLOG ) { \ + SLOT_SET(label, MAGIC_FREE); \ } else if (SLOT(label) == MAGIC_FREE) { \ DEBUGGER("%s: dup destroy", __func__); \ } else { \ @@ -150,7 +162,9 @@ static void mac_test_init_bpfdesc_label(struct label *label) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_init_bpfdesc_label\n", + strlen("mac_test_init_bpfdesc_label\n")); + MAC_TEST_LOG_DO_SUBMIT; LABEL_INIT(label, MAGIC_BPF); COUNTER_INC(init_bpfdesc_label); } @@ -159,7 +173,9 @@ static void mac_test_init_cred_label(struct label *label) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_init_cred_label\n", + strlen("mac_test_init_cred_label\n")); + MAC_TEST_LOG_DO_SUBMIT; LABEL_INIT(label, MAGIC_CRED); COUNTER_INC(init_cred_label); } @@ -168,16 +184,26 @@ static void mac_test_init_devfs_label(struct label *label) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_init_devfs_label\n", + strlen("mac_test_init_devfs_label\n")); + MAC_TEST_LOG_DO_SUBMIT; LABEL_INIT(label, MAGIC_DEVFS); COUNTER_INC(init_devfs_label); } +static void +mac_test_init_mactest_label(struct label *label) +{ + LABEL_INIT(label, MAGIC_MACTESTLOG); +} + COUNTER_DECL(init_ifnet_label); static void mac_test_init_ifnet_label(struct label *label) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_init_ifnet_label\n", + strlen("mac_test_init_ifnet_label\n")); + MAC_TEST_LOG_DO_SUBMIT; LABEL_INIT(label, MAGIC_IFNET); COUNTER_INC(init_ifnet_label); } @@ -186,7 +212,9 @@ static int mac_test_init_inpcb_label(struct label *label, int flag) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_init_inpcb_label\n", + strlen("mac_test_init_inpcb_label\n")); + MAC_TEST_LOG_DO_SUBMIT; if (flag & M_WAITOK) WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL, "mac_test_init_inpcb_label() at %s:%d", __FILE__, @@ -201,6 +229,9 @@ static void mac_test_init_sysv_msgmsg_label(struct label *label) { + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_init_sysv_msgmsg_label\n", + strlen("mac_test_init_sysv_msgmsg_label\n")); + MAC_TEST_LOG_DO_SUBMIT; LABEL_INIT(label, MAGIC_SYSV_MSG); COUNTER_INC(init_sysv_msg_label); } @@ -209,6 +240,9 @@ static void mac_test_init_sysv_msgqueue_label(struct label *label) { + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_init_sysv_msgqueue_label\n", + strlen("mac_test_init_sysv_msgqueue_label\n")); + MAC_TEST_LOG_DO_SUBMIT; LABEL_INIT(label, MAGIC_SYSV_MSQ); COUNTER_INC(init_sysv_msq_label); } @@ -217,6 +251,9 @@ static void mac_test_init_sysv_sem_label(struct label *label) { + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_init_sysv_sem_label\n", + strlen("mac_test_init_sysv_sem_label\n")); + MAC_TEST_LOG_DO_SUBMIT; LABEL_INIT(label, MAGIC_SYSV_SEM); COUNTER_INC(init_sysv_sem_label); } @@ -225,6 +262,9 @@ static void mac_test_init_sysv_shm_label(struct label *label) { + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_init_sysv_shm_label\n", + strlen("mac_test_init_sysv_shm_label\n")); + MAC_TEST_LOG_DO_SUBMIT; LABEL_INIT(label, MAGIC_SYSV_SHM); COUNTER_INC(init_sysv_shm_label); } @@ -233,7 +273,9 @@ static int mac_test_init_ipq_label(struct label *label, int flag) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_init_ipq_label\n", + strlen("mac_test_init_ipq_label\n")); + MAC_TEST_LOG_DO_SUBMIT; if (flag & M_WAITOK) WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL, "mac_test_init_ipq_label() at %s:%d", __FILE__, @@ -248,7 +290,9 @@ static int mac_test_init_mbuf_label(struct label *label, int flag) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_init_mbuf_label\n", + strlen("mac_test_init_mbuf_label\n")); + MAC_TEST_LOG_DO_SUBMIT; if (flag & M_WAITOK) WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL, "mac_test_init_mbuf_label() at %s:%d", __FILE__, @@ -263,7 +307,9 @@ static void mac_test_init_mount_label(struct label *label) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_init_mount_label\n", + strlen("mac_test_init_mount_label\n")); + MAC_TEST_LOG_DO_SUBMIT; LABEL_INIT(label, MAGIC_MOUNT); COUNTER_INC(init_mount_label); } @@ -273,6 +319,9 @@ mac_test_init_socket_label(struct label *label, int flag) { + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_init_socket_label\n", + strlen("mac_test_init_socket_label\n")); + MAC_TEST_LOG_DO_SUBMIT; if (flag & M_WAITOK) WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL, "mac_test_init_socket_label() at %s:%d", __FILE__, @@ -287,7 +336,9 @@ static int mac_test_init_socket_peer_label(struct label *label, int flag) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_init_socket_peer_label\n", + strlen("mac_test_init_socket_peer_label\n")); + MAC_TEST_LOG_DO_SUBMIT; if (flag & M_WAITOK) WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL, "mac_test_init_socket_peer_label() at %s:%d", __FILE__, @@ -302,7 +353,9 @@ static void mac_test_init_pipe_label(struct label *label) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_init_pipe_label\n", + strlen("mac_test_init_pipe_label\n")); + MAC_TEST_LOG_DO_SUBMIT; LABEL_INIT(label, MAGIC_PIPE); COUNTER_INC(init_pipe_label); } @@ -311,7 +364,9 @@ static void mac_test_init_posix_sem_label(struct label *label) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_init_posix_sem_label\n", + strlen("mac_test_init_posix_sem_label\n")); + MAC_TEST_LOG_DO_SUBMIT; LABEL_INIT(label, MAGIC_POSIX_SEM); COUNTER_INC(init_posix_sem_label); } @@ -320,7 +375,9 @@ static void mac_test_init_proc_label(struct label *label) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_init_proc_label\n", + strlen("mac_test_init_proc_label\n")); + MAC_TEST_LOG_DO_SUBMIT; LABEL_INIT(label, MAGIC_PROC); COUNTER_INC(init_proc_label); } @@ -329,7 +386,9 @@ static void mac_test_init_vnode_label(struct label *label) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_init_vnode_label\n", + strlen("mac_test_init_vnode_label\n")); + MAC_TEST_LOG_DO_SUBMIT; LABEL_INIT(label, MAGIC_VNODE); COUNTER_INC(init_vnode_label); } @@ -338,7 +397,9 @@ static void mac_test_destroy_bpfdesc_label(struct label *label) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_destroy_bpfdesc_label\n", + strlen("mac_test_destroy_bpfdesc_label\n")); + MAC_TEST_LOG_DO_SUBMIT; LABEL_DESTROY(label, MAGIC_BPF); COUNTER_INC(destroy_bpfdesc_label); } @@ -347,7 +408,9 @@ static void mac_test_destroy_cred_label(struct label *label) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_destroy_cred_label\n", + strlen("mac_test_destroy_cred_label\n")); + MAC_TEST_LOG_DO_SUBMIT; LABEL_DESTROY(label, MAGIC_CRED); COUNTER_INC(destroy_cred_label); } @@ -356,7 +419,9 @@ static void mac_test_destroy_devfs_label(struct label *label) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_destroy_devfs_label\n", + strlen("mac_test_destroy_devfs_label\n")); + MAC_TEST_LOG_DO_SUBMIT; LABEL_DESTROY(label, MAGIC_DEVFS); COUNTER_INC(destroy_devfs_label); } @@ -365,7 +430,9 @@ static void mac_test_destroy_ifnet_label(struct label *label) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_destroy_ifnet_label\n", + strlen("mac_test_destroy_ifnet_label\n")); + MAC_TEST_LOG_DO_SUBMIT; LABEL_DESTROY(label, MAGIC_IFNET); COUNTER_INC(destroy_ifnet_label); } @@ -374,7 +441,9 @@ static void mac_test_destroy_inpcb_label(struct label *label) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_destroy_inpcb_label\n", + strlen("mac_test_destroy_inpcb_label\n")); + MAC_TEST_LOG_DO_SUBMIT; LABEL_DESTROY(label, MAGIC_INPCB); COUNTER_INC(destroy_inpcb_label); } @@ -383,7 +452,9 @@ static void mac_test_destroy_sysv_msgmsg_label(struct label *label) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_destroy_sysv_msgmsg_label\n", + strlen("mac_test_destroy_sysv_msgmsg__label\n")); + MAC_TEST_LOG_DO_SUBMIT; LABEL_DESTROY(label, MAGIC_SYSV_MSG); COUNTER_INC(destroy_sysv_msg_label); } @@ -392,7 +463,9 @@ static void mac_test_destroy_sysv_msgqueue_label(struct label *label) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_destroy_sysv_msgqueue_label\n", + strlen("mac_test_destroy_sysv_msgqueue_label\n")); + MAC_TEST_LOG_DO_SUBMIT; LABEL_DESTROY(label, MAGIC_SYSV_MSQ); COUNTER_INC(destroy_sysv_msq_label); } @@ -401,7 +474,9 @@ static void mac_test_destroy_sysv_sem_label(struct label *label) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_destroy_sysv_sem_label\n", + strlen("mac_test_destroy_sysv_sem_label\n")); + MAC_TEST_LOG_DO_SUBMIT; LABEL_DESTROY(label, MAGIC_SYSV_SEM); COUNTER_INC(destroy_sysv_sem_label); } @@ -410,7 +485,9 @@ static void mac_test_destroy_sysv_shm_label(struct label *label) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_destroy_sysv_shm_label\n", + strlen("mac_test_destroy_sysv_shm_label\n")); + MAC_TEST_LOG_DO_SUBMIT; LABEL_DESTROY(label, MAGIC_SYSV_SHM); COUNTER_INC(destroy_sysv_shm_label); } @@ -419,7 +496,9 @@ static void mac_test_destroy_ipq_label(struct label *label) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_destroy_ipq_label\n", + strlen("mac_test_destroy_ipq_label\n")); + MAC_TEST_LOG_DO_SUBMIT; LABEL_DESTROY(label, MAGIC_IPQ); COUNTER_INC(destroy_ipq_label); } @@ -428,7 +507,9 @@ static void mac_test_destroy_mbuf_label(struct label *label) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_destroy_mbuf_label\n", + strlen("mac_test_destroy_mbuf_label\n")); + MAC_TEST_LOG_DO_SUBMIT; /* * If we're loaded dynamically, there may be mbufs in flight that * didn't have label storage allocated for them. Handle this @@ -445,7 +526,9 @@ static void mac_test_destroy_mount_label(struct label *label) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_destroy_mount_label\n", + strlen("mac_test_destroy_mount_label\n")); + MAC_TEST_LOG_DO_SUBMIT; LABEL_DESTROY(label, MAGIC_MOUNT); COUNTER_INC(destroy_mount_label); } @@ -454,7 +537,9 @@ static void mac_test_destroy_socket_label(struct label *label) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_destroy_socket_label\n", + strlen("mac_test_destroy_socket_label\n")); + MAC_TEST_LOG_DO_SUBMIT; LABEL_DESTROY(label, MAGIC_SOCKET); COUNTER_INC(destroy_socket_label); } @@ -463,7 +548,9 @@ static void mac_test_destroy_socket_peer_label(struct label *label) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_destroy_socket_peer_label\n", + strlen("mac_test_destroy_socket_peer_label\n")); + MAC_TEST_LOG_DO_SUBMIT; LABEL_DESTROY(label, MAGIC_SOCKET); COUNTER_INC(destroy_socket_peer_label); } @@ -472,7 +559,9 @@ static void mac_test_destroy_pipe_label(struct label *label) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_destroy_pipe_label\n", + strlen("mac_test_destroy_pipe_label\n")); + MAC_TEST_LOG_DO_SUBMIT; LABEL_DESTROY(label, MAGIC_PIPE); COUNTER_INC(destroy_pipe_label); } @@ -481,7 +570,9 @@ static void mac_test_destroy_posix_sem_label(struct label *label) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_destroy_posix_sem_label\n", + strlen("mac_test_destroy_posix_sem_label\n")); + MAC_TEST_LOG_DO_SUBMIT; LABEL_DESTROY(label, MAGIC_POSIX_SEM); COUNTER_INC(destroy_posix_sem_label); } @@ -490,7 +581,9 @@ static void mac_test_destroy_proc_label(struct label *label) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_destroy_proc_label\n", + strlen("mac_test_destroy_proc_label\n")); + MAC_TEST_LOG_DO_SUBMIT; LABEL_DESTROY(label, MAGIC_PROC); COUNTER_INC(destroy_proc_label); } @@ -499,7 +592,9 @@ static void mac_test_destroy_vnode_label(struct label *label) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_destroy_vnode_label\n", + strlen("mac_test_destroy_vnode_label\n")); + MAC_TEST_LOG_DO_SUBMIT; LABEL_DESTROY(label, MAGIC_VNODE); COUNTER_INC(destroy_vnode_label); } @@ -508,7 +603,9 @@ static void mac_test_copy_cred_label(struct label *src, struct label *dest) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_copy_cred_label with src label:", + strlen("mac_test_copy_cred_label with src label:")); + MAC_TEST_LOG_SUBMIT_LABEL(cred,src); LABEL_CHECK(src, MAGIC_CRED); LABEL_CHECK(dest, MAGIC_CRED); COUNTER_INC(copy_cred_label); @@ -518,7 +615,9 @@ static void mac_test_copy_ifnet_label(struct label *src, struct label *dest) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_copy_ifnet_label with src label:", + strlen("mac_test_copy_ifnet_label with src label:")); + MAC_TEST_LOG_SUBMIT_LABEL(ifnet,src); LABEL_CHECK(src, MAGIC_IFNET); LABEL_CHECK(dest, MAGIC_IFNET); COUNTER_INC(copy_ifnet_label); @@ -528,7 +627,9 @@ static void mac_test_copy_mbuf_label(struct label *src, struct label *dest) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_copy_mbuf_label with src label:", + strlen("mac_test_copy_mbuf_label with src label:")); + MAC_TEST_LOG_SUBMIT_LABEL(vnode,src); LABEL_CHECK(src, MAGIC_MBUF); LABEL_CHECK(dest, MAGIC_MBUF); COUNTER_INC(copy_mbuf_label); @@ -538,7 +639,9 @@ static void mac_test_copy_pipe_label(struct label *src, struct label *dest) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_copy_pipe_label with src label:", + strlen("mac_test_copy_pipe_label with src label:")); + MAC_TEST_LOG_SUBMIT_LABEL(pipe,src); LABEL_CHECK(src, MAGIC_PIPE); LABEL_CHECK(dest, MAGIC_PIPE); COUNTER_INC(copy_pipe_label); @@ -548,7 +651,9 @@ static void mac_test_copy_socket_label(struct label *src, struct label *dest) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_copy_socket_label with src label:", + strlen("mac_test_copy_socket_label with src label:")); + MAC_TEST_LOG_SUBMIT_LABEL(socket,src); LABEL_CHECK(src, MAGIC_SOCKET); LABEL_CHECK(dest, MAGIC_SOCKET); COUNTER_INC(copy_socket_label); @@ -558,7 +663,9 @@ static void mac_test_copy_vnode_label(struct label *src, struct label *dest) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_copy_vnode_label with src label:", + strlen("mac_test_copy_vnode_label with src label:")); + MAC_TEST_LOG_SUBMIT_LABEL(vnode,src); LABEL_CHECK(src, MAGIC_VNODE); LABEL_CHECK(dest, MAGIC_VNODE); COUNTER_INC(copy_vnode_label); @@ -598,19 +705,39 @@ struct devfs_dirent *de, struct label *delabel, struct vnode *vp, struct label *vplabel) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_associate_vnode_devfs " + "with mplabel delabel and vplabel:", + strlen("mac_test_associate_vnode_devfs with mplabel delabel and vplabel:")); + MAC_TEST_LOG_SUBMIT_LABEL3(vnode,mplabel,vnode,delabel,vnode,vplabel); + if (delabel != NULL && SLOT(delabel) == MAGIC_MACTESTLOG) + LABEL_INIT(vplabel, MAGIC_MACTESTLOG); LABEL_CHECK(mplabel, MAGIC_MOUNT); LABEL_CHECK(delabel, MAGIC_DEVFS); LABEL_CHECK(vplabel, MAGIC_VNODE); COUNTER_INC(associate_vnode_devfs); } - +/* + * To avoid recursion on reading /dev/mactest to a tempory file + * we associate the file with "mac_test" mac_test extattr with + * MAGIC_MACTESTLOG label + */ + COUNTER_DECL(associate_vnode_extattr); static int mac_test_associate_vnode_extattr(struct mount *mp, struct label *mplabel, struct vnode *vp, struct label *vplabel) { - + char mac_test[64]; + int error, buflen = 64; + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_associate_vnode_extattr with " + "mplabel and vplabel:", + strlen("mac_test_associate_vnode_extattr with mplabel and vplabel:")); + MAC_TEST_LOG_SUBMIT_LABEL2(vnode,mplabel,vnode,vplabel); + bzero(mac_test,buflen); + error = vn_extattr_get(vp, IO_NODELOCKED, EXTATTR_NAMESPACE_SYSTEM, + "mac_test", &buflen, mac_test, curthread); + if (!error && !strncmp(mac_test,"mac_test", 8)) + LABEL_INIT(vplabel, MAGIC_MACTESTLOG); LABEL_CHECK(mplabel, MAGIC_MOUNT); LABEL_CHECK(vplabel, MAGIC_VNODE); COUNTER_INC(associate_vnode_extattr); @@ -623,7 +750,10 @@ mac_test_associate_vnode_singlelabel(struct mount *mp, struct label *mplabel, struct vnode *vp, struct label *vplabel) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_associate_vnode_singlelabel " + "with mplabel and vplabel:", + strlen("mac_test_associate_vnode_singlelabel with mplabel and vplabel:")); + MAC_TEST_LOG_SUBMIT_LABEL2(vnode,mplabel,vnode,vplabel); LABEL_CHECK(mplabel, MAGIC_MOUNT); LABEL_CHECK(vplabel, MAGIC_VNODE); COUNTER_INC(associate_vnode_singlelabel); @@ -634,9 +764,15 @@ mac_test_create_devfs_device(struct ucred *cred, struct mount *mp, struct cdev *dev, struct devfs_dirent *de, struct label *delabel) { - - if (cred != NULL) + struct label * tmplabel; + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_create_devfs_device with cr_label and delabel:", + strlen("mac_test_create_devfs_device with cr_label and delabel:")); + if (cred != NULL){ LABEL_CHECK(cred->cr_label, MAGIC_CRED); + tmplabel = cred->cr_label; + }else + tmplabel = 0; + MAC_TEST_LOG_SUBMIT_LABEL2(cred, 0, vnode,delabel); LABEL_CHECK(delabel, MAGIC_DEVFS); COUNTER_INC(create_devfs_device); } @@ -646,7 +782,9 @@ mac_test_create_devfs_directory(struct mount *mp, char *dirname, int dirnamelen, struct devfs_dirent *de, struct label *delabel) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_create_devfs_directory with delabel:", + strlen("mac_test_create_devfs_directory with delabel:")); + MAC_TEST_LOG_SUBMIT_LABEL(vnode,delabel); LABEL_CHECK(delabel, MAGIC_DEVFS); COUNTER_INC(create_devfs_directory); } @@ -657,7 +795,10 @@ struct devfs_dirent *dd, struct label *ddlabel, struct devfs_dirent *de, struct label *delabel) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_create_devfs_symlink " + "with cr_label ddlabel and delabel:", + strlen("mac_test_create_devfs_symlink with cr_label ddlabel and delabel:")); + MAC_TEST_LOG_SUBMIT_LABEL3(cred, cred->cr_label, vnode,ddlabel,vnode,delabel); LABEL_CHECK(cred->cr_label, MAGIC_CRED); LABEL_CHECK(ddlabel, MAGIC_DEVFS); LABEL_CHECK(delabel, MAGIC_DEVFS); @@ -670,7 +811,12 @@ struct label *mplabel, struct vnode *dvp, struct label *dvplabel, struct vnode *vp, struct label *vplabel, struct componentname *cnp) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_create_vnode_extattr with " + "cr_label mplabel dvplabel and vplabel:", + strlen("mac_test_create_vnode_extattr with cr_label " + "mplabel dvplabel and vplabel:")); + MAC_TEST_LOG_SUBMIT_LABEL4(cred,cred->cr_label,vnode,mplabel,vnode, + dvplabel,vnode,vplabel); LABEL_CHECK(cred->cr_label, MAGIC_CRED); LABEL_CHECK(mplabel, MAGIC_MOUNT); LABEL_CHECK(dvplabel, MAGIC_VNODE); @@ -684,7 +830,9 @@ mac_test_create_mount(struct ucred *cred, struct mount *mp, struct label *mplabel) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_create_mount with cr_label and mplabel:", + strlen("mac_test_create_mount with cr_label and mplabel:")); + MAC_TEST_LOG_SUBMIT_LABEL2(cred,cred->cr_label,vnode,mplabel); LABEL_CHECK(cred->cr_label, MAGIC_CRED); LABEL_CHECK(mplabel, MAGIC_MOUNT); COUNTER_INC(create_mount); @@ -695,7 +843,9 @@ mac_test_relabel_vnode(struct ucred *cred, struct vnode *vp, struct label *vplabel, struct label *label) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_relabel_vnode with cr_label vplabel and label:", + strlen("mac_test_relabel_vnode with cr_label vplabel and label:")); + MAC_TEST_LOG_SUBMIT_LABEL3(cred,cred->cr_label,vnode,vplabel,vnode,label); LABEL_CHECK(cred->cr_label, MAGIC_CRED); LABEL_CHECK(vplabel, MAGIC_VNODE); LABEL_CHECK(label, MAGIC_VNODE); @@ -707,7 +857,10 @@ mac_test_setlabel_vnode_extattr(struct ucred *cred, struct vnode *vp, struct label *vplabel, struct label *intlabel) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_setlabel_vnode_extattr with " + "cr_label vplabel and intlabel:", + strlen("mac_test_setlabel_vnode_extattr with cr_label vplabel and intlabel:")); + MAC_TEST_LOG_SUBMIT_LABEL3(cred,cred->cr_label,vnode,vplabel,vnode,intlabel); LABEL_CHECK(cred->cr_label, MAGIC_CRED); LABEL_CHECK(vplabel, MAGIC_VNODE); LABEL_CHECK(intlabel, MAGIC_VNODE); @@ -721,7 +874,9 @@ mac_test_update_devfs(struct mount *mp, struct devfs_dirent *devfs_dirent, struct label *direntlabel, struct vnode *vp, struct label *vplabel) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_update_devfs with direntlabel and vplabel:", + strlen("mac_test_update_devfs with direntlabel and vplabel:")); + MAC_TEST_LOG_SUBMIT_LABEL2(vnode,direntlabel,vnode,vplabel); LABEL_CHECK(direntlabel, MAGIC_DEVFS); LABEL_CHECK(vplabel, MAGIC_VNODE); COUNTER_INC(update_devfs); @@ -735,7 +890,10 @@ mac_test_create_mbuf_from_socket(struct socket *so, struct label *socketlabel, struct mbuf *m, struct label *mbuflabel) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_create_mbuf_from_socket" + " with socketlabel and mbuflabel:", + strlen("mac_test_update_devfs with socketlabel and mbuflabel:")); + MAC_TEST_LOG_SUBMIT_LABEL2(socket,socketlabel,vnode,mbuflabel); LABEL_CHECK(socketlabel, MAGIC_SOCKET); LABEL_CHECK(mbuflabel, MAGIC_MBUF); COUNTER_INC(create_mbuf_from_socket); @@ -746,7 +904,9 @@ mac_test_create_socket(struct ucred *cred, struct socket *socket, struct label *socketlabel) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_create_socket with cr_label and socketlabel:", + strlen("mac_test_create_socket with cr_label and socketlabel:")); + MAC_TEST_LOG_SUBMIT_LABEL2(cred,cred->cr_label,socket,socketlabel); LABEL_CHECK(cred->cr_label, MAGIC_CRED); LABEL_CHECK(socketlabel, MAGIC_SOCKET); COUNTER_INC(create_socket); @@ -757,7 +917,9 @@ mac_test_create_pipe(struct ucred *cred, struct pipepair *pp, struct label *pipelabel) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_create_pipe with cr_label and pipelabel:", + strlen("mac_test_create_socket with cr_label and pipelabel:")); + MAC_TEST_LOG_SUBMIT_LABEL2(cred,cred->cr_label,pipe,pipelabel); LABEL_CHECK(cred->cr_label, MAGIC_CRED); LABEL_CHECK(pipelabel, MAGIC_PIPE); COUNTER_INC(create_pipe); @@ -768,7 +930,9 @@ mac_test_create_posix_sem(struct ucred *cred, struct ksem *ksem, struct label *posixlabel) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_create_posix_sem with cr_label and posixlabel:", + strlen("mac_test_create_socket with cr_label and posixlabel:")); + MAC_TEST_LOG_SUBMIT_LABEL2(cred,cred->cr_label,vnode,posixlabel); LABEL_CHECK(cred->cr_label, MAGIC_CRED); LABEL_CHECK(posixlabel, MAGIC_POSIX_SEM); COUNTER_INC(create_posix_sem); @@ -780,7 +944,11 @@ struct label *oldsocketlabel, struct socket *newsocket, struct label *newsocketlabel) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_create_socket_from_socket with " + "oldsocketlabel and newsocketlabel:", + strlen("mac_test_create_socket_from_socket with oldsocketlabel " + "and newsocketlabel:")); + MAC_TEST_LOG_SUBMIT_LABEL2(socket,oldsocketlabel,socket,newsocketlabel); LABEL_CHECK(oldsocketlabel, MAGIC_SOCKET); LABEL_CHECK(newsocketlabel, MAGIC_SOCKET); COUNTER_INC(create_socket_from_socket); @@ -791,7 +959,10 @@ mac_test_relabel_socket(struct ucred *cred, struct socket *socket, struct label *socketlabel, struct label *newlabel) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_relabel_socket with cr_label " + "socketlabel and newlabel:", + strlen("mac_test_relabel_socket with cr_label socketlabel and newlabel:")); + MAC_TEST_LOG_SUBMIT_LABEL3(cred,cred->cr_label,socket,socketlabel,socket,newlabel); LABEL_CHECK(cred->cr_label, MAGIC_CRED); LABEL_CHECK(newlabel, MAGIC_SOCKET); COUNTER_INC(relabel_socket); @@ -802,7 +973,10 @@ mac_test_relabel_pipe(struct ucred *cred, struct pipepair *pp, struct label *pipelabel, struct label *newlabel) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_relabel_pipe with cr_label " + "pipelabel and newlabel:", + strlen("mac_test_relabel_pipe with cr_label pipelabel and newlabel:")); + MAC_TEST_LOG_SUBMIT_LABEL3(cred,cred->cr_label,pipe,pipelabel,pipe,newlabel); LABEL_CHECK(cred->cr_label, MAGIC_CRED); LABEL_CHECK(pipelabel, MAGIC_PIPE); LABEL_CHECK(newlabel, MAGIC_PIPE); @@ -814,7 +988,10 @@ mac_test_set_socket_peer_from_mbuf(struct mbuf *mbuf, struct label *mbuflabel, struct socket *socket, struct label *socketpeerlabel) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_set_socket_peer_from_mbuf with " + "mbuflabel and socketpeerlabel:", + strlen("mac_test_set_socket_peer_from_mbuf with mbuflabel and socketpeerlabel:")); + MAC_TEST_LOG_SUBMIT_LABEL2(vnode,mbuflabel,socket,socketpeerlabel); LABEL_CHECK(mbuflabel, MAGIC_MBUF); LABEL_CHECK(socketpeerlabel, MAGIC_SOCKET); COUNTER_INC(set_socket_peer_from_mbuf); @@ -829,7 +1006,11 @@ struct label *oldsocketlabel, struct socket *newsocket, struct label *newsocketpeerlabel) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_set_socket_peer_from_socket with" + " oldsocketlabel and newsocketpeerlabel:", + strlen("mac_test_set_socket_peer_from_socket with " + "oldsocketlabel and newsocketpeerlabel:")); + MAC_TEST_LOG_SUBMIT_LABEL2(socket,oldsocketlabel,socket,newsocketpeerlabel); LABEL_CHECK(oldsocketlabel, MAGIC_SOCKET); LABEL_CHECK(newsocketpeerlabel, MAGIC_SOCKET); COUNTER_INC(set_socket_peer_from_socket); @@ -840,7 +1021,9 @@ mac_test_create_bpfdesc(struct ucred *cred, struct bpf_d *bpf_d, struct label *bpflabel) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_create_bpfdesc with cr_label and bpflabel:", + strlen("mac_test_create_bpfdesc with cr_label and bpflabel:")); + MAC_TEST_LOG_SUBMIT_LABEL2(cred,cred->cr_label,vnode,bpflabel); LABEL_CHECK(cred->cr_label, MAGIC_CRED); LABEL_CHECK(bpflabel, MAGIC_BPF); COUNTER_INC(create_bpfdesc); @@ -851,7 +1034,10 @@ mac_test_create_datagram_from_ipq(struct ipq *ipq, struct label *ipqlabel, struct mbuf *datagram, struct label *datagramlabel) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_create_datagram_from_ipq " + "with ipqlabel and datagramlabel:", + strlen("mac_test_create_datagram_from_ipq with ipqlabel and datagramlabel:")); + MAC_TEST_LOG_SUBMIT_LABEL2(vnode,ipqlabel,vnode,datagramlabel); LABEL_CHECK(ipqlabel, MAGIC_IPQ); LABEL_CHECK(datagramlabel, MAGIC_MBUF); COUNTER_INC(create_datagram_from_ipq); @@ -862,7 +1048,10 @@ mac_test_create_fragment(struct mbuf *datagram, struct label *datagramlabel, struct mbuf *fragment, struct label *fragmentlabel) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_create_fragment " + "with datagramlabel and fragmentlabel:", + strlen("mac_test_create_fragment with datagramlabel and fragmentlabel:")); + MAC_TEST_LOG_SUBMIT_LABEL2(vnode,datagramlabel,vnode,fragmentlabel); LABEL_CHECK(datagramlabel, MAGIC_MBUF); LABEL_CHECK(fragmentlabel, MAGIC_MBUF); COUNTER_INC(create_fragment); @@ -872,7 +1061,10 @@ static void mac_test_create_ifnet(struct ifnet *ifnet, struct label *ifnetlabel) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_create_ifnet " + "with ifnetlabel:", + strlen("mac_test_create_ifnet with ifnetlabel:")); + MAC_TEST_LOG_SUBMIT_LABEL(ifnet,ifnetlabel); LABEL_CHECK(ifnetlabel, MAGIC_IFNET); COUNTER_INC(create_ifnet); } @@ -882,7 +1074,10 @@ mac_test_create_inpcb_from_socket(struct socket *so, struct label *solabel, struct inpcb *inp, struct label *inplabel) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_create_inpcb_from_socket " + "with solabel and inplabel:", + strlen("mac_test_create_inpcb_from_socket with solabel and inplabel:")); + MAC_TEST_LOG_SUBMIT_LABEL2(socket, solabel, ifnet, inplabel); LABEL_CHECK(solabel, MAGIC_SOCKET); LABEL_CHECK(inplabel, MAGIC_INPCB); COUNTER_INC(create_inpcb_from_socket); @@ -893,7 +1088,10 @@ mac_test_create_sysv_msgmsg(struct ucred *cred, struct msqid_kernel *msqkptr, struct label *msqlabel, struct msg *msgptr, struct label *msglabel) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_create_sysv_msgmsg " + "with cr_label msqlabel and msglabel:", + strlen("mac_test_create_sysv_msgmsg with cr_label msqlabel and msglabel:")); + MAC_TEST_LOG_SUBMIT_LABEL3(cred, cred->cr_label, cred, msqlabel, cred, msglabel); LABEL_CHECK(msglabel, MAGIC_SYSV_MSG); LABEL_CHECK(msqlabel, MAGIC_SYSV_MSQ); COUNTER_INC(create_sysv_msgmsg); @@ -904,7 +1102,10 @@ mac_test_create_sysv_msgqueue(struct ucred *cred, struct msqid_kernel *msqkptr, struct label *msqlabel) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_create_sysv_msgqueue " + "with msqlabel:", + strlen("mac_test_create_sysv_msgqueue with msqlabel:")); + MAC_TEST_LOG_SUBMIT_LABEL(vnode, msqlabel); LABEL_CHECK(msqlabel, MAGIC_SYSV_MSQ); COUNTER_INC(create_sysv_msgqueue); } @@ -914,7 +1115,10 @@ mac_test_create_sysv_sem(struct ucred *cred, struct semid_kernel *semakptr, struct label *semalabel) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_create_sysv_sem " + "with cr_label and semalabel:", + strlen("mac_test_create_sysv_sem with cr_label and semalabel:")); + MAC_TEST_LOG_SUBMIT_LABEL2(cred, cred->cr_label, vnode, semalabel); LABEL_CHECK(semalabel, MAGIC_SYSV_SEM); COUNTER_INC(create_sysv_sem); } @@ -924,7 +1128,10 @@ mac_test_create_sysv_shm(struct ucred *cred, struct shmid_kernel *shmsegptr, struct label *shmlabel) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_create_sysv_shm " + "with cr_label and shmlabel:", + strlen("mac_test_create_sysv_shm with cr_label and shmlabel:")); + MAC_TEST_LOG_SUBMIT_LABEL2(cred, cred->cr_label, vnode, shmlabel); LABEL_CHECK(shmlabel, MAGIC_SYSV_SHM); COUNTER_INC(create_sysv_shm); } @@ -934,7 +1141,10 @@ mac_test_create_ipq(struct mbuf *fragment, struct label *fragmentlabel, struct ipq *ipq, struct label *ipqlabel) { - + MAC_TEST_LOG_SUBMIT_WITHPID("mac_test_create_ipq " + "with fragmentlabel and ipqlabel:", + strlen("mac_test_create_ipq with fragmentlabel and ipqlabel:")); + MAC_TEST_LOG_SUBMIT_LABEL2(vnode, fragmentlabel, vnode, ipqlabel); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jun 25 16:34:38 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A36DC16A468; Mon, 25 Jun 2007 16:34:38 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 790DF16A41F for ; Mon, 25 Jun 2007 16:34:38 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6B8C013C465 for ; Mon, 25 Jun 2007 16:34:38 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5PGYcdb066495 for ; Mon, 25 Jun 2007 16:34:38 GMT (envelope-from lulf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5PGYcYP066492 for perforce@freebsd.org; Mon, 25 Jun 2007 16:34:38 GMT (envelope-from lulf@FreeBSD.org) Date: Mon, 25 Jun 2007 16:34:38 GMT Message-Id: <200706251634.l5PGYcYP066492@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lulf@FreeBSD.org using -f From: Ulf Lilleengen To: Perforce Change Reviews Cc: Subject: PERFORCE change 122284 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Jun 2007 16:34:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=122284 Change 122284 by lulf@lulf_carrot on 2007/06/25 16:33:38 - Add a different flag to be used for rebuild, so we won't confuse different parts of gvinum. Affected files ... .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_init.c#11 edit .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_plex.c#14 edit .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_raid5.c#7 edit .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_var.h#15 edit Differences ... ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_init.c#11 (text+ko) ==== @@ -198,6 +198,7 @@ LIST_FOREACH(p, &v->plexes, in_volume) { if ((p == up) || (p->state == GV_PLEX_UP)) continue; + /* XXX: Should we check if rebuilding too? */ if (p->flags & GV_PLEX_SYNCING) { return (EINPROGRESS); } @@ -222,9 +223,10 @@ /* if (gv_provider_is_open(p->vol_sc->provider)) return (EBUSY);*/ - if (p->flags & GV_PLEX_SYNCING) + if (p->flags & GV_PLEX_SYNCING || + p->flags & GV_PLEX_REBUILDING) return (EINPROGRESS); - p->flags |= GV_PLEX_SYNCING; + p->flags |= GV_PLEX_REBUILDING; p->synced = 0; gv_parity_request(p, GV_BIO_REBUILD, 0); ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_plex.c#14 (text+ko) ==== @@ -65,6 +65,9 @@ addr = bp->bio_data; boff = bp->bio_offset; + if (!(bp->bio_cflags & GV_BIO_REBUILD)) + printf("New BIO!, not rebuild\n"); + /* Walk over the whole length of the request, we might split it up. */ while (bcount > 0) { wp = NULL; @@ -722,7 +725,7 @@ /* We're finished. */ printf("VINUM: rebuild of %s finished\n", p->name); gv_save_config(p->vinumconf); - p->flags &= ~GV_PLEX_SYNCING; + p->flags &= ~GV_PLEX_REBUILDING; p->synced = 0; /* Try to up all subdisks. */ LIST_FOREACH(s, &p->subdisks, in_plex) ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_raid5.c#7 (text+ko) ==== @@ -376,7 +376,7 @@ KASSERT(wp->length >= 0, ("gv_build_raid5_request: wp->length < 0")); - if ((p->flags & GV_PLEX_SYNCING) && (boff + real_len < p->synced)) + if ((p->flags & GV_PLEX_REBUILDING) && (boff + real_len < p->synced)) type = REQ_TYPE_NORMAL; switch (bp->bio_cmd) { ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_var.h#15 (text+ko) ==== @@ -323,6 +323,7 @@ #define GV_PLEX_THREAD_DIE 0x08 /* Signal the RAID5 thread to die. */ #define GV_PLEX_THREAD_DEAD 0x10 /* The RAID5 thread has died. */ #define GV_PLEX_NEWBORN 0x20 /* The plex was just created. */ +#define GV_PLEX_REBUILDING 0x40 /* The plex is rebuilding. */ off_t synced; /* Count of synced bytes. */ From owner-p4-projects@FreeBSD.ORG Mon Jun 25 16:38:44 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2BCDA16A41F; Mon, 25 Jun 2007 16:38:44 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D767516A46E for ; Mon, 25 Jun 2007 16:38:43 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id C9E0913C48C for ; Mon, 25 Jun 2007 16:38:43 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5PGchDn066774 for ; Mon, 25 Jun 2007 16:38:43 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5PGchPv066771 for perforce@freebsd.org; Mon, 25 Jun 2007 16:38:43 GMT (envelope-from rdivacky@FreeBSD.org) Date: Mon, 25 Jun 2007 16:38:43 GMT Message-Id: <200706251638.l5PGchPv066771@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 122285 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Jun 2007 16:38:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=122285 Change 122285 by rdivacky@rdivacky_witten on 2007/06/25 16:38:18 Introduce O_EXEC Affected files ... .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/fcntl.h#6 edit Differences ... ==== //depot/projects/soc2007/rdivacky/linux_at/sys/sys/fcntl.h#6 (text+ko) ==== @@ -73,7 +73,8 @@ #define O_RDONLY 0x0000 /* open for reading only */ #define O_WRONLY 0x0001 /* open for writing only */ #define O_RDWR 0x0002 /* open for reading and writing */ -#define O_ACCMODE 0x0003 /* mask for above modes */ +#define O_EXEC 0x0004 /* open for execute only */ +#define O_ACCMODE 0x0007 /* mask for above modes */ /* * Kernel encoding of open mode; separate read and write bits that are From owner-p4-projects@FreeBSD.ORG Mon Jun 25 16:39:46 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 252B916A46B; Mon, 25 Jun 2007 16:39:46 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0350E16A41F for ; Mon, 25 Jun 2007 16:39:46 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id D19F113C4E7 for ; Mon, 25 Jun 2007 16:39:45 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5PGdjL6066820 for ; Mon, 25 Jun 2007 16:39:45 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5PGdjcM066817 for perforce@freebsd.org; Mon, 25 Jun 2007 16:39:45 GMT (envelope-from rdivacky@FreeBSD.org) Date: Mon, 25 Jun 2007 16:39:45 GMT Message-Id: <200706251639.l5PGdjcM066817@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 122286 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Jun 2007 16:39:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=122286 Change 122286 by rdivacky@rdivacky_witten on 2007/06/25 16:39:04 Fail = 0, not 1. Affected files ... .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#29 edit Differences ... ==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#29 (text+ko) ==== @@ -1010,7 +1010,7 @@ } else { error = copyinstr(path, buf, 1, NULL); if (error) - return 1; /* we want to fail */ + return 0; /* we want to fail */ return (buf[0] == '/'); } } From owner-p4-projects@FreeBSD.ORG Mon Jun 25 16:39:47 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9699D16A534; Mon, 25 Jun 2007 16:39:46 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5A36A16A4E6 for ; Mon, 25 Jun 2007 16:39:46 +0000 (UTC) (envelope-from ivoras@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 48A6A13C4E9 for ; Mon, 25 Jun 2007 16:39:46 +0000 (UTC) (envelope-from ivoras@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5PGdkrU066827 for ; Mon, 25 Jun 2007 16:39:46 GMT (envelope-from ivoras@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5PGdjE6066823 for perforce@freebsd.org; Mon, 25 Jun 2007 16:39:45 GMT (envelope-from ivoras@FreeBSD.org) Date: Mon, 25 Jun 2007 16:39:45 GMT Message-Id: <200706251639.l5PGdjE6066823@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ivoras@FreeBSD.org using -f From: Ivan Voras To: Perforce Change Reviews Cc: Subject: PERFORCE change 122287 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Jun 2007 16:39:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=122287 Change 122287 by ivoras@ivoras_finstall on 2007/06/25 16:39:37 MakeImage can now embed 3rd party packages / ports in the LiveCD, chosen from those installed on the build machine. Among the minor changes, curses interface is now much improved and consistend across the script. Affected files ... .. //depot/projects/soc2007/ivoras_finstall/makeimage/makeimage.py#4 edit .. //depot/projects/soc2007/ivoras_finstall/makeimage/pkglist#1 add .. //depot/projects/soc2007/ivoras_finstall/makeimage/util.py#2 edit Differences ... ==== //depot/projects/soc2007/ivoras_finstall/makeimage/makeimage.py#4 (text+ko) ==== @@ -25,7 +25,7 @@ import os, os.path, sys from time import strftime from getopt import getopt, GetoptError -from util import nukedir, execute, printmsg, cmdout, initutils +from util import nukedir, execute, printmsg, cmdout, readline, initutils, getpkgdeps, getpkgfullname class MakeImageException(Exception): pass @@ -36,9 +36,27 @@ if cmdout("which mkisofs").find("not found") != -1: raise MakeImageException("This utility requires mkisofs(8) (install ports/sysutils/cdrtools)") -def usage(): - print "usage: %s -d WORKDIR [-s SRCDIR] [-k KERNEL] [-b] [-c] [-i ISOFILE]" % sys.argv[0] - sys.exit(1) +def usage(exit=True): + print "usage: %s -d WORKDIR [-i ISOFILE] [-k KERNEL] [-p PKGLISTFILE] [-s SRCDIR] [-b] [-c] " % sys.argv[0] + print + print "Description:" + print " -d WORKDIR Base work directory to hold intermediate and final files" + print " (requires ~800MB free). This is the only required" + print " argument." + print " -k KERNEL FreeBSD kernel to package (default: GENERIC)" + print " -i ISOFILE ISO image to generate (default: WORKDIR/image.iso)" + print " -p PKGLISTFILE File containing list of packages to bundle with the" + print " LiveCD system. All packages from the list must be" + print " installed on the system doing the build." + print " -s SRCDIR Directory with FreeBSD source tree (default: /usr/src)" + print " -b Do buildworld / buildkernel before proceeding" + print " -c Assume installworld / installkernel phase has been" + print " done in WORKDIR/livecd and proceed with configuration" + print " and ISO image build" + if exit: + sys.exit(1) + else: + print WORKDIR = None # Working directory. Will create DESTDIR inside it. DESTDIR = None # The directory that will contain the root drive hierarchy @@ -46,10 +64,11 @@ KERNEL = "GENERIC" DoBuild = False DoMakeRoot = True # Create / install livecd tree -LABEL = "FreeBSD7" +LABEL = "FreeBSD7" # ISO9660 Volume label +PKGLISTFILE = None ISO = None -opts, args = getopt(sys.argv[1:], "d:s:i:bch") +opts, args = getopt(sys.argv[1:], "d:s:i:p:bch") for o,a in opts: if o == "-d": WORKDIR = a @@ -63,6 +82,8 @@ raise MakeImageException("Source directory not found: '%s'" % SRCDIR) elif o == "-k": KERNEL = a + elif o == "-p": + PKGLISTFILE = a elif o == "-b": DoBuild = True elif o == "-c": @@ -73,6 +94,7 @@ usage() if WORKDIR == None: + usage(False) raise MakeImageException("Directory not specified (use '-d WORKDIR' argument)") if not os.path.exists(SRCDIR): raise MakeImageException("Source directory not found: '%s'") @@ -81,22 +103,21 @@ DESTDIR = "%s/livecd" % WORKDIR +initutils() if DoMakeRoot: if os.path.exists(DESTDIR): if not os.path.exists("%s/COPYRIGHT" % DESTDIR): - print "--> %s doesn't look like a FreeBSD root" % DESTDIR - resp = raw_input("Delete it anyway? (y/N) ").upper() + printmsg("%s doesn't look like a FreeBSD root" % DESTDIR) + resp = readline("Delete it anyway? (y/N)").upper() if resp != "Y": - print "Canceling" + printmsg("Canceling") sys.exit(1) else: - print "Wiping out %s" % DESTDIR + printmsg("Wiping out %s" % DESTDIR) nukedir(DESTDIR) os.makedirs(DESTDIR) - initutils() - printmsg("Using '%s' as source directory" % SRCDIR) printmsg("Using '%s' as working directory (root on '%s')" % (WORKDIR, DESTDIR)) printmsg("Using '%s' kernel" % KERNEL) @@ -139,6 +160,38 @@ f.write('syslogd_flags="-C"\n') f.close() +if PKGLISTFILE != None: + # Install packages into the liveCD tree, using chroot + master_pkglist = [] + f = file(PKGLISTFILE, "r") + for line in f.readlines(): + line = line.strip() + if len(line) == 0: + continue + if line[0] == "#": + continue + master_pkglist.append(getpkgfullname(line)) + dest_pkgs = {} + for pkg in master_pkglist: + dest_pkgs[pkg] = True + for p2 in getpkgdeps(pkg): + dest_pkgs[p2] = True + os.chdir("%s/tmp" % DESTDIR) + for pkg in dest_pkgs: + pkg_file = "%s.tbz" % pkg + execute("pkg_create -v -j -b %s %s" % (pkg, pkg_file)) + dest_pkgs[pkg] = pkg_file + f = file("pkginst.sh", "w") + f.write("#!/bin/sh\ncd /tmp\npkg_delete -av\n") + for pkg in master_pkglist: + f.write("/usr/sbin/pkg_add -v %s\n" % dest_pkgs[pkg]) + f.close() + execute("chroot %s /bin/sh /tmp/pkginst.sh" % DESTDIR) + for pkg in dest_pkgs: + os.unlink(dest_pkgs[pkg]) + os.unlink("pkginst.sh") + + os.chdir(WORKDIR) if ISO == None: ISO = "%s/image.iso" % WORKDIR ==== //depot/projects/soc2007/ivoras_finstall/makeimage/util.py#2 (text+ko) ==== @@ -54,12 +54,21 @@ def printmsg(str): global msgwin, cmdwin if msgwin != None: - msgwin.addstr(" ### %s\n" % str) + msgwin.addstr("\n ### %s" % str) msgwin.refresh() else: print " ### %s" % str +def readline(prompt): + global msgwin + if msgwin != None: + msgwin.addstr("\n >>> %s : " % prompt) + return msgwin.getstr() + else: + return raw_input(" >>> %s : " % prompt) + + def execute(cmd): global msgwin, cmdwin printmsg("Executing: \"%s\"" % cmd) @@ -88,3 +97,28 @@ def cmdout(cmd): return os.popen(cmd, "r").read() + +def getpkgdeps(pkg): + f = os.popen("pkg_info -r %s" % pkg, "r") + deps = [] + for line in f.readlines(): + line = line.strip() + if line.startswith("Dependency: "): + d, dep = line.split(": ", 1) + deps.append(dep) + f.close() + return deps + + +def getpkgfullname(pkg): + """Not a very intelligent implementation of "base package name" to + "fully qualified package name" translator. E.g. returns "python24-2.4.4" + when given "python24" + """ + f = os.popen("pkg_info", "r") + for line in f.readlines(): + if line.startswith(pkg): + fullname, etc = line.split(" ", 1) + return fullname.strip() + return None + From owner-p4-projects@FreeBSD.ORG Mon Jun 25 17:48:30 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4C4D416A46D; Mon, 25 Jun 2007 17:48:30 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B28AA16A421 for ; Mon, 25 Jun 2007 17:48:29 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 977A213C45D for ; Mon, 25 Jun 2007 17:48:29 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5PHmTLC084127 for ; Mon, 25 Jun 2007 17:48:29 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5PHmSub084122 for perforce@freebsd.org; Mon, 25 Jun 2007 17:48:28 GMT (envelope-from mjacob@freebsd.org) Date: Mon, 25 Jun 2007 17:48:28 GMT Message-Id: <200706251748.l5PHmSub084122@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 122292 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Jun 2007 17:48:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=122292 Change 122292 by mjacob@mjexp on 2007/06/25 17:47:51 IFC sys dir Affected files ... .. //depot/projects/mjexp/sys/boot/forth/loader.conf#7 integrate .. //depot/projects/mjexp/sys/conf/NOTES#26 integrate .. //depot/projects/mjexp/sys/conf/files#30 integrate .. //depot/projects/mjexp/sys/conf/options#23 integrate .. //depot/projects/mjexp/sys/dev/ata/ata-chipset.c#14 integrate .. //depot/projects/mjexp/sys/dev/ata/ata-pci.h#6 integrate .. //depot/projects/mjexp/sys/dev/ata/ata-usb.c#3 integrate .. //depot/projects/mjexp/sys/dev/ath/if_ath.c#15 integrate .. //depot/projects/mjexp/sys/dev/isp/isp.c#24 integrate .. //depot/projects/mjexp/sys/dev/isp/isp_pci.c#30 integrate .. //depot/projects/mjexp/sys/dev/sym/sym_hipd.c#8 integrate .. //depot/projects/mjexp/sys/dev/usb/if_aue.c#10 integrate .. //depot/projects/mjexp/sys/dev/usb/if_cdce.c#6 integrate .. //depot/projects/mjexp/sys/dev/usb/if_cue.c#6 integrate .. //depot/projects/mjexp/sys/dev/usb/if_kue.c#7 integrate .. //depot/projects/mjexp/sys/dev/usb/if_ural.c#14 integrate .. //depot/projects/mjexp/sys/dev/usb/ubsa.c#10 integrate .. //depot/projects/mjexp/sys/dev/usb/ucom.c#4 integrate .. //depot/projects/mjexp/sys/dev/usb/udbp.c#5 integrate .. //depot/projects/mjexp/sys/dev/usb/uftdi.c#6 integrate .. //depot/projects/mjexp/sys/dev/usb/ukbd.c#8 integrate .. //depot/projects/mjexp/sys/dev/usb/umodem.c#4 integrate .. //depot/projects/mjexp/sys/dev/usb/usbdevs#14 integrate .. //depot/projects/mjexp/sys/dev/usb/uscanner.c#6 integrate .. //depot/projects/mjexp/sys/dev/usb/uvisor.c#5 integrate .. //depot/projects/mjexp/sys/fs/umapfs/umap.h#2 delete .. //depot/projects/mjexp/sys/fs/umapfs/umap_subr.c#3 delete .. //depot/projects/mjexp/sys/fs/umapfs/umap_vfsops.c#4 delete .. //depot/projects/mjexp/sys/fs/umapfs/umap_vnops.c#4 delete .. //depot/projects/mjexp/sys/kern/Make.tags.inc#5 integrate .. //depot/projects/mjexp/sys/kern/Makefile#2 integrate .. //depot/projects/mjexp/sys/modules/acpi/acpi_video/Makefile#2 integrate .. //depot/projects/mjexp/sys/modules/i2c/controllers/alpm/Makefile#2 integrate .. //depot/projects/mjexp/sys/modules/i2c/controllers/viapm/Makefile#2 integrate .. //depot/projects/mjexp/sys/modules/umapfs/Makefile#2 delete .. //depot/projects/mjexp/sys/net/bridgestp.c#8 integrate .. //depot/projects/mjexp/sys/net80211/ieee80211_freebsd.h#6 integrate .. //depot/projects/mjexp/sys/netatm/atm_cm.c#2 integrate .. //depot/projects/mjexp/sys/netatm/ipatm/ipatm_event.c#2 integrate .. //depot/projects/mjexp/sys/netatm/spans/spans_proto.c#2 integrate .. //depot/projects/mjexp/sys/netatm/uni/sscf_uni_lower.c#2 integrate .. //depot/projects/mjexp/sys/netatm/uni/uniarp.c#2 integrate .. //depot/projects/mjexp/sys/netatm/uni/uniarp_timer.c#2 integrate .. //depot/projects/mjexp/sys/netatm/uni/unisig_decode.h#2 integrate .. //depot/projects/mjexp/sys/netatm/uni/unisig_proto.c#2 integrate .. //depot/projects/mjexp/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#4 integrate .. //depot/projects/mjexp/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#4 integrate .. //depot/projects/mjexp/sys/netgraph/ng_parse.c#2 integrate .. //depot/projects/mjexp/sys/netinet/sctp_indata.c#16 integrate .. //depot/projects/mjexp/sys/netinet/sctp_indata.h#6 integrate .. //depot/projects/mjexp/sys/netinet/sctp_input.c#16 integrate .. //depot/projects/mjexp/sys/netinet/sctp_uio.h#16 integrate .. //depot/projects/mjexp/sys/netinet/sctputil.c#17 integrate .. //depot/projects/mjexp/sys/ufs/ffs/ffs_softdep.c#9 integrate .. //depot/projects/mjexp/sys/ufs/ufs/ufs_inode.c#3 integrate .. //depot/projects/mjexp/sys/vm/swap_pager.c#11 integrate Differences ... ==== //depot/projects/mjexp/sys/boot/forth/loader.conf#7 (text+ko) ==== @@ -6,7 +6,7 @@ # # All arguments must be in double quotes. # -# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.120 2007/04/09 22:09:09 pjd Exp $ +# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.121 2007/06/25 05:06:55 rafan Exp $ ############################################################## ### Basic configuration options ############################ @@ -135,7 +135,6 @@ portalfs_load="NO" # Portal filesystem procfs_load="NO" # Process filesystem reiserfs_load="NO" # ReiserFS -#umapfs_load="NO" # User-id map filesystem unionfs_load="NO" # Union filesystem xfs_load="NO" # XFS zfs_load="NO" # ZFS ==== //depot/projects/mjexp/sys/conf/NOTES#26 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1434 2007/06/16 04:57:03 alc Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1436 2007/06/25 05:06:55 rafan Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -938,10 +938,12 @@ # currently be demand-loaded.) Some people still prefer to statically # compile other filesystems as well. # -# NB: The NULL, PORTAL, UMAP and UNION filesystems are known to be -# buggy, and WILL panic your system if you attempt to do anything with -# them. They are included here as an incentive for some enterprising -# soul to sit down and fix them. +# NB: The PORTAL filesystem is known to be buggy, and WILL panic your +# system if you attempt to do anything with it. It is included here +# as an incentive for some enterprising soul to sit down and fix it. +# The UNION filesystem was known to be buggy in the past. It is now +# being actively maintained, although there are still some issues being +# resolved. # # One of these is mandatory: @@ -964,8 +966,6 @@ options PSEUDOFS_TRACE #Debugging support for PSEUDOFS options SMBFS #SMB/CIFS filesystem options UDF #Universal Disk Format -# Broken (seriously (functionally) broken): -#options UMAPFS #UID map filesystem options UNIONFS #Union filesystem # The xFS_ROOT options REQUIRE the associated ``options xFS'' options NFS_ROOT #NFS usable as root device ==== //depot/projects/mjexp/sys/conf/files#30 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1222 2007/06/16 04:57:04 alc Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1223 2007/06/25 05:06:55 rafan Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1199,9 +1199,6 @@ fs/udf/udf_iconv.c optional udf_iconv fs/udf/udf_vfsops.c optional udf fs/udf/udf_vnops.c optional udf -fs/umapfs/umap_subr.c optional umapfs -fs/umapfs/umap_vfsops.c optional umapfs -fs/umapfs/umap_vnops.c optional umapfs fs/unionfs/union_subr.c optional unionfs fs/unionfs/union_vfsops.c optional unionfs fs/unionfs/union_vnops.c optional unionfs ==== //depot/projects/mjexp/sys/conf/options#23 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.596 2007/06/16 04:57:04 alc Exp $ +# $FreeBSD: src/sys/conf/options,v 1.597 2007/06/25 05:06:55 rafan Exp $ # # On the handling of kernel options # @@ -198,7 +198,6 @@ SMBFS opt_dontuse.h TMPFS opt_dontuse.h UDF opt_dontuse.h -UMAPFS opt_dontuse.h UNIONFS opt_dontuse.h # Pseudofs debugging ==== //depot/projects/mjexp/sys/dev/ata/ata-chipset.c#14 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.197 2007/06/13 17:44:49 bms Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.198 2007/06/25 08:21:21 sos Exp $"); #include "opt_ata.h" #include @@ -2890,6 +2890,10 @@ { ATA_NFORCE_MCP55, 0, AMDNVIDIA, NVIDIA, ATA_UDMA6, "nForce MCP55" }, { ATA_NFORCE_MCP55_S1, 0, 0, NV4|NVQ, ATA_SA300, "nForce MCP55" }, { ATA_NFORCE_MCP55_S2, 0, 0, NV4|NVQ, ATA_SA300, "nForce MCP55" }, + { ATA_NFORCE_MCP61, 0, AMDNVIDIA, NVIDIA, ATA_UDMA6, "nForce MCP61" }, + { ATA_NFORCE_MCP61_S1, 0, 0, NV4|NVQ, ATA_SA300, "nForce MCP61" }, + { ATA_NFORCE_MCP61_S2, 0, 0, NV4|NVQ, ATA_SA300, "nForce MCP61" }, + { ATA_NFORCE_MCP61_S3, 0, 0, NV4|NVQ, ATA_SA300, "nForce MCP61" }, { 0, 0, 0, 0, 0, 0}} ; char buffer[64] ; ==== //depot/projects/mjexp/sys/dev/ata/ata-pci.h#6 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ata/ata-pci.h,v 1.76 2007/03/09 22:23:39 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-pci.h,v 1.77 2007/06/25 08:21:21 sos Exp $ */ /* structure holding chipset config info */ @@ -222,6 +222,10 @@ #define ATA_NFORCE_MCP55 0x036e10de #define ATA_NFORCE_MCP55_S1 0x037e10de #define ATA_NFORCE_MCP55_S2 0x037f10de +#define ATA_NFORCE_MCP61 0x03ec10de +#define ATA_NFORCE_MCP61_S1 0x03e710de +#define ATA_NFORCE_MCP61_S2 0x03f610de +#define ATA_NFORCE_MCP61_S3 0x03f710de #define ATA_PROMISE_ID 0x105a #define ATA_PDC20246 0x4d33105a ==== //depot/projects/mjexp/sys/dev/ata/ata-usb.c#3 (text) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-usb.c,v 1.6 2007/02/21 19:07:18 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-usb.c,v 1.7 2007/06/23 21:52:05 imp Exp $"); #include "opt_ata.h" #include @@ -45,6 +45,7 @@ #include #include #include +#include #include #include #include ==== //depot/projects/mjexp/sys/dev/ath/if_ath.c#15 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.171 2007/06/11 03:36:49 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.172 2007/06/24 01:57:20 sam Exp $"); /* * Driver for the Atheros Wireless LAN controller. @@ -4798,8 +4798,10 @@ bf->bf_node = NULL; if (ni != NULL) { /* - * Reclaim node reference. + * Do any callback and reclaim the node reference. */ + if (bf->bf_m->m_flags & M_TXCB) + ieee80211_process_callback(ni, bf->bf_m, -1); ieee80211_free_node(ni); } m_freem(bf->bf_m); ==== //depot/projects/mjexp/sys/dev/isp/isp.c#24 (text+ko) ==== @@ -46,7 +46,7 @@ #endif #ifdef __FreeBSD__ #include -__FBSDID("$FreeBSD: src/sys/dev/isp/isp.c,v 1.146 2007/05/05 20:17:22 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/isp/isp.c,v 1.147 2007/06/24 01:41:16 mjacob Exp $"); #include #endif #ifdef __OpenBSD__ ==== //depot/projects/mjexp/sys/dev/isp/isp_pci.c#30 (text+ko) ==== @@ -28,7 +28,7 @@ * FreeBSD Version. */ #include -__FBSDID("$FreeBSD: src/sys/dev/isp/isp_pci.c,v 1.145 2007/06/11 17:56:17 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/isp/isp_pci.c,v 1.146 2007/06/25 17:21:16 mjacob Exp $"); #include #include ==== //depot/projects/mjexp/sys/dev/sym/sym_hipd.c#8 (text+ko) ==== @@ -56,7 +56,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/sym/sym_hipd.c,v 1.65 2007/06/17 05:55:52 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/sym/sym_hipd.c,v 1.66 2007/06/23 00:02:19 mjacob Exp $"); #define SYM_DRIVER_NAME "sym-1.6.5-20000902" @@ -202,7 +202,7 @@ } #define sym_que_entry(ptr, type, member) \ - ((type *)((char *)(ptr)-(unsigned int)(&((type *)0)->member))) + ((type *)((char *)(ptr)-(size_t)(&((type *)0)->member))) #define sym_insque(new, pos) __sym_que_add(new, pos, (pos)->flink) ==== //depot/projects/mjexp/sys/dev/usb/if_aue.c#10 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/if_aue.c,v 1.114 2007/06/21 17:55:28 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/if_aue.c,v 1.117 2007/06/23 05:59:53 imp Exp $"); /* * ADMtek AN986 Pegasus and AN8511 Pegasus II USB to ethernet driver. @@ -142,6 +142,10 @@ {{ USB_VENDOR_ADMTEK, USB_PRODUCT_ADMTEK_PEGASUSII}, PII }, {{ USB_VENDOR_ADMTEK, USB_PRODUCT_ADMTEK_PEGASUSII_2}, PII }, {{ USB_VENDOR_ADMTEK, USB_PRODUCT_ADMTEK_PEGASUSII_3}, PII }, + {{ USB_VENDOR_ADMTEK, USB_PRODUCT_ADMTEK_PEGASUSII_4}, PII }, + {{ USB_VENDOR_AEI, USB_PRODUCT_AEI_FASTETHERNET}, PII }, + {{ USB_VENDOR_ALLIEDTELESYN, USB_PRODUCT_ALLIEDTELESYN_ATUSB100}, PII }, + {{ USB_VENDOR_ATEN, USB_PRODUCT_ATEN_UC110T}, PII }, {{ USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_USB2LAN}, PII }, {{ USB_VENDOR_BILLIONTON, USB_PRODUCT_BILLIONTON_USB100}, 0 }, {{ USB_VENDOR_BILLIONTON, USB_PRODUCT_BILLIONTON_USBLP100}, PNA }, @@ -156,12 +160,15 @@ {{ USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650TX3}, LSYS|PII }, {{ USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650TX2}, LSYS|PII }, {{ USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650}, LSYS }, + {{ USB_VENDOR_ELCON, USB_PRODUCT_ELCON_PLAN}, PNA|PII }, + {{ USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSB20}, PII }, {{ USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSBTX0}, 0 }, {{ USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSBTX1}, LSYS }, {{ USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSBTX2}, 0 }, {{ USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSBTX3}, LSYS }, {{ USB_VENDOR_ELECOM, USB_PRODUCT_ELECOM_LDUSBLTX}, PII }, {{ USB_VENDOR_ELSA, USB_PRODUCT_ELSA_USB2ETHERNET}, 0 }, + {{ USB_VENDOR_GIGABYTE, USB_PRODUCT_GIGABYTE_GNBR402W}, 0 }, {{ USB_VENDOR_HAWKING, USB_PRODUCT_HAWKING_UF100}, PII }, {{ USB_VENDOR_HP, USB_PRODUCT_HP_HN210E}, PII }, {{ USB_VENDOR_IODATA, USB_PRODUCT_IODATA_USBETTX}, 0 }, @@ -173,16 +180,18 @@ {{ USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB100H1}, LSYS|PNA }, {{ USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB10TA}, LSYS }, {{ USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB10TX2}, LSYS|PII }, - {{ USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_MN110}, PII }, {{ USB_VENDOR_MELCO, USB_PRODUCT_MELCO_LUATX1}, 0 }, {{ USB_VENDOR_MELCO, USB_PRODUCT_MELCO_LUATX5}, 0 }, {{ USB_VENDOR_MELCO, USB_PRODUCT_MELCO_LUA2TX5}, PII }, + {{ USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_MN110}, PII }, {{ USB_VENDOR_NETGEAR, USB_PRODUCT_NETGEAR_FA101}, PII }, {{ USB_VENDOR_SIEMENS, USB_PRODUCT_SIEMENS_SPEEDSTREAM}, PII }, + {{ USB_VENDOR_SIIG2, USB_PRODUCT_SIIG2_USBTOETHER}, PII }, {{ USB_VENDOR_SMARTBRIDGES, USB_PRODUCT_SMARTBRIDGES_SMARTNIC},PII }, {{ USB_VENDOR_SMC, USB_PRODUCT_SMC_2202USB}, 0 }, {{ USB_VENDOR_SMC, USB_PRODUCT_SMC_2206USB}, PII }, {{ USB_VENDOR_SOHOWARE, USB_PRODUCT_SOHOWARE_NUB100}, 0 }, + {{ USB_VENDOR_SOHOWARE, USB_PRODUCT_SOHOWARE_NUB110}, PII }, }; #define aue_lookup(v, p) ((const struct aue_type *)usb_lookup(aue_devs, v, p)) ==== //depot/projects/mjexp/sys/dev/usb/if_cdce.c#6 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/if_cdce.c,v 1.23 2007/06/17 18:46:25 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/if_cdce.c,v 1.24 2007/06/23 06:47:43 imp Exp $"); #include #include @@ -113,15 +113,19 @@ static void cdce_ifmedia_sts(struct ifnet *ifp, struct ifmediareq *ifmr); static const struct cdce_type cdce_devs[] = { + {{ USB_VENDOR_ACERLABS, USB_PRODUCT_ACERLABS_M5632 }, CDCE_NO_UNION }, + {{ USB_VENDOR_AMBIT, USB_PRODUCT_AMBIT_NTL_250 }, CDCE_NO_UNION }, + {{ USB_VENDOR_COMPAQ, USB_PRODUCT_COMPAQ_IPAQLINUX }, CDCE_NO_UNION }, + {{ USB_VENDOR_GMATE, USB_PRODUCT_GMATE_YP3X00 }, CDCE_NO_UNION }, + {{ USB_VENDOR_MOTOROLA2, USB_PRODUCT_MOTOROLA2_USBLAN }, CDCE_ZAURUS | CDCE_NO_UNION }, + {{ USB_VENDOR_MOTOROLA2, USB_PRODUCT_MOTOROLA2_USBLAN2 }, CDCE_ZAURUS | CDCE_NO_UNION }, + {{ USB_VENDOR_NETCHIP, USB_PRODUCT_NETCHIP_ETHERNETGADGET }, CDCE_NO_UNION }, {{ USB_VENDOR_PROLIFIC, USB_PRODUCT_PROLIFIC_PL2501 }, CDCE_NO_UNION }, {{ USB_VENDOR_SHARP, USB_PRODUCT_SHARP_SL5500 }, CDCE_ZAURUS }, + {{ USB_VENDOR_SHARP, USB_PRODUCT_SHARP_SL5600 }, CDCE_ZAURUS | CDCE_NO_UNION }, {{ USB_VENDOR_SHARP, USB_PRODUCT_SHARP_SLA300 }, CDCE_ZAURUS | CDCE_NO_UNION }, - {{ USB_VENDOR_SHARP, USB_PRODUCT_SHARP_SL5600 }, CDCE_ZAURUS | CDCE_NO_UNION }, {{ USB_VENDOR_SHARP, USB_PRODUCT_SHARP_SLC700 }, CDCE_ZAURUS | CDCE_NO_UNION }, {{ USB_VENDOR_SHARP, USB_PRODUCT_SHARP_SLC750 }, CDCE_ZAURUS | CDCE_NO_UNION }, - {{ USB_VENDOR_GMATE, USB_PRODUCT_GMATE_YP3X00 }, CDCE_NO_UNION }, - {{ USB_VENDOR_NETCHIP, USB_PRODUCT_NETCHIP_ETHERNETGADGET }, CDCE_NO_UNION }, - {{ USB_VENDOR_COMPAQ, USB_PRODUCT_COMPAQ_IPAQLINUX }, CDCE_NO_UNION }, }; #define cdce_lookup(v, p) ((const struct cdce_type *)usb_lookup(cdce_devs, v, p)) ==== //depot/projects/mjexp/sys/dev/usb/if_cue.c#6 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/if_cue.c,v 1.71 2007/06/18 22:25:45 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/if_cue.c,v 1.72 2007/06/23 06:29:19 imp Exp $"); /* * CATC USB-EL1210A USB to ethernet driver. Used in the CATC Netmate @@ -87,6 +87,7 @@ { USB_VENDOR_CATC, USB_PRODUCT_CATC_NETMATE }, { USB_VENDOR_CATC, USB_PRODUCT_CATC_NETMATE2 }, { USB_VENDOR_SMARTBRIDGES, USB_PRODUCT_SMARTBRIDGES_SMARTLINK }, + /* Belkin F5U111 adapter covered by NETMATE entry */ { 0, 0 } }; ==== //depot/projects/mjexp/sys/dev/usb/if_kue.c#7 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/if_kue.c,v 1.81 2007/06/18 22:25:45 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/if_kue.c,v 1.82 2007/06/23 06:47:43 imp Exp $"); /* * Kawasaki LSI KL5KUSB101B USB to ethernet adapter driver. @@ -103,25 +103,40 @@ * Various supported device vendors/products. */ static struct kue_type kue_devs[] = { + { USB_VENDOR_3COM, USB_PRODUCT_3COM_3C19250 }, + { USB_VENDOR_3COM, USB_PRODUCT_3COM_3C460 }, + { USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_URE450 }, + { USB_VENDOR_ADS, USB_PRODUCT_ADS_UBS10BT }, + { USB_VENDOR_ADS, USB_PRODUCT_ADS_UBS10BTX }, { USB_VENDOR_AOX, USB_PRODUCT_AOX_USB101 }, - { USB_VENDOR_KLSI, USB_PRODUCT_AOX_USB101 }, - { USB_VENDOR_ADS, USB_PRODUCT_ADS_UBS10BT }, + { USB_VENDOR_ASANTE, USB_PRODUCT_ASANTE_EA }, { USB_VENDOR_ATEN, USB_PRODUCT_ATEN_UC10T }, - { USB_VENDOR_NETGEAR, USB_PRODUCT_NETGEAR_EA101 }, - { USB_VENDOR_PERACOM, USB_PRODUCT_PERACOM_ENET }, - { USB_VENDOR_PERACOM, USB_PRODUCT_PERACOM_ENET2 }, - { USB_VENDOR_ENTREGA, USB_PRODUCT_ENTREGA_E45 }, - { USB_VENDOR_3COM, USB_PRODUCT_3COM_3C19250 }, + { USB_VENDOR_ATEN, USB_PRODUCT_ATEN_DSB650C }, { USB_VENDOR_COREGA, USB_PRODUCT_COREGA_ETHER_USB_T }, { USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DSB650C }, - { USB_VENDOR_SMC, USB_PRODUCT_SMC_2102USB }, - { USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB10T }, + { USB_VENDOR_ENTREGA, USB_PRODUCT_ENTREGA_E45 }, + { USB_VENDOR_ENTREGA, USB_PRODUCT_ENTREGA_XX1 }, + { USB_VENDOR_ENTREGA, USB_PRODUCT_ENTREGA_XX2 }, + { USB_VENDOR_IODATA, USB_PRODUCT_IODATA_USBETT }, + { USB_VENDOR_JATON, USB_PRODUCT_JATON_EDA }, + { USB_VENDOR_KINGSTON, USB_PRODUCT_KINGSTON_XX1 }, + { USB_VENDOR_KLSI, USB_PRODUCT_AOX_USB101 }, { USB_VENDOR_KLSI, USB_PRODUCT_KLSI_DUH3E10BT }, { USB_VENDOR_KLSI, USB_PRODUCT_KLSI_DUH3E10BTN }, + { USB_VENDOR_LINKSYS, USB_PRODUCT_LINKSYS_USB10T }, + { USB_VENDOR_MOBILITY, USB_PRODUCT_MOBILITY_EA }, + { USB_VENDOR_NETGEAR, USB_PRODUCT_NETGEAR_EA101 }, + { USB_VENDOR_NETGEAR, USB_PRODUCT_NETGEAR_EA101X }, + { USB_VENDOR_PERACOM, USB_PRODUCT_PERACOM_ENET }, + { USB_VENDOR_PERACOM, USB_PRODUCT_PERACOM_ENET2 }, { USB_VENDOR_PERACOM, USB_PRODUCT_PERACOM_ENET3 }, - { USB_VENDOR_IODATA, USB_PRODUCT_IODATA_USBETT }, - { USB_VENDOR_ABOCOM, USB_PRODUCT_ABOCOM_URE450 }, + { USB_VENDOR_PORTGEAR, USB_PRODUCT_PORTGEAR_EA8 }, + { USB_VENDOR_PORTGEAR, USB_PRODUCT_PORTGEAR_EA9 }, + { USB_VENDOR_PORTSMITH, USB_PRODUCT_PORTSMITH_EEA }, + { USB_VENDOR_SHARK, USB_PRODUCT_SHARK_PA }, + { USB_VENDOR_SILICOM, USB_PRODUCT_SILICOM_U2E }, { USB_VENDOR_SILICOM, USB_PRODUCT_SILICOM_GPE }, + { USB_VENDOR_SMC, USB_PRODUCT_SMC_2102USB }, { 0, 0 } }; ==== //depot/projects/mjexp/sys/dev/usb/if_ural.c#14 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb/if_ural.c,v 1.63 2007/06/21 14:42:33 imp Exp $ */ +/* $FreeBSD: src/sys/dev/usb/if_ural.c,v 1.64 2007/06/23 06:52:56 imp Exp $ */ /*- * Copyright (c) 2005, 2006 @@ -18,7 +18,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/if_ural.c,v 1.63 2007/06/21 14:42:33 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/if_ural.c,v 1.64 2007/06/23 06:52:56 imp Exp $"); /*- * Ralink Technology RT2500USB chipset driver @@ -106,6 +106,7 @@ { USB_VENDOR_SIEMENS3, USB_PRODUCT_SIEMENS3_WL54G }, { USB_VENDOR_SMC, USB_PRODUCT_SMC_2862WG }, { USB_VENDOR_SPAIRON, USB_PRODUCT_SPAIRON_WL54G }, + { USB_VENDOR_SURECOM, USB_PRODUCT_SURECOM_RT2570 }, { USB_VENDOR_VTECH, USB_PRODUCT_VTECH_RT2570 }, { USB_VENDOR_ZINWELL, USB_PRODUCT_ZINWELL_RT2570 } }; ==== //depot/projects/mjexp/sys/dev/usb/ubsa.c#10 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/ubsa.c,v 1.31 2007/06/20 05:10:52 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/ubsa.c,v 1.32 2007/06/22 05:56:05 imp Exp $"); /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. * All rights reserved. @@ -230,6 +230,8 @@ { USB_VENDOR_OPTION, USB_PRODUCT_OPTION_GT3G }, /* Option GlobeTrotter 3G QUAD */ { USB_VENDOR_OPTION, USB_PRODUCT_OPTION_GT3GQUAD }, + /* Option GlobeTrotter 3G+ */ + { USB_VENDOR_OPTION, USB_PRODUCT_OPTION_GT3GPLUS }, /* Huawei Mobile */ { USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_MOBILE }, { 0, 0 } ==== //depot/projects/mjexp/sys/dev/usb/ucom.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/ucom.c,v 1.63 2007/06/20 05:10:52 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/ucom.c,v 1.64 2007/06/25 06:40:20 imp Exp $"); /*- * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc. @@ -532,6 +532,16 @@ if (sc->sc_dying) return; + /* + * If there's no sc_oxfer, then ucomclose has removed it. The buffer + * has just been flushed in the ttyflush() in ttyclose(). ttyflush() + * then calls tt_stop(). ucomstop calls ucomstart, so the right thing + * to do here is just abort if sc_oxfer is NULL, as everything else + * is cleaned up elsewhere. + */ + if (sc->sc_oxfer == NULL) + return; + s = spltty(); if (tp->t_state & TS_TBLOCK) { ==== //depot/projects/mjexp/sys/dev/usb/udbp.c#5 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/udbp.c,v 1.39 2007/06/21 14:42:33 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/udbp.c,v 1.40 2007/06/22 05:14:27 imp Exp $"); /* Driver for arbitrary double bulk pipe devices. * The driver assumes that there will be the same driver on the other side. @@ -254,16 +254,20 @@ */ if ((uaa->vendor == USB_VENDOR_NETCHIP && uaa->product == USB_PRODUCT_NETCHIP_TURBOCONNECT)) - return(UMATCH_VENDOR_PRODUCT); + return (UMATCH_VENDOR_PRODUCT); if ((uaa->vendor == USB_VENDOR_PROLIFIC && (uaa->product == USB_PRODUCT_PROLIFIC_PL2301 || uaa->product == USB_PRODUCT_PROLIFIC_PL2302))) - return(UMATCH_VENDOR_PRODUCT); + return (UMATCH_VENDOR_PRODUCT); if ((uaa->vendor == USB_VENDOR_ANCHOR && uaa->product == USB_PRODUCT_ANCHOR_EZLINK)) - return(UMATCH_VENDOR_PRODUCT); + return (UMATCH_VENDOR_PRODUCT); + + if ((uaa->vendor == USB_VENDOR_GENESYS && + uaa->product == USB_PRODUCT_GENESYS_GL620USB)) + return (UMATCH_VENDOR_PRODUCT); return (UMATCH_NONE); } ==== //depot/projects/mjexp/sys/dev/usb/uftdi.c#6 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/uftdi.c,v 1.35 2007/06/20 05:10:53 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/uftdi.c,v 1.37 2007/06/22 05:53:05 imp Exp $"); /* * FTDI FT8U100AX serial adapter driver @@ -156,11 +156,15 @@ uaa->product == USB_PRODUCT_FTDI_CFA_632 || uaa->product == USB_PRODUCT_FTDI_CFA_633 || uaa->product == USB_PRODUCT_FTDI_CFA_634 || + uaa->product == USB_PRODUCT_FTDI_CFA_635 || uaa->product == USB_PRODUCT_FTDI_USBSERIAL || uaa->product == USB_PRODUCT_FTDI_MX2_3 || uaa->product == USB_PRODUCT_FTDI_MX4_5 || uaa->product == USB_PRODUCT_FTDI_LK202 || uaa->product == USB_PRODUCT_FTDI_LK204 || + uaa->product == USB_PRODUCT_FTDI_TACTRIX_OPENPORT_13M || + uaa->product == USB_PRODUCT_FTDI_TACTRIX_OPENPORT_13S || + uaa->product == USB_PRODUCT_FTDI_TACTRIX_OPENPORT_13U || uaa->product == USB_PRODUCT_FTDI_EISCOU || uaa->product == USB_PRODUCT_FTDI_UOPTBR || uaa->product == USB_PRODUCT_FTDI_EMCU2D || @@ -237,11 +241,15 @@ case USB_PRODUCT_FTDI_CFA_632: case USB_PRODUCT_FTDI_CFA_633: case USB_PRODUCT_FTDI_CFA_634: + case USB_PRODUCT_FTDI_CFA_635: case USB_PRODUCT_FTDI_USBSERIAL: case USB_PRODUCT_FTDI_MX2_3: case USB_PRODUCT_FTDI_MX4_5: case USB_PRODUCT_FTDI_LK202: case USB_PRODUCT_FTDI_LK204: + case USB_PRODUCT_FTDI_TACTRIX_OPENPORT_13M: + case USB_PRODUCT_FTDI_TACTRIX_OPENPORT_13S: + case USB_PRODUCT_FTDI_TACTRIX_OPENPORT_13U: case USB_PRODUCT_FTDI_EISCOU: case USB_PRODUCT_FTDI_UOPTBR: case USB_PRODUCT_FTDI_EMCU2D: ==== //depot/projects/mjexp/sys/dev/usb/ukbd.c#8 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/ukbd.c,v 1.70 2007/06/21 14:42:34 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/ukbd.c,v 1.71 2007/06/23 04:20:24 imp Exp $"); /* * HID spec: http://www.usb.org/developers/devclass_docs/HID1_11.pdf @@ -145,7 +145,7 @@ static devclass_t ukbd_devclass; MODULE_DEPEND(ukbd, usb, 1, 1, 1); -DRIVER_MODULE(ukbd, uhub, ukbd_driver, ukbd_devclass, usbd_driver_load, 0); +DRIVER_MODULE(ukbd, uhub, ukbd_driver, ukbd_devclass, ukbd_driver_load, 0); static int ukbd_match(device_t self) ==== //depot/projects/mjexp/sys/dev/usb/umodem.c#4 (text+ko) ==== @@ -2,7 +2,7 @@ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/umodem.c,v 1.68 2007/06/21 14:42:34 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/umodem.c,v 1.69 2007/06/23 04:18:44 imp Exp $"); /*- * Copyright (c) 2003, M. Warner Losh . * All rights reserved. @@ -292,8 +292,8 @@ sc->sc_udev = dev; sc->sc_ctl_iface = uaa->iface; + id = usbd_get_interface_descriptor(sc->sc_ctl_iface); sc->sc_ctl_iface_no = id->bInterfaceNumber; - id = usbd_get_interface_descriptor(sc->sc_ctl_iface); device_printf(self, "iclass %d/%d", id->bInterfaceClass, id->bInterfaceSubClass); ==== //depot/projects/mjexp/sys/dev/usb/usbdevs#14 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/dev/usb/usbdevs,v 1.298 2007/06/21 20:13:07 imp Exp $ +$FreeBSD: src/sys/dev/usb/usbdevs,v 1.309 2007/06/23 06:52:56 imp Exp $ /* $NetBSD: usbdevs,v 1.392 2004/12/29 08:38:44 imp Exp $ */ /*- @@ -187,7 +187,7 @@ vendor ALTEC 0x04d2 Altec Lansing vendor LSI 0x04d4 LSI vendor MENTORGRAPHICS 0x04d6 Mentor Graphics -vendor ITUNERNET 0x04d8 I-Tuner Networks +vendor ITUNERNET 0x04d8 I-Tuner Networks vendor HOLTEK 0x04d9 Holtek vendor PANASONIC 0x04da Panasonic (Matsushita) vendor HUANHSIN 0x04dc Huan Hsin @@ -426,6 +426,7 @@ vendor TRUMPION 0x090a Trumpion vendor ALATION 0x0910 Alation vendor CONCORDCAMERA 0x0919 Concord Camera +vendor GARMIN 0x091e Garmin vendor GOHUBS 0x0921 GoHubs vendor XEROX 0x0924 Xerox vendor BIOMETRIC 0x0929 American Biometric @@ -477,6 +478,7 @@ vendor ASIX 0x0b95 ASIX vendor O2MICRO 0x0b97 O2 Micro, Inc. vendor USR 0x0baf U.S. Robotics +vendor AMBIT 0x0bb2 Ambit Microsystems vendor REALTEK 0x0bda RealTek vendor ADDONICS2 0x0bf6 Addonics vendor AGATE 0x0c08 Agate @@ -493,8 +495,10 @@ vendor ABC 0x0d8c ABC vendor CONCEPTRONIC 0x0d8e Conceptronic vendor MSI 0x0db0 Micro Star International +vendor ELCON 0x0db7 ELCON Systemtechnik vendor SITECOMEU 0x0df6 Sitecom Europe vendor HAWKING 0x0e66 Hawking +vendor FOSSIL 0x0e67 Fossil, Inc vendor GMATE 0x0e7e G.Mate, Inc vendor OTI 0x0ea0 Ours vendor PILOTECH 0x0eaf Pilotech @@ -558,6 +562,7 @@ vendor HIROSE 0x2631 Hirose vendor NHJ 0x2770 NHJ vendor PLANEX 0x2c02 Planex +vendor AEI 0x3334 AEI vendor VIDZMEDIA 0x3275 VidzMedia vendor AEI 0x3334 AEI vendor PQI 0x3538 PQI @@ -622,11 +627,15 @@ /* Aceeca products */ product ACEECA MEZ1000 0x0001 Aceeca Mez1000 RDA +/* Acer Labs products */ +product ACERLABS M5632 0x5632 USB 2.0 Data Link + /* Acer Peripherals, Inc. products */ product ACERP ACERSCAN_C310U 0x12a6 Acerscan C310U product ACERP ACERSCAN_320U 0x2022 Acerscan 320U product ACERP ACERSCAN_640U 0x2040 Acerscan 640U product ACERP ACERSCAN_620U 0x2060 Acerscan 620U +product ACERP ACERSCAN_4300U 0x20b0 Benq 3300U/4300U product ACERP ACERSCAN_640BT 0x20be Acerscan 640BT product ACERP ACERSCAN_1240U 0x20c0 Acerscan 1240U product ACERP AWL300 0x9000 AWL300 Wireless adapter @@ -640,6 +649,7 @@ product ACTIONTEC UAT1 0x7605 UAT1 Wireless Ethernet /* ADMtek products */ +product ADMTEK PEGASUSII_4 0x07c2 AN986AEthernet product ADMTEK PEGASUS 0x0986 AN986 Ethernet product ADMTEK PEGASUSII 0x8511 AN8511 Ethernet product ADMTEK PEGASUSII_2 0x8513 AN8513 Ethernet @@ -654,7 +664,11 @@ /* ADS products */ product ADS UBS10BT 0x0008 UBS-10BT Ethernet +product ADS UBS10BTX 0x0009 UBS-10BT Ethernet +/* AEI products */ +product AEI FASTETHERNET 0x1701 Fast Ethernet + /* Agate Technologies products */ product AGATE QDRIVE 0x0378 Q-Drive @@ -688,8 +702,12 @@ product ALTEC ADA70 0x0070 ADA70 Speakers product ALTEC ASC495 0xff05 ASC495 Speakers -/* American Power Conversion products */ -product APC UPS 0x0002 Uninterruptible Power Supply +/* Allied Telesyn International products */ +product ALLIEDTELESYN ATUSB100 0xb100 AT-USB100 + +/* Ambit Microsystems products */ +product AMBIT WLAN 0x0302 WLAN +product AMBIT NTL_250 0x6098 NTL 250 cable modem /* AMIT products */ product AMIT CGWLUSB2GO 0x0002 CG-WLUSB2GO @@ -704,6 +722,9 @@ /* AOX, Inc. products */ product AOX USB101 0x0008 Ethernet +/* American Power Conversion products */ +product APC UPS 0x0002 Uninterruptible Power Supply + /* Apple Computer products */ product APPLE OPTMOUSE 0x0302 Optical mouse product APPLE SPEAKERS 0x1101 Speakers @@ -725,8 +746,11 @@ product ASAHIOPTICAL OPTIO230 0x0004 Digital camera product ASAHIOPTICAL OPTIO330 0x0006 Digital camera +/* Asante products */ +product ASANTE EA 0x1427 Ethernet + /* ASIX Electronics products */ -product ASIX AX88172 0x1720 10/100 ethernet +product ASIX AX88172 0x1720 10/100 ethernet /* ASUS products */ product ASUS WL167G 0x1707 WL-167g wireless adapter @@ -736,7 +760,10 @@ /* ATen products */ product ATEN UC1284 0x2001 Parallel printer product ATEN UC10T 0x2002 10Mbps ethernet +product ATEN UC110T 0x2007 UC-110T Ethernet product ATEN UC232A 0x2008 Serial +product ATEN UC210T 0x2000 UC-210T Ethernet +product ATEN DSB650C 0x4000 DSB-650C /* Atheros Communications products */ product ATHEROS AR5523 0x0001 AR5523 @@ -850,13 +877,6 @@ /* Creative products */ product CREATIVE NOMAD_II 0x1002 Nomad II MP3 player -/* Crystalfontz products */ -product FTDI CFA_631 0xfc0c Crystalfontz CFA-631 USB LCD -product FTDI CFA_632 0xfc08 Crystalfontz CFA-632 USB LCD -product FTDI CFA_633 0xfc0b Crystalfontz CFA-633 USB LCD -product FTDI CFA_634 0xfc09 Crystalfontz CFA-634 USB LCD -product FTDI SEMC_DSS20 0xfc82 SEMC DSS-20 SyncStation - /* Cambridge Silicon Radio Ltd. products */ product CSR BT_DONGLE 0x0001 Bluetooth USB dongle product CSR CSRDFU 0xffff USB Bluetooth Device in DFU State @@ -939,12 +959,16 @@ product EIZO HUB 0x0000 hub product EIZO MONITOR 0x0001 monitor +/* ELCON Systemtechnik products */ +product ELCON PLAN 0x0002 Goldpfeil P-LAN + /* Elecom products */ product ELECOM MOUSE29UO 0x0002 mouse 29UO product ELECOM LDUSBTX0 0x200c LD-USB/TX product ELECOM LDUSBTX1 0x4002 LD-USB/TX product ELECOM LDUSBLTX 0x4005 LD-USBL/TX product ELECOM LDUSBTX2 0x400b LD-USB/TX +product ELECOM LDUSB20 0x4010 LD-USB20 product ELECOM UCSGT 0x5003 UC-SGT product ELECOM UCSGT0 0x5004 UC-SGT product ELECOM LDUSBTX3 0xabc1 LD-USB/TX @@ -963,10 +987,12 @@ product ENTREGA 4S 0x0004 4S serial product ENTREGA E45 0x0005 E45 Ethernet product ENTREGA CENTRONICS 0x0006 Parallel Port +product ENTREGA XX1 0x0008 Ethernet product ENTREGA 1S9 0x0093 1S9 serial product ENTREGA EZUSB 0x8000 EZ-USB /*product ENTREGA SERIAL 0x8001 DB25 Serial*/ product ENTREGA 2U4S 0x8004 2U4S serial/usb hub +product ENTREGA XX2 0x8005 Ethernet /*product ENTREGA SERIAL_DB9 0x8093 DB9 Serial*/ /* Epson products */ @@ -990,12 +1016,12 @@ product EPSON 1660 0x011e Perfection 1660 scanner product EPSON 1670 0x011f Perfection 1670 scanner product EPSON 1270 0x0120 Perfection 1270 scanner -product EPSON 2480 0x0121 Perfection 2480 scanner +product EPSON 2480 0x0121 Perfection 2480 scanner product EPSON 3590 0x0122 Perfection 3590 scanner product EPSON 4990 0x012a Perfection 4990 Photo scanner product EPSON 3500 0x080e CX-3500/3600/3650 MFP product EPSON RX425 0x080f Stylus Photo RX425 scanner -product EPSON 4200 0x0820 CX4200 MP scanner +product EPSON 4200 0x0820 CX4200 MP scanner /* e-TEK Labs products */ product ETEK 1COM 0x8007 Serial @@ -1003,21 +1029,9 @@ /* Extended Systems products */ product EXTENDED XTNDACCESS 0x0100 XTNDAccess IrDA -/* GoHubs products */ -product GOHUBS GOCOM232 0x1001 GoCOM232 Serial +/* Fossil, Inc products */ +product FOSSIL WRISTPDA 0x0002 Wrist PDA -/* Good Way Technology products */ -product GOODWAY RT2573 0xc019 RT2573 - -/* Gravis products */ -product GRAVIS GAMEPADPRO 0x4001 GamePad Pro - -/* GREENHOUSE products */ -product GREENHOUSE KANA21 0x0001 CF-writer with MP3 - -/* Griffin Technology */ -product GRIFFIN IMATE 0x0405 iMate, ADB adapter - /* Freecom products */ product FREECOM DVD 0xfc01 DVD drive @@ -1026,11 +1040,25 @@ product FTDI SERIAL_8U232AM 0x6001 8U232AM Serial product FTDI SERIAL_2232C 0x6010 FT2232C Dual port Serial /* Gude Analog- und Digitalsysteme products also uses FTDI's id: */ +product FTDI TACTRIX_OPENPORT_13M 0xcc48 OpenPort 1.3 Mitsubishi +product FTDI TACTRIX_OPENPORT_13S 0xcc49 OpenPort 1.3 Subaru +product FTDI TACTRIX_OPENPORT_13U 0xcc4a OpenPort 1.3 Universal product FTDI EISCOU 0xe888 "Expert ISDN Control USB" product FTDI UOPTBR 0xe889 "USB-RS232 OptoBridge" product FTDI EMCU2D 0xe88a "Expert mouseCLOCK USB II" product FTDI PCMSFU 0xe88b "Precision Clock MSF USB" product FTDI EMCU2H 0xe88c "Expert mouseCLOCK USB II HBG" +product FTDI USBSERIAL 0xfa00 Matrix Orbital USB Serial +product FTDI MX2_3 0xfa01 Matrix Orbital MX2 or MX3 +product FTDI MX4_5 0xfa02 Matrix Orbital MX4 or MX5 +product FTDI LK202 0xfa03 Matrix Orbital VK/LK202 Family +product FTDI LK204 0xfa04 Matrix Orbital VK/LK204 Family +product FTDI CFA_632 0xfc08 Crystalfontz CFA-632 USB LCD +product FTDI CFA_634 0xfc09 Crystalfontz CFA-634 USB LCD +product FTDI CFA_633 0xfc0b Crystalfontz CFA-633 USB LCD +product FTDI CFA_631 0xfc0c Crystalfontz CFA-631 USB LCD +product FTDI CFA_635 0xfc0d Crystalfontz CFA-635 USB LCD +product FTDI SEMC_DSS20 0xfc82 SEMC DSS-20 SyncStation /* Fuji photo products */ product FUJIPHOTO MASS0100 0x0100 Mass Storage @@ -1038,10 +1066,14 @@ /* Fujitsu protducts */ product FUJITSU AH_F401U 0x105b AH-F401U Air H device +/* Garmin products */ +product GARMIN IQUE_3600 0x0004 iQue 3600 + /* General Instruments (Motorola) products */ product GENERALINSTMNTS SB5100 0x5100 SURFboard SB5100 Cable modem /* Genesys Logic products */ +product GENESYS GL620USB 0x0501 GL620USB Host-Host interface product GENESYS GL650 0x0604 GL650 Hub product GENESYS GL641USB 0x0700 GL641USB CompactFlash Card Reader product GENESYS GL641USB2IDE_2 0x0701 GL641USB USB-IDE Bridge No 2 @@ -1073,6 +1105,21 @@ /* G.Mate, Inc products */ product GMATE YP3X00 0x1001 YP3X00 PDA +/* GoHubs products */ +product GOHUBS GOCOM232 0x1001 GoCOM232 Serial + +/* Good Way Technology products */ +product GOODWAY RT2573 0xc019 RT2573 + +/* Gravis products */ +product GRAVIS GAMEPADPRO 0x4001 GamePad Pro + +/* GREENHOUSE products */ +product GREENHOUSE KANA21 0x0001 CF-writer with MP3 + +/* Griffin Technology */ +product GRIFFIN IMATE 0x0405 iMate, ADB adapter + /* Guillemot Corporation */ product GUILLEMOT DALEADER 0xa300 DA Leader product GUILLEMOT HWGUSB254 0xe000 HWGUSB2-54 WLAN @@ -1131,7 +1178,7 @@ product HP 2200C 0x0605 ScanJet 2200C product HP 5300C 0x0701 Scanjet 5300C product HP 4400C 0x0705 Scanjet 4400C -product HP 82x0C 0x0b01 Scanjet 82x0C +product HP 82x0C 0x0b01 Scanjet 82x0C product HP 2300D 0x0b17 Laserjet 2300d product HP 970CSE 0x1004 Deskjet 970Cse product HP 5400C 0x1005 Scanjet 5400C @@ -1192,6 +1239,9 @@ /* Ituner networks products */ product ITUNERNET USBLCD2X20 0x0002 USB-LCD 2x20 +/* Jaton products */ +product JATON EDA 0x5704 Ethernet + /* JVC products */ product JVC GR_DX95 0x000a GR-DX95 product JVC MP_PRX1 0x3008 MP-PRX1 Ethernet @@ -1199,19 +1249,12 @@ /* JRC products */ product JRC AH_J3001V_J3002V 0x0001 AirH PHONE AH-J3001V/J3002V -/* Kawasaki products */ -product KLSI DUH3E10BT 0x0008 USB ethernet -product KLSI DUH3E10BTN 0x0009 USB ethernet - /* Kawatsu products */ product KAWATSU MH4000P 0x0003 MiniHub 4000P /* Keisokugiken Corp. products */ product KEISOKUGIKEN USBDAQ 0x0068 HKS-0200 USBDAQ -/* Kawasaki products */ -product KLSI DUH3E10BT 0x0008 DU-H3E 10BT Ethernet - /* Kensington products */ product KENSINGTON ORBIT 0x1003 Orbit USB/PS2 trackball product KENSINGTON TURBOBALL 0x1005 TurboBall @@ -1247,8 +1290,13 @@ product KEYSPAN UIA11 0x0202 UIA-11 remote control /* Kingston products */ +product KINGSTON XX1 0x0008 Ethernet product KINGSTON KNU101TX 0x000a KNU101TX USB Ethernet +/* Kawasaki products */ +product KLSI DUH3E10BT 0x0008 USB ethernet >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Jun 25 19:02:03 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B6CFF16A46C; Mon, 25 Jun 2007 19:02:03 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6455F16A469 for ; Mon, 25 Jun 2007 19:02:03 +0000 (UTC) (envelope-from ivoras@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 543ED13C46C for ; Mon, 25 Jun 2007 19:02:03 +0000 (UTC) (envelope-from ivoras@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5PJ23eq091220 for ; Mon, 25 Jun 2007 19:02:03 GMT (envelope-from ivoras@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5PJ23QI091217 for perforce@freebsd.org; Mon, 25 Jun 2007 19:02:03 GMT (envelope-from ivoras@FreeBSD.org) Date: Mon, 25 Jun 2007 19:02:03 GMT Message-Id: <200706251902.l5PJ23QI091217@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ivoras@FreeBSD.org using -f From: Ivan Voras To: Perforce Change Reviews Cc: Subject: PERFORCE change 122294 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Jun 2007 19:02:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=122294 Change 122294 by ivoras@ivoras_finstall on 2007/06/25 19:01:07 Replaced "regular" /tmp mounting from fstab with custom script which mounts unionfs over parts of file system that need to be writable. Affected files ... .. //depot/projects/soc2007/ivoras_finstall/makeimage/makeimage.py#5 edit .. //depot/projects/soc2007/ivoras_finstall/makeimage/util.py#3 edit Differences ... ==== //depot/projects/soc2007/ivoras_finstall/makeimage/makeimage.py#5 (text+ko) ==== @@ -83,7 +83,7 @@ elif o == "-k": KERNEL = a elif o == "-p": - PKGLISTFILE = a + PKGLISTFILE = os.path.realpath(a) elif o == "-b": DoBuild = True elif o == "-c": @@ -147,8 +147,8 @@ f = file("%s/etc/fstab" % DESTDIR, "w+") f.write("# /etc/fstab generated by finstall makeimage.py on %s\n" % str_time) f.write("/dev/iso9660/%s / cd9660 ro 0 0\n" % LABEL) -f.write("md /tmp mfs rw,-S,-s32m 0 0\n") -f.write("/tmp /etc unionfs rw,copymode=transparent 0 0\n") +#f.write("md /tmp mfs rw,-S,-s32m 0 0\n") +#f.write("/tmp /etc unionfs rw,copymode=transparent 0 0\n") f.close() # Edit rc.conf @@ -185,12 +185,26 @@ f.write("#!/bin/sh\ncd /tmp\npkg_delete -av\n") for pkg in master_pkglist: f.write("/usr/sbin/pkg_add -v %s\n" % dest_pkgs[pkg]) + printmsg("LiveCD will contain package: %s" % pkg) f.close() execute("chroot %s /bin/sh /tmp/pkginst.sh" % DESTDIR) for pkg in dest_pkgs: os.unlink(dest_pkgs[pkg]) os.unlink("pkginst.sh") +f = file("%s/etc/rc.d/livecd" % DESTDIR, "w") +f.write("# /etc/rc.d/livecd generated by finstall makeimage.py on %s\n" % str_time) +f.write("# BEFORE: hostid\n") +f.write("# REQUIRE: root\n") +f.write("# KEYWORD: nojail\n\n") +f.write("/sbin/mount_mfs -s 32m -S md /tmp\n") +f.write("/bin/mkdir /tmp/etc /tmp/log /tmp/run /tmp/tmp\n") +f.write("/sbin/mount_unionfs -o copymode=transparent /tmp/etc /etc\n") +f.write("/sbin/mount_unionfs -o copymode=transparent /tmp/log /var/log\n") +f.write("/sbin/mount_unionfs -o copymode=transparent /tmp/run /var/run\n") +f.write("/sbin/mount_unionfs -o copymode=transparent /tmp/tmp /var/tmp\n") +f.close() +execute("chmod a+x %s/etc/rc.d/livecd" % DESTDIR) os.chdir(WORKDIR) if ISO == None: ==== //depot/projects/soc2007/ivoras_finstall/makeimage/util.py#3 (text+ko) ==== @@ -37,7 +37,7 @@ basewin.idlok(True) basewin.idcok(True) basewin.erase() - basewin.addstr(5, 0, '-'*mx) + basewin.hline(5, 0, curses.ACS_HLINE, mx) basewin.refresh() msgwin = curses.newwin(5,mx,0,0) cmdwin = curses.newwin(my-6,mx,6,0) From owner-p4-projects@FreeBSD.ORG Mon Jun 25 19:13:18 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 65E2116A468; Mon, 25 Jun 2007 19:13:18 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0C18A16A400 for ; Mon, 25 Jun 2007 19:13:18 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id EFFDE13C46E for ; Mon, 25 Jun 2007 19:13:17 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5PJDHBE093322 for ; Mon, 25 Jun 2007 19:13:17 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5PJDHgd093319 for perforce@freebsd.org; Mon, 25 Jun 2007 19:13:17 GMT (envelope-from rdivacky@FreeBSD.org) Date: Mon, 25 Jun 2007 19:13:17 GMT Message-Id: <200706251913.l5PJDHgd093319@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 122296 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Jun 2007 19:13:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=122296 Change 122296 by rdivacky@rdivacky_witten on 2007/06/25 19:13:14 Temporary disable the definition of O_EXEC, it breaks the kernel REAL badly ;( Affected files ... .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/fcntl.h#7 edit Differences ... ==== //depot/projects/soc2007/rdivacky/linux_at/sys/sys/fcntl.h#7 (text+ko) ==== @@ -73,8 +73,11 @@ #define O_RDONLY 0x0000 /* open for reading only */ #define O_WRONLY 0x0001 /* open for writing only */ #define O_RDWR 0x0002 /* open for reading and writing */ +#define O_ACCMODE 0x0003 /* mask for above modes */ +#if 0 #define O_EXEC 0x0004 /* open for execute only */ #define O_ACCMODE 0x0007 /* mask for above modes */ +#endif /* * Kernel encoding of open mode; separate read and write bits that are From owner-p4-projects@FreeBSD.ORG Tue Jun 26 06:47:05 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 29EE416A4C6; Tue, 26 Jun 2007 06:47:05 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E024916A49E for ; Tue, 26 Jun 2007 06:47:04 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 8FF6D13C43E for ; Tue, 26 Jun 2007 06:47:04 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5Q6l4ri090466 for ; Tue, 26 Jun 2007 06:47:04 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5Q6l4ft090455 for perforce@freebsd.org; Tue, 26 Jun 2007 06:47:04 GMT (envelope-from gabor@freebsd.org) Date: Tue, 26 Jun 2007 06:47:04 GMT Message-Id: <200706260647.l5Q6l4ft090455@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 122323 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Jun 2007 06:47:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=122323 Change 122323 by gabor@gabor_server on 2007/06/26 06:46:17 Add DESTDIR_ENV_LIST to allow overriding variables from outside. Only those variables are passed to the chrooted make, which are listed in DESTDIR_ENV_LIST. The reason behind this is to avoid passing something accidentally from the host environment. Let's suppose you have set PREFIX=/opt in the host environment. With a constant variable list, the destination environment would inherit this, as well. Affected files ... .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.destdir.mk#2 edit Differences ... ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.destdir.mk#2 (text+ko) ==== @@ -11,6 +11,20 @@ DESTDIR_Include_MAINTAINER= portmgr@FreeBSD.org +# Place variable names into DESTDIR_ENV_LIST, which you want to override in +# the DESTDIR environment from outside. E.g.: +# +# make DESTDIR=/foo/bar PREFIX=/opt DESTDIR_ENV_LIST=PREFIX +# + +DESTDIR_ENV_LIST?= + +DESTDIR_ENV= DESTDIR= CHROOTED=YES + +.for _var in ${DESTDIR_ENV_LIST} +DESTDIR_ENV+= ${_var}="${${_var}}" +.endfor + .for _target in ${.TARGETS} ${_target}: pre-chroot do-chroot post-chroot @${TRUE} @@ -39,7 +53,7 @@ ${MOUNT} -t devfs devfs ${DESTDIR}/dev .endif ${ECHO_CMD} "===> Starting chrooted make in ${DESTDIR}..."; \ - ${CHROOT} ${DESTDIR} ${SH} -c "(cd ${.CURDIR}; ${MAKE} DESTDIR= CHROOTED=YES ${.TARGETS})" + ${CHROOT} ${DESTDIR} ${SH} -c "(cd ${.CURDIR}; ${MAKE} ${DESTDIR_ENV} ${.TARGETS})" .endif .if !target(post-chroot) From owner-p4-projects@FreeBSD.ORG Tue Jun 26 07:00:22 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9216416A478; Tue, 26 Jun 2007 07:00:22 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4AAA116A41F for ; Tue, 26 Jun 2007 07:00:22 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id B493313C4C9 for ; Tue, 26 Jun 2007 07:00:21 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5Q70LoL091504 for ; Tue, 26 Jun 2007 07:00:21 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5Q70L3p091499 for perforce@freebsd.org; Tue, 26 Jun 2007 07:00:21 GMT (envelope-from gabor@freebsd.org) Date: Tue, 26 Jun 2007 07:00:21 GMT Message-Id: <200706260700.l5Q70L3p091499@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 122324 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Jun 2007 07:00:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=122324 Change 122324 by gabor@gabor_server on 2007/06/26 06:59:20 - Add UMOUNT here, we will need it Affected files ... .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.commands.mk#3 edit Differences ... ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.commands.mk#3 (text+ko) ==== @@ -56,6 +56,7 @@ TEST?= test # Shell builtin TR?= LANG=C /usr/bin/tr TRUE?= true # Shell builtin +UMOUNT?= /sbin/umount UNAME?= /usr/bin/uname UNZIP_CMD?= ${LOCALBASE}/bin/unzip WHICH?= /usr/bin/which From owner-p4-projects@FreeBSD.ORG Tue Jun 26 07:04:28 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 737FE16A421; Tue, 26 Jun 2007 07:04:28 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3544316A400 for ; Tue, 26 Jun 2007 07:04:28 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 252B513C43E for ; Tue, 26 Jun 2007 07:04:28 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5Q74Sr5093242 for ; Tue, 26 Jun 2007 07:04:28 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5Q74RBK093239 for perforce@freebsd.org; Tue, 26 Jun 2007 07:04:27 GMT (envelope-from gabor@freebsd.org) Date: Tue, 26 Jun 2007 07:04:27 GMT Message-Id: <200706260704.l5Q74RBK093239@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 122325 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Jun 2007 07:04:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=122325 Change 122325 by gabor@gabor_server on 2007/06/26 07:03:29 Use safe mounting of PORTSDIR with mktemp(1). We need to this to avoid odd cases, where the destination environment already has a different version of ports tree somehow. Thus it is not enough to check the existence of the ports tree. E.g. if we want to install foobar-1.0, we don't want to have foobar-0.9 in the destination due to an outdated leftover ports tree. Affected files ... .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.destdir.mk#3 edit Differences ... ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.destdir.mk#3 (text+ko) ==== @@ -19,7 +19,7 @@ DESTDIR_ENV_LIST?= -DESTDIR_ENV= DESTDIR= CHROOTED=YES +DESTDIR_ENV= DESTDIR= CHROOTED=YES PORTSDIR=${PORTSDIR_TMP_REL} .for _var in ${DESTDIR_ENV_LIST} DESTDIR_ENV+= ${_var}="${${_var}}" @@ -36,24 +36,21 @@ .endif .if !target(do-chroot) + +PORTSDIR_TMP!= ${MKTEMP} -d ${DESTDIR}/tmp/portsdir.XXXXXX +PORTSDIR_TMP_REL= ${PORTSDIR_TMP:S,^${DESTDIR},,} +BUILDDIR= ${.CURDIR:S,^${PORTSDIR},,:S,^,${PORTSDIR_TMP_REL},} + do-chroot: - ${MKDIR} ${DESTDIR}${PORTSDIR} -# found=0; \ -# for i in `${MOUNT} | ${AWK} {'print $$3'}` ; do \ -# if [ `${REALPATH} ${DESTDIR}${PORTSDIR}` == `${REALPATH} $${i}` ]; then \ -# found=1; \ -# fi ; \ -# done ; \ -# if [ $${found} != 1 ]; then \ -# ${ECHO_CMD} "===> Nullmounting ${PORTSDIR} into ${DESTDIR}..."; \ -# ${MOUNT} -t nullfs ${PORTSDIR} ${DESTDIR}${PORTSDIR}; \ -# fi + ${ECHO_CMD} "===> Nullmounting ports tree into ${DESTDIR}..."; \ + ${MOUNT} -t nullfs ${PORTSDIR} ${DESTDIR}${PORTSDIR_TMP_REL} .if !exists (${DESTDIR}/dev/null) ${ECHO_CMD} "===> Mounting devfs into ${DESTDIR}..."; \ ${MOUNT} -t devfs devfs ${DESTDIR}/dev .endif ${ECHO_CMD} "===> Starting chrooted make in ${DESTDIR}..."; \ - ${CHROOT} ${DESTDIR} ${SH} -c "(cd ${.CURDIR}; ${MAKE} ${DESTDIR_ENV} ${.TARGETS})" + ${CHROOT} ${DESTDIR} ${SH} -c "(cd ${BUILDDIR}; ${MAKE} ${DESTDIR_ENV} ${.TARGETS})"; \ + ${UMOUNT} ${DESTDIR}${PORTSDIR_TMP_REL} .endif .if !target(post-chroot) From owner-p4-projects@FreeBSD.ORG Tue Jun 26 07:07:33 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DBBA316A46B; Tue, 26 Jun 2007 07:07:32 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9D6E316A400 for ; Tue, 26 Jun 2007 07:07:32 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 8D73D13C43E for ; Tue, 26 Jun 2007 07:07:32 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5Q77WpU093488 for ; Tue, 26 Jun 2007 07:07:32 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5Q77WsX093485 for perforce@freebsd.org; Tue, 26 Jun 2007 07:07:32 GMT (envelope-from gabor@freebsd.org) Date: Tue, 26 Jun 2007 07:07:32 GMT Message-Id: <200706260707.l5Q77WsX093485@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 122326 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Jun 2007 07:07:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=122326 Change 122326 by gabor@gabor_server on 2007/06/26 07:07:15 Cosmetics: introduce MOUNT_DEVFS and MOUNT_NULLFS. Affected files ... .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.commands.mk#4 edit .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.destdir.mk#4 edit Differences ... ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.commands.mk#4 (text+ko) ==== @@ -36,6 +36,8 @@ MKDIR?= /bin/mkdir -p MKTEMP?= /usr/bin/mktemp MOUNT?= /sbin/mount +MOUNT_DEVFS?= ${MOUNT} -t devfs devfs +MOUNT_NULLFS?= ${MOUNT} -t nullfs MV?= /bin/mv OBJCOPY?= /usr/bin/objcopy OBJDUMP?= /usr/bin/objdump ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.destdir.mk#4 (text+ko) ==== @@ -43,10 +43,10 @@ do-chroot: ${ECHO_CMD} "===> Nullmounting ports tree into ${DESTDIR}..."; \ - ${MOUNT} -t nullfs ${PORTSDIR} ${DESTDIR}${PORTSDIR_TMP_REL} + ${MOUNT_NULLFS} ${PORTSDIR} ${DESTDIR}${PORTSDIR_TMP_REL} .if !exists (${DESTDIR}/dev/null) ${ECHO_CMD} "===> Mounting devfs into ${DESTDIR}..."; \ - ${MOUNT} -t devfs devfs ${DESTDIR}/dev + ${MOUNT_DEVFS} ${DESTDIR}/dev .endif ${ECHO_CMD} "===> Starting chrooted make in ${DESTDIR}..."; \ ${CHROOT} ${DESTDIR} ${SH} -c "(cd ${BUILDDIR}; ${MAKE} ${DESTDIR_ENV} ${.TARGETS})"; \ From owner-p4-projects@FreeBSD.ORG Tue Jun 26 07:25:00 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 004DE16A469; Tue, 26 Jun 2007 07:24:59 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id CE3A416A400 for ; Tue, 26 Jun 2007 07:24:56 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id BE5E113C483 for ; Tue, 26 Jun 2007 07:24:56 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5Q7OuKM094967 for ; Tue, 26 Jun 2007 07:24:56 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5Q7OuhW094964 for perforce@freebsd.org; Tue, 26 Jun 2007 07:24:56 GMT (envelope-from gabor@freebsd.org) Date: Tue, 26 Jun 2007 07:24:56 GMT Message-Id: <200706260724.l5Q7OuhW094964@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 122328 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Jun 2007 07:25:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=122328 Change 122328 by gabor@gabor_server on 2007/06/26 07:24:39 - Use more proper checking for devfs mount, the previous version was weird and did not work well at all Affected files ... .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.destdir.mk#5 edit Differences ... ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.destdir.mk#5 (text+ko) ==== @@ -43,11 +43,17 @@ do-chroot: ${ECHO_CMD} "===> Nullmounting ports tree into ${DESTDIR}..."; \ - ${MOUNT_NULLFS} ${PORTSDIR} ${DESTDIR}${PORTSDIR_TMP_REL} -.if !exists (${DESTDIR}/dev/null) - ${ECHO_CMD} "===> Mounting devfs into ${DESTDIR}..."; \ - ${MOUNT_DEVFS} ${DESTDIR}/dev -.endif + ${MOUNT_NULLFS} ${PORTSDIR} ${DESTDIR}${PORTSDIR_TMP_REL}; \ + found=0; \ + for _entry in `${MOUNT} | ${GREP} devfs | ${AWK} {'print $$3'}`; do \ + if [ $${_entry} = ${DESTDIR}/dev ]; then \ + found=1; \ + fi; \ + done; \ + if [ $${found} = 0 ]; then \ + ${ECHO_CMD} "===> Mounting devfs into ${DESTDIR}..."; \ + ${MOUNT_DEVFS} ${DESTDIR}/dev; \ + fi; \ ${ECHO_CMD} "===> Starting chrooted make in ${DESTDIR}..."; \ ${CHROOT} ${DESTDIR} ${SH} -c "(cd ${BUILDDIR}; ${MAKE} ${DESTDIR_ENV} ${.TARGETS})"; \ ${UMOUNT} ${DESTDIR}${PORTSDIR_TMP_REL} From owner-p4-projects@FreeBSD.ORG Tue Jun 26 07:28:02 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AAEED16A468; Tue, 26 Jun 2007 07:28:02 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8602216A41F for ; Tue, 26 Jun 2007 07:28:02 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 5E85013C465 for ; Tue, 26 Jun 2007 07:28:02 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5Q7S2lE095252 for ; Tue, 26 Jun 2007 07:28:02 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5Q7S2Qp095247 for perforce@freebsd.org; Tue, 26 Jun 2007 07:28:02 GMT (envelope-from gabor@freebsd.org) Date: Tue, 26 Jun 2007 07:28:02 GMT Message-Id: <200706260728.l5Q7S2Qp095247@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 122329 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Jun 2007 07:28:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=122329 Change 122329 by gabor@gabor_server on 2007/06/26 07:27:23 - Do not allow to set DESTDIR again in the chrooted universe Affected files ... .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.destdir.mk#6 edit Differences ... ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.destdir.mk#6 (text+ko) ==== @@ -21,7 +21,7 @@ DESTDIR_ENV= DESTDIR= CHROOTED=YES PORTSDIR=${PORTSDIR_TMP_REL} -.for _var in ${DESTDIR_ENV_LIST} +.for _var in ${DESTDIR_ENV_LIST:NDESTDIR} DESTDIR_ENV+= ${_var}="${${_var}}" .endfor From owner-p4-projects@FreeBSD.ORG Tue Jun 26 07:33:10 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DECF616A468; Tue, 26 Jun 2007 07:33:09 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8BFCC16A421 for ; Tue, 26 Jun 2007 07:33:09 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 7C76C13C46C for ; Tue, 26 Jun 2007 07:33:09 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5Q7X9YN095871 for ; Tue, 26 Jun 2007 07:33:09 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5Q7X9K9095868 for perforce@freebsd.org; Tue, 26 Jun 2007 07:33:09 GMT (envelope-from gabor@freebsd.org) Date: Tue, 26 Jun 2007 07:33:09 GMT Message-Id: <200706260733.l5Q7X9K9095868@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 122330 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Jun 2007 07:33:10 -0000 http://perforce.freebsd.org/chv.cgi?CH=122330 Change 122330 by gabor@gabor_server on 2007/06/26 07:32:42 - Set environment properly with setenv(1). [1] - We have to add -i there so that setenv(1) only set the explicitly specified variables, otherwise DESTDIR would be set again in the chrooted process. Pointed out by: sat [1] Affected files ... .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.destdir.mk#7 edit Differences ... ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.destdir.mk#7 (text+ko) ==== @@ -55,7 +55,7 @@ ${MOUNT_DEVFS} ${DESTDIR}/dev; \ fi; \ ${ECHO_CMD} "===> Starting chrooted make in ${DESTDIR}..."; \ - ${CHROOT} ${DESTDIR} ${SH} -c "(cd ${BUILDDIR}; ${MAKE} ${DESTDIR_ENV} ${.TARGETS})"; \ + ${CHROOT} ${DESTDIR} ${SH} -c "(cd ${BUILDDIR}; ${SETENV} -i ${DESTDIR_ENV} ${MAKE} ${.TARGETS})"; \ ${UMOUNT} ${DESTDIR}${PORTSDIR_TMP_REL} .endif From owner-p4-projects@FreeBSD.ORG Tue Jun 26 07:38:17 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 99F1B16A46B; Tue, 26 Jun 2007 07:38:17 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4081516A400 for ; Tue, 26 Jun 2007 07:38:17 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 3079113C44B for ; Tue, 26 Jun 2007 07:38:17 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5Q7cH4d096190 for ; Tue, 26 Jun 2007 07:38:17 GMT (envelope-from zhouzhouyi@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5Q7cGNh096187 for perforce@freebsd.org; Tue, 26 Jun 2007 07:38:16 GMT (envelope-from zhouzhouyi@FreeBSD.org) Date: Tue, 26 Jun 2007 07:38:16 GMT Message-Id: <200706260738.l5Q7cGNh096187@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zhouzhouyi@FreeBSD.org using -f From: Zhouyi ZHOU To: Perforce Change Reviews Cc: Subject: PERFORCE change 122331 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Jun 2007 07:38:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=122331 Change 122331 by zhouzhouyi@zhouzhouyi_mactest on 2007/06/26 07:37:27 Truncate /var/log/mactest into zero everytime the /dev/mactest opens Affected files ... .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac_test/mac_test_log.c#2 edit Differences ... ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/sys/security/mac_test/mac_test_log.c#2 (text+ko) ==== @@ -47,6 +47,7 @@ #include #include #include +#include #include #include #include @@ -90,7 +91,8 @@ int error; struct nameidata nd; int flags, vfslocked; - + struct mount *mp; + struct vattr vat; /* Only one process may open the device at a time. */ mtx_lock(&mac_test_log_mtx); @@ -104,13 +106,23 @@ NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF | MPSAFE, UIO_SYSSPACE, "/var/log/mactest", curthread); flags = O_CREAT|O_TRUNC|FWRITE; - error = vn_open(&nd, &flags, 0, NULL); + error = vn_open(&nd, &flags, S_IRUSR| S_IWUSR, NULL); vfslocked = NDHASGIANT(&nd); logvnode = nd.ni_vp; VOP_UNLOCK(logvnode, 0, curthread); + /*truncate it to zero*/ + vn_start_write(logvnode, &mp, V_WAIT | PCATCH); + VOP_LEASE(logvnode, curthread, curthread->td_ucred, LEASE_WRITE); + VATTR_NULL(&vat); + vat.va_size = 0; + vn_lock(logvnode, LK_EXCLUSIVE | LK_RETRY, curthread); + VOP_SETATTR(logvnode, &vat, curthread->td_ucred, curthread); + VOP_UNLOCK(logvnode, 0, curthread); + vn_finished_write(mp); + extattr_set_vp1(logvnode, EXTATTR_NAMESPACE_SYSTEM, "mac_test", "mac_test", strlen("mac_test"), curthread); From owner-p4-projects@FreeBSD.ORG Tue Jun 26 07:41:22 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F2AE116A46E; Tue, 26 Jun 2007 07:41:21 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A47C616A46C for ; Tue, 26 Jun 2007 07:41:21 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 9508213C458 for ; Tue, 26 Jun 2007 07:41:21 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5Q7fLN5096486 for ; Tue, 26 Jun 2007 07:41:21 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5Q7fLom096480 for perforce@freebsd.org; Tue, 26 Jun 2007 07:41:21 GMT (envelope-from gabor@freebsd.org) Date: Tue, 26 Jun 2007 07:41:21 GMT Message-Id: <200706260741.l5Q7fLom096480@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 122332 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Jun 2007 07:41:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=122332 Change 122332 by gabor@gabor_server on 2007/06/26 07:40:45 - Remove leftover temporary directory after the build Affected files ... .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.destdir.mk#8 edit Differences ... ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.destdir.mk#8 (text+ko) ==== @@ -56,7 +56,8 @@ fi; \ ${ECHO_CMD} "===> Starting chrooted make in ${DESTDIR}..."; \ ${CHROOT} ${DESTDIR} ${SH} -c "(cd ${BUILDDIR}; ${SETENV} -i ${DESTDIR_ENV} ${MAKE} ${.TARGETS})"; \ - ${UMOUNT} ${DESTDIR}${PORTSDIR_TMP_REL} + ${UMOUNT} ${DESTDIR}${PORTSDIR_TMP_REL}; \ + ${RMDIR} ${DESTDIR}${PORTSDIR_TMP_REL} .endif .if !target(post-chroot) From owner-p4-projects@FreeBSD.ORG Tue Jun 26 10:22:46 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C0CA016A46C; Tue, 26 Jun 2007 10:22:45 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9202816A468 for ; Tue, 26 Jun 2007 10:22:45 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 822FC13C487 for ; Tue, 26 Jun 2007 10:22:45 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5QAMjuL024907 for ; Tue, 26 Jun 2007 10:22:45 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5QAMj4K024904 for perforce@freebsd.org; Tue, 26 Jun 2007 10:22:45 GMT (envelope-from rdivacky@FreeBSD.org) Date: Tue, 26 Jun 2007 10:22:45 GMT Message-Id: <200706261022.l5QAMj4K024904@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 122336 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Jun 2007 10:22:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=122336 Change 122336 by rdivacky@rdivacky_witten on 2007/06/26 10:22:21 Use copyin instead of copyinstr as the latter always returns ENAMETOOLONG in this conditions ;( Brainfart by: rdivacky Affected files ... .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#30 edit Differences ... ==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#30 (text+ko) ==== @@ -1008,7 +1008,7 @@ if (pathseg == UIO_SYSSPACE) { return (path[0] == '/'); } else { - error = copyinstr(path, buf, 1, NULL); + error = copyin(path, buf, 1); if (error) return 0; /* we want to fail */ return (buf[0] == '/'); From owner-p4-projects@FreeBSD.ORG Tue Jun 26 11:30:12 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D969816A46C; Tue, 26 Jun 2007 11:30:11 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A6E1D16A468 for ; Tue, 26 Jun 2007 11:30:11 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 947EE13C489 for ; Tue, 26 Jun 2007 11:30:10 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5QBU964031352 for ; Tue, 26 Jun 2007 11:30:09 GMT (envelope-from zhouzhouyi@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5QBU9bP031348 for perforce@freebsd.org; Tue, 26 Jun 2007 11:30:09 GMT (envelope-from zhouzhouyi@FreeBSD.org) Date: Tue, 26 Jun 2007 11:30:09 GMT Message-Id: <200706261130.l5QBU9bP031348@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zhouzhouyi@FreeBSD.org using -f From: Zhouyi ZHOU To: Perforce Change Reviews Cc: Subject: PERFORCE change 122338 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Jun 2007 11:30:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=122338 Change 122338 by zhouzhouyi@zhouzhouyi_mactest on 2007/06/26 11:29:35 MAC hook matching program. look at mactest.conf and try ./mactest open mactestparser.y O_RDONLY Affected files ... .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/Makefile#2 edit .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/mactest.c#2 edit .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/mactest.conf#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/mactest.h#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/mactestparser.tab.c#1 add .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/mactestparser.y#2 edit Differences ... ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/Makefile#2 (text+ko) ==== @@ -6,10 +6,14 @@ #CFLAGS+=-DHAS_TRUNCATE64 #CFLAGS+=-DHAS_STAT64 -all: macproc +all: macproc mactest macproc: macproc.c gcc -Wall ${CFLAGS} macproc.c -o macproc -lutil +mactest: mactest.c mactestparser.tab.c + gcc ${CFLAGS} mactest.c mactestparser.tab.c -o mactest + clean: rm -f macproc + rm -f mactest ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/mactest.c#2 (text+ko) ==== @@ -31,7 +31,9 @@ #include #include #include +#include #include +#include #include #include #include @@ -42,6 +44,7 @@ #include #include #include +#include "mactest.h" #ifndef HAS_TRUNCATE64 #define truncate64 truncate @@ -224,7 +227,7 @@ usage(void) { - fprintf(stderr, "usage: mactest [-m label_string] syscall args ...\n"); + fprintf(stderr, "usage: mactest -m label_string syscall args ...\n"); exit(1); } @@ -380,14 +383,12 @@ if (argv[i] == NULL || strcmp(argv[i], ":") == 0) break; fprintf(stderr, "too many arguments [%s]\n", argv[i]); - kill(getppid(),SIGUSER1); exit(1); } else { if (argv[i] == NULL || strcmp(argv[i], ":") == 0) { if (scall->sd_args[i] & TYPE_OPTIONAL) break; fprintf(stderr, "too few arguments\n"); - kill(getppid(),SIGUSER1); exit(1); } if (scall->sd_args[i] & TYPE_STRING) { @@ -401,7 +402,6 @@ args[i].num = strtoll(argv[i], &endp, 0); if (*endp != '\0' && !isspace((unsigned char)*endp)) { fprintf(stderr, "invalid argument %u, number expected [%s]\n", i, endp); - kill(getppid(),SIGUSER1); exit(1); } } @@ -421,14 +421,12 @@ if (flags & O_CREAT) { if (i == 2) { fprintf(stderr, "too few arguments\n"); - kill(getppid(),SIGUSER1); exit(1); } rval = open(STR(0), flags, (mode_t)NUM(2)); } else { if (i == 3) { fprintf(stderr, "too many arguments\n"); - kill(getppid(),SIGUSER1); exit(1); } rval = open(STR(0), flags); @@ -513,19 +511,46 @@ serrno = err2str(errno); fprintf(stderr, "%s returned %d\n", scall->sd_name, rval); printf("%s\n", serrno); - kill(getppid(),SIGUSER1); exit(1); } printf("0\n"); return (i); } -static int waitforsig = 1; +static volatile int waitforsig = 1; static void sig_usr(int signo){ waitforsig = 0; - printf("sig_usr got called %d!\n",getpid()); +} + + +int modes_or_flags_compare(struct modes_or_flags * mf1, struct modes_or_flags *mf2){ + while (mf1) { + if (!mf2) + return 1; + if (strcmp(mf1->modflagname, mf2->modflagname)) + return 1; + mf1 = mf1->next; + mf2 = mf2->next; + } + if (mf2) + return 1; + return 0; +} + +int labelstrings_compare(struct labelstrings *ls1, struct labelstrings *ls2){ + while (ls1) { + if (!ls2) + return 1; + if (strcmp(ls1->labelstring, ls2->labelstring)) + return 1; + ls1 = ls1->next; + ls2 = ls2->next; + } + if (ls2) + return 1; + return 0; } int @@ -539,7 +564,7 @@ int mactestpipefd, logfd; char buf[2048]; int ch; - int fd[2]; + while ((ch = getopt(argc, argv, "m:")) != -1) { @@ -554,12 +579,11 @@ argc -= optind; argv += optind; - if (argc < 1) { + if (argc < 2) { fprintf(stderr, "too few arguments\n"); usage(); } - pipe(fd); if ((pid = fork()) == 0){ signal(SIGUSER1, sig_usr); @@ -570,7 +594,6 @@ if (label_string != NULL) { if (mac_from_text(&label, label_string) == -1) { - kill(getppid(),SIGUSER1); exit(-1); } @@ -581,7 +604,6 @@ mac_free(label); if (error != 0){ - kill(getppid(),SIGUSER1); exit(-1); } } @@ -591,7 +613,6 @@ scall = find_syscall(argv[0]); if (scall == NULL) { fprintf(stderr, "syscall '%s' not supported\n", argv[0]); - kill(getppid(),SIGUSER1); exit(1); } argc++; @@ -604,16 +625,11 @@ argc++; argv++; } + exit(1); - kill(getppid(),SIGUSER1); } else { - int i = 0; - int off; - struct stat sbuf; - static size_t bsize, nw; - signal(SIGUSR1, sig_usr); - printf("parent id = %d\n", getpid()); + logfd = open("/dev/mactest",O_RDWR); ioctl(logfd, BEGINLOG, NULL); kill(pid, SIGUSER1); @@ -621,6 +637,98 @@ close(logfd); } + + /* compare the configuration file and parse result */ + { + + struct mactestlog_record *record_from_log, *record_from_conf; + if ((inputfile = fopen("/var/log/mactest", "r")) < 0){ + fprintf(stderr,"/var/log/mactest do not exists!\n"); + exit(1); + } + + yyparse(); + fclose(inputfile); + record_from_log = mactestlog_record_chain; + if ((inputfile = fopen("mactest.conf", "r")) == NULL){ + fprintf(stderr, "mactest.conf do not exists!\n"); + exit(1); + } + + mactestlog_record_chain = 0; + yyparse(); + fclose(inputfile); + record_from_conf = mactestlog_record_chain; + + /* See if record_from_conf is contained in record_from_log */ + /* pid == -1 means matching the running pid */ + while (record_from_conf) { + struct mactestlog_record * iterator = record_from_log; + while (iterator) { + if (!(((record_from_conf->pid == -1)&& iterator->pid == pid)|| + record_from_conf->pid == iterator->pid)){ + iterator = iterator->next; + continue; + } + if (strcmp(record_from_conf->machookname, iterator->machookname)) + { + iterator = iterator->next; + continue; + } + if (modes_or_flags_compare(record_from_conf->modes_or_flags, + iterator->modes_or_flags)){ + iterator = iterator->next; + continue; + } + if (labelstrings_compare(record_from_conf->labelstrings, + iterator->labelstrings)){ + iterator = iterator->next; + continue; + } + break; + } + if (iterator) + record_from_conf = record_from_conf->next; + else{ + fprintf(stderr, "missing ...\n"); + struct modes_or_flags *iterator1, *tmp1; + struct labelstrings *iterator2, *tmp2; + + fprintf(stderr, "pid = %d ", record_from_conf->pid); + fprintf(stderr, "hookname: %s\n", record_from_conf->machookname); + + iterator1 = record_from_conf->modes_or_flags; + if (iterator1) { + while (iterator1) { + tmp1 = iterator1; + iterator1 = iterator1->next; + } + fprintf(stderr, " with modes or flags:"); + while (tmp1) { + fprintf(stderr, " %s", tmp1->modflagname); + tmp1 = tmp1->prev; + } + fprintf(stderr, "\n"); + } + + iterator2 = record_from_conf->labelstrings; + if (iterator2) { + while (iterator2) { + tmp2 = iterator2; + iterator2 = iterator2->next; + } + fprintf(stderr, " with labels:"); + while (tmp2) { + fprintf(stderr, " %s", tmp2->labelstring); + tmp2 = tmp2->prev; + } + fprintf(stderr, "\n"); + } + exit(1); + } + } + } + exit(0); } ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/mactestparser.y#2 (text+ko) ==== @@ -9,37 +9,16 @@ #include #include #include + #include "mactest.h" void yyerror (const char *); - struct modes_or_flags { - struct modes_or_flags * next; - struct modes_or_flags * prev; - char * modflagname; - }; - - struct labelstrings { - struct labelstrings * next; - struct labelstrings * prev; - char * labelstring; - }; - - struct mactestpipe_record - { - struct mactestpipe_record * next; - struct mactestpipe_record * prev; - int pid; - char * machookname; - struct modes_or_flags * modes_or_flags; - struct labelstrings * labelstrings; - }; - - struct mactestpipe_record *mactestpipe_record_chain = 0; + struct mactestlog_record *mactestlog_record_chain = 0; struct labelstrings *labelstring_chain = 0; struct modes_or_flags *modorflag_chain = 0; - void inserttail_mactestpipe_record_chain(struct mactestpipe_record *); + void inserttail_mactestlog_record_chain(struct mactestlog_record *); - struct mactestpipe_record *new_mactestpipe_record(char *, int); + struct mactestlog_record *new_mactestlog_record(char *, int); void new_labelstrings(char *); void new_modes_or_flags(char *); @@ -51,7 +30,7 @@ %start program -%union {long itype; char * namestring; struct mactestpipe_record * mtpipetype; +%union {long itype; char * namestring; struct mactestlog_record * mtpipetype; struct labelstrings * lstype; struct modes_or_flags * mftype;}; %token PID @@ -60,8 +39,8 @@ %token MAC_TEST %type identifier %type mac_test -%type mactestpipe_records -%type mactestpipe_record +%type mactestlog_records +%type mactestlog_record %type hook_elements %type label_elements %type modflag_elements @@ -72,22 +51,22 @@ program: - |mactestpipe_records + |mactestlog_records ; -mactestpipe_records: - mactestpipe_record {inserttail_mactestpipe_record_chain($1);} - |mactestpipe_records mactestpipe_record {inserttail_mactestpipe_record_chain($2);} - |mactestpipe_records error +mactestlog_records: + mactestlog_record {inserttail_mactestlog_record_chain($1);} + |mactestlog_records mactestlog_record {inserttail_mactestlog_record_chain($2);} + |mactestlog_records error ; -mactestpipe_record: - PID '=' pid hook_elements '\n' {$$ = new_mactestpipe_record(strdup($4), $3);} +mactestlog_record: + PID '=' pid hook_elements '\n' {$$ = new_mactestlog_record(strdup($4), $3);} |PID '=' pid hook_elements label_elements '\n' { - $$ = new_mactestpipe_record(stringsave, $3);stringsave = 0;} + $$ = new_mactestlog_record(stringsave, $3);stringsave = 0;} |PID '=' pid hook_elements modflag_and_label_elements '\n' { - $$ = new_mactestpipe_record(stringsave, $3);stringsave = 0;} + $$ = new_mactestlog_record(stringsave, $3);stringsave = 0;} |'\n' {$$ = 0;} ; @@ -131,27 +110,33 @@ yylex (void) { - int c; + int c,c1; char buf[1024]; int i; /* Skip white space. */ - while ((c = getchar ()) == ' ' || c == '\t' /*|| c == '\n'*/) + while ((c = fgetc (inputfile)) == ' ' || c == '\t' /*|| c == '\n'*/) if (c == '\n'){ // yylloc.first_line = line; line ++; } - + if (c == '-' && ((c1 = fgetc(inputfile)) == '.' || isdigit(c1))){ + ungetc(c1, inputfile); + ungetc(c, inputfile); + fscanf (inputfile, "%d", &yylval.itype); + return NUM; + } + if (c == '.' || isdigit (c)){ - ungetc (c, stdin); - scanf ("%d", &yylval.itype); + ungetc (c, inputfile); + fscanf (inputfile, "%d", &yylval.itype); return NUM; } if (c == '"') { i = 0; - while ((c = getchar()) != '"') { + while ((c = fgetc(inputfile)) != '"') { if (c == EOF) { printf("beginning \"expecting ending \"!\n"); exit(1); @@ -179,7 +164,7 @@ i = 0; buf[i] = c; - while ((c = getchar()) != ' ' && c != '\t' && c != '\n' && c!= EOF && c !=':' + while ((c = fgetc(inputfile)) != ' ' && c != '\t' && c != '\n' && c!= EOF && c !=':' && c != '#') { @@ -192,22 +177,22 @@ // i++; // buf[i] = c; // yylloc.first_line = line; - ungetc (c,stdin); + ungetc (c,inputfile); line ++; } buf[++i] = 0; if (c == EOF){ - ungetc (c,stdin); + ungetc (c,inputfile); } if (c == ':'){ - ungetc (c,stdin); + ungetc (c,inputfile); } if (c == '#'){ - ungetc (c,stdin); + ungetc (c,inputfile); } yylval.namestring = buf; @@ -236,7 +221,7 @@ { struct labelstrings * new = malloc(sizeof (struct labelstrings)); - struct labelstrings * tmp; +/* struct labelstrings * tmp;*/ new->labelstring = labelstring; new->next = 0; new->prev = 0; @@ -272,9 +257,9 @@ } -struct mactestpipe_record *new_mactestpipe_record(char * hookname, int pid) +struct mactestlog_record *new_mactestlog_record(char * hookname, int pid) { - struct mactestpipe_record *new = malloc(sizeof(struct mactestpipe_record)); + struct mactestlog_record *new = malloc(sizeof(struct mactestlog_record)); new->machookname = hookname; new->pid = pid; new->modes_or_flags = modorflag_chain; @@ -286,30 +271,32 @@ return new; } -void inserttail_mactestpipe_record_chain(struct mactestpipe_record *new) +void inserttail_mactestlog_record_chain(struct mactestlog_record *new) { if (new == 0) return; - if (mactestpipe_record_chain == 0){ - mactestpipe_record_chain = new; + if (mactestlog_record_chain == 0){ + mactestlog_record_chain = new; return; } - new->next = mactestpipe_record_chain; - mactestpipe_record_chain->prev = new; - mactestpipe_record_chain = new; + new->next = mactestlog_record_chain; + mactestlog_record_chain->prev = new; + mactestlog_record_chain = new; return; } + +/* int main (int argc, char *argv[]) { int fd, record = 0; - struct mactestpipe_record *iterator, *tmp; + struct mactestlog_record *iterator, *tmp; if (argc != 2){ - printf("Usage: mactestpipeparser filename\n"); + printf("Usage: mactestlogparser filename\n"); return; } @@ -321,7 +308,7 @@ dup2(fd,0); yyparse (); - iterator = mactestpipe_record_chain; + iterator = mactestlog_record_chain; while (iterator) { tmp = iterator; @@ -371,3 +358,4 @@ return 0; } +*/ From owner-p4-projects@FreeBSD.ORG Tue Jun 26 13:38:55 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A811516A468; Tue, 26 Jun 2007 13:38:55 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3DAF216A421 for ; Tue, 26 Jun 2007 13:38:55 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 2D6F513C44B for ; Tue, 26 Jun 2007 13:38:55 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5QDctJe051565 for ; Tue, 26 Jun 2007 13:38:55 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5QDctlh051557 for perforce@freebsd.org; Tue, 26 Jun 2007 13:38:55 GMT (envelope-from rdivacky@FreeBSD.org) Date: Tue, 26 Jun 2007 13:38:55 GMT Message-Id: <200706261338.l5QDctlh051557@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 122341 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Jun 2007 13:38:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=122341 Change 122341 by rdivacky@rdivacky_witten on 2007/06/26 13:37:54 POSIX is really good at confusing people. Change AT_SYMLINK_NOFOLLOW to ...FOLLOW. Affected files ... .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_exec.c#5 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#31 edit Differences ... ==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_exec.c#5 (text+ko) ==== ==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#31 (text+ko) ==== @@ -1505,13 +1505,13 @@ int linkat(struct thread *td, struct linkat_args *args) { - if (args->flag & ~AT_SYMLINK_NOFOLLOW) + if (args->flag & ~AT_SYMLINK_FOLLOW) return (EINVAL); - if (args->flag & AT_SYMLINK_NOFOLLOW) + if (args->flag & AT_SYMLINK_FOLLOW) + return kern_linkat(td, args->path1, args->path2, UIO_USERSPACE, args->fd1, args->fd2, FOLLOW); + else return kern_linkat(td, args->path1, args->path2, UIO_USERSPACE, args->fd1, args->fd2, 0); - else - return kern_linkat(td, args->path1, args->path2, UIO_USERSPACE, args->fd1, args->fd2, FOLLOW); } static int hardlink_check_uid = 0; From owner-p4-projects@FreeBSD.ORG Wed Jun 27 06:30:19 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CDD5E16A46E; Wed, 27 Jun 2007 06:30:18 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 945BB16A41F for ; Wed, 27 Jun 2007 06:30:18 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 82FD813C45E for ; Wed, 27 Jun 2007 06:30:18 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5R6UIDN082461 for ; Wed, 27 Jun 2007 06:30:18 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5R6UIdj082458 for perforce@freebsd.org; Wed, 27 Jun 2007 06:30:18 GMT (envelope-from gabor@freebsd.org) Date: Wed, 27 Jun 2007 06:30:18 GMT Message-Id: <200706270630.l5R6UIdj082458@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 122375 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Jun 2007 06:30:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=122375 Change 122375 by gabor@gabor_server on 2007/06/27 06:30:09 - Make post-chroot run in the chroot, after the chroot happened, but before pre-everything. In this way, it can be used for special preparing works if needed somewhere. Affected files ... .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.destdir.mk#9 edit .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#27 edit Differences ... ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.destdir.mk#9 (text+ko) ==== @@ -26,7 +26,7 @@ .endfor .for _target in ${.TARGETS} -${_target}: pre-chroot do-chroot post-chroot +${_target}: pre-chroot do-chroot @${TRUE} .endfor @@ -59,8 +59,3 @@ ${UMOUNT} ${DESTDIR}${PORTSDIR_TMP_REL}; \ ${RMDIR} ${DESTDIR}${PORTSDIR_TMP_REL} .endif - -.if !target(post-chroot) -post-chroot: - @${TRUE} -.endif ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#27 (text+ko) ==== @@ -4035,10 +4035,17 @@ # Please note that the order of the following targets is important, and # should not be modified. +.if !defined(CHROOTED) _SANITY_SEQ= pre-everything check-makefile check-categories \ check-makevars check-desktop-entries check-depends \ check-deprecated check-vulnerable buildanyway-message \ options-message +.else +_SANITY_SEQ= post-chroot pre-everything check-makefile check-categories \ + check-makevars check-desktop-entries check-depends \ + check-deprecated check-vulnerable buildanyway-message \ + options-message +.endif _FETCH_DEP= check-sanity _FETCH_SEQ= fetch-depends pre-fetch pre-fetch-script \ do-fetch post-fetch post-fetch-script From owner-p4-projects@FreeBSD.ORG Wed Jun 27 06:36:27 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CB57816A46B; Wed, 27 Jun 2007 06:36:26 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A11C216A468 for ; Wed, 27 Jun 2007 06:36:26 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 8F5FB13C448 for ; Wed, 27 Jun 2007 06:36:26 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5R6aQGm082958 for ; Wed, 27 Jun 2007 06:36:26 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5R6aQDo082955 for perforce@freebsd.org; Wed, 27 Jun 2007 06:36:26 GMT (envelope-from gabor@freebsd.org) Date: Wed, 27 Jun 2007 06:36:26 GMT Message-Id: <200706270636.l5R6aQDo082955@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 122376 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Jun 2007 06:36:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=122376 Change 122376 by gabor@gabor_server on 2007/06/27 06:36:01 - Add a post-post-chroot target, which runs after the chrooted process is ended. This can be used for special cleanup cases. Affected files ... .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.destdir.mk#10 edit Differences ... ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.destdir.mk#10 (text+ko) ==== @@ -26,7 +26,7 @@ .endfor .for _target in ${.TARGETS} -${_target}: pre-chroot do-chroot +${_target}: pre-chroot do-chroot post-post-chroot @${TRUE} .endfor @@ -59,3 +59,8 @@ ${UMOUNT} ${DESTDIR}${PORTSDIR_TMP_REL}; \ ${RMDIR} ${DESTDIR}${PORTSDIR_TMP_REL} .endif + +.if !target(post-post-chroot) +post-post-chroot: + @${TRUE} +.endif From owner-p4-projects@FreeBSD.ORG Wed Jun 27 07:15:15 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 515BC16A46F; Wed, 27 Jun 2007 07:15:15 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0E0E416A46D for ; Wed, 27 Jun 2007 07:15:14 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id E24F713C4CA for ; Wed, 27 Jun 2007 07:15:14 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5R7FEeZ086897 for ; Wed, 27 Jun 2007 07:15:14 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5R7FE3o086894 for perforce@freebsd.org; Wed, 27 Jun 2007 07:15:14 GMT (envelope-from gabor@freebsd.org) Date: Wed, 27 Jun 2007 07:15:14 GMT Message-Id: <200706270715.l5R7FE3o086894@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 122377 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Jun 2007 07:15:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=122377 Change 122377 by gabor@gabor_server on 2007/06/27 07:14:53 - Handle post-chroot a bit easier Affected files ... .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#28 edit Differences ... ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#28 (text+ko) ==== @@ -4036,16 +4036,14 @@ # should not be modified. .if !defined(CHROOTED) -_SANITY_SEQ= pre-everything check-makefile check-categories \ - check-makevars check-desktop-entries check-depends \ - check-deprecated check-vulnerable buildanyway-message \ - options-message +_CHROOT_SEQ= post-chroot .else -_SANITY_SEQ= post-chroot pre-everything check-makefile check-categories \ +_CHROOT_SEQ= +.endif +_SANITY_SEQ= ${_CHROOT_SEQ} pre-everything check-makefile check-categories \ check-makevars check-desktop-entries check-depends \ check-deprecated check-vulnerable buildanyway-message \ options-message -.endif _FETCH_DEP= check-sanity _FETCH_SEQ= fetch-depends pre-fetch pre-fetch-script \ do-fetch post-fetch post-fetch-script From owner-p4-projects@FreeBSD.ORG Wed Jun 27 07:16:17 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EA4BD16A46B; Wed, 27 Jun 2007 07:16:16 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C48B716A468 for ; Wed, 27 Jun 2007 07:16:16 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id B235713C45B for ; Wed, 27 Jun 2007 07:16:16 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5R7GG0K086947 for ; Wed, 27 Jun 2007 07:16:16 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5R7GGRH086944 for perforce@freebsd.org; Wed, 27 Jun 2007 07:16:16 GMT (envelope-from gabor@freebsd.org) Date: Wed, 27 Jun 2007 07:16:16 GMT Message-Id: <200706270716.l5R7GGRH086944@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 122378 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Jun 2007 07:16:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=122378 Change 122378 by gabor@gabor_server on 2007/06/27 07:15:45 - Whitespace fix for consistency with bsd.port.mk Affected files ... .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.destdir.mk#11 edit Differences ... ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.destdir.mk#11 (text+ko) ==== @@ -42,7 +42,7 @@ BUILDDIR= ${.CURDIR:S,^${PORTSDIR},,:S,^,${PORTSDIR_TMP_REL},} do-chroot: - ${ECHO_CMD} "===> Nullmounting ports tree into ${DESTDIR}..."; \ + ${ECHO_CMD} "===> Nullmounting ports tree into ${DESTDIR}..."; \ ${MOUNT_NULLFS} ${PORTSDIR} ${DESTDIR}${PORTSDIR_TMP_REL}; \ found=0; \ for _entry in `${MOUNT} | ${GREP} devfs | ${AWK} {'print $$3'}`; do \ @@ -51,10 +51,10 @@ fi; \ done; \ if [ $${found} = 0 ]; then \ - ${ECHO_CMD} "===> Mounting devfs into ${DESTDIR}..."; \ + ${ECHO_CMD} "===> Mounting devfs into ${DESTDIR}..."; \ ${MOUNT_DEVFS} ${DESTDIR}/dev; \ fi; \ - ${ECHO_CMD} "===> Starting chrooted make in ${DESTDIR}..."; \ + ${ECHO_CMD} "===> Starting chrooted make in ${DESTDIR}..."; \ ${CHROOT} ${DESTDIR} ${SH} -c "(cd ${BUILDDIR}; ${SETENV} -i ${DESTDIR_ENV} ${MAKE} ${.TARGETS})"; \ ${UMOUNT} ${DESTDIR}${PORTSDIR_TMP_REL}; \ ${RMDIR} ${DESTDIR}${PORTSDIR_TMP_REL} From owner-p4-projects@FreeBSD.ORG Wed Jun 27 07:57:13 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BA81D16A46D; Wed, 27 Jun 2007 07:57:12 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 759E716A421 for ; Wed, 27 Jun 2007 07:57:12 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 63D5113C46E for ; Wed, 27 Jun 2007 07:57:12 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5R7vC4Z089840 for ; Wed, 27 Jun 2007 07:57:12 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5R7vC1n089837 for perforce@freebsd.org; Wed, 27 Jun 2007 07:57:12 GMT (envelope-from gabor@freebsd.org) Date: Wed, 27 Jun 2007 07:57:12 GMT Message-Id: <200706270757.l5R7vC1n089837@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 122380 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Jun 2007 07:57:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=122380 Change 122380 by gabor@gabor_server on 2007/06/27 07:56:17 - Avoid multiple inclusion of bsd.destdir.mk Suggested by: sat Affected files ... .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.destdir.mk#12 edit Differences ... ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.destdir.mk#12 (text+ko) ==== @@ -11,6 +11,10 @@ DESTDIR_Include_MAINTAINER= portmgr@FreeBSD.org +.if !defined(_DESTDIRMKINCLUDED) + +_DESTDIRMKINCLUDED= yes + # Place variable names into DESTDIR_ENV_LIST, which you want to override in # the DESTDIR environment from outside. E.g.: # @@ -64,3 +68,5 @@ post-post-chroot: @${TRUE} .endif + +.endif From owner-p4-projects@FreeBSD.ORG Wed Jun 27 08:09:28 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8760316A46D; Wed, 27 Jun 2007 08:09:28 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 451EA16A41F for ; Wed, 27 Jun 2007 08:09:28 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 3418113C4C8 for ; Wed, 27 Jun 2007 08:09:28 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5R89S4n091839 for ; Wed, 27 Jun 2007 08:09:28 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5R89SWS091834 for perforce@freebsd.org; Wed, 27 Jun 2007 08:09:28 GMT (envelope-from gabor@freebsd.org) Date: Wed, 27 Jun 2007 08:09:28 GMT Message-Id: <200706270809.l5R89SWS091834@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 122381 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Jun 2007 08:09:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=122381 Change 122381 by gabor@gabor_server on 2007/06/27 08:08:32 - Fix pre and post mk handling by adding && !defined(BEFOREPORTMK) to the big condition Suggested by: sat Affected files ... .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#29 edit Differences ... ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#29 (text+ko) ==== @@ -1093,7 +1093,7 @@ # DESTDIR section to start a chrooted process if invoked with DESTDIR set # -.if defined(DESTDIR) && !empty(DESTDIR) && !defined(CHROOTED) +.if defined(DESTDIR) && !empty(DESTDIR) && !defined(CHROOTED) && !defined(BEFOREPORTMK) .include "${PORTSDIR}/Mk/bsd.destdir.mk" From owner-p4-projects@FreeBSD.ORG Wed Jun 27 08:11:32 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7EA0216A46E; Wed, 27 Jun 2007 08:11:32 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0709A16A47A for ; Wed, 27 Jun 2007 08:11:32 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id EA2EA13C44B for ; Wed, 27 Jun 2007 08:11:31 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5R8BVcE092452 for ; Wed, 27 Jun 2007 08:11:31 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5R8BVEp092447 for perforce@freebsd.org; Wed, 27 Jun 2007 08:11:31 GMT (envelope-from gabor@freebsd.org) Date: Wed, 27 Jun 2007 08:11:31 GMT Message-Id: <200706270811.l5R8BVEp092447@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 122382 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Jun 2007 08:11:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=122382 Change 122382 by gabor@gabor_server on 2007/06/27 08:10:39 - Add !defined(INOPRTIONSMK) for proper working with bsd.options.mk, too. Affected files ... .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#30 edit Differences ... ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#30 (text+ko) ==== @@ -1093,7 +1093,8 @@ # DESTDIR section to start a chrooted process if invoked with DESTDIR set # -.if defined(DESTDIR) && !empty(DESTDIR) && !defined(CHROOTED) && !defined(BEFOREPORTMK) +.if defined(DESTDIR) && !empty(DESTDIR) && !defined(CHROOTED) && \ + !defined(BEFOREPORTMK) && !defined(INOPRTIONSMK) .include "${PORTSDIR}/Mk/bsd.destdir.mk" From owner-p4-projects@FreeBSD.ORG Wed Jun 27 08:15:37 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 60DAC16A469; Wed, 27 Jun 2007 08:15:37 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 37EBD16A400 for ; Wed, 27 Jun 2007 08:15:37 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 279EF13C447 for ; Wed, 27 Jun 2007 08:15:37 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5R8Fb4Y092708 for ; Wed, 27 Jun 2007 08:15:37 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5R8FaLH092705 for perforce@freebsd.org; Wed, 27 Jun 2007 08:15:36 GMT (envelope-from gabor@freebsd.org) Date: Wed, 27 Jun 2007 08:15:36 GMT Message-Id: <200706270815.l5R8FaLH092705@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 122383 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Jun 2007 08:15:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=122383 Change 122383 by gabor@gabor_server on 2007/06/27 08:15:20 - Add some header info and the strict policy from bsd.port.mk Affected files ... .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.commands.mk#5 edit Differences ... ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.commands.mk#5 (text+ko) ==== @@ -1,3 +1,19 @@ +#-*- mode: Fundamental; tab-width: 4; -*- +# ex:ts=4 +# +# bsd.commands.mk - Common commands used within the ports infrastructure +# +# Created by: Gabor Kovesdan +# +# $FreeBSD$ +# +# DO NOT COMMIT CHANGES TO THIS FILE BY YOURSELF, EVEN IF YOU DID NOT GET +# A RESPONSE FROM THE MAINTAINER(S) WITHIN A REASONABLE TIMEFRAME! ALL +# UNAUTHORISED CHANGES WILL BE UNCONDITIONALLY REVERTED! +# + +COMMANDS_Include_MAINTAINER= portmgr@FreeBSD.org + AWK?= /usr/bin/awk BASENAME?= /usr/bin/basename BRANDELF?= /usr/bin/brandelf From owner-p4-projects@FreeBSD.ORG Wed Jun 27 10:24:21 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1D32016A49A; Wed, 27 Jun 2007 10:24:21 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id BEADC16A484 for ; Wed, 27 Jun 2007 10:24:20 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id AEACD13C483 for ; Wed, 27 Jun 2007 10:24:20 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5RAOKeK013945 for ; Wed, 27 Jun 2007 10:24:20 GMT (envelope-from zhouzhouyi@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5RAOK0Y013941 for perforce@freebsd.org; Wed, 27 Jun 2007 10:24:20 GMT (envelope-from zhouzhouyi@FreeBSD.org) Date: Wed, 27 Jun 2007 10:24:20 GMT Message-Id: <200706271024.l5RAOK0Y013941@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zhouzhouyi@FreeBSD.org using -f From: Zhouyi ZHOU To: Perforce Change Reviews Cc: Subject: PERFORCE change 122388 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Jun 2007 10:24:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=122388 Change 122388 by zhouzhouyi@zhouzhouyi_mactest on 2007/06/27 10:24:02 write test case in regression/mactest/tests/signal/01.t using the log mechanism Affected files ... .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/mactest.c#3 edit .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/misc.sh#2 edit .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/signal/00.t#2 edit .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/signal/01.t#1 add Differences ... ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/mactest.c#3 (text+ko) ==== @@ -585,58 +585,48 @@ } - if ((pid = fork()) == 0){ - signal(SIGUSER1, sig_usr); - while(waitforsig); - if (mac_is_present(NULL) == 1) { - mac_t label; + if (mac_is_present(NULL) == 1) { + mac_t label; - if (label_string != NULL) { - if (mac_from_text(&label, label_string) == -1) { - exit(-1); - } + if (label_string != NULL) { + if (mac_from_text(&label, label_string) == -1) { + exit(-1); + } - if (mac_set_proc(label) == -1) + if (mac_set_proc(label) == -1) error = errno; else error = 0; - mac_free(label); + mac_free(label); - if (error != 0){ - exit(-1); - } + if (error != 0){ + exit(-1); } } + } - for (;;) { - scall = find_syscall(argv[0]); - if (scall == NULL) { - fprintf(stderr, "syscall '%s' not supported\n", argv[0]); - exit(1); - } - argc++; - argv++; - n = call_syscall(scall, argv); - argc += n; - argv += n; - if (argv[0] == NULL) - break; - argc++; - argv++; + logfd = open("/dev/mactest",O_RDWR); + ioctl(logfd, BEGINLOG, NULL); + + for (;;) { + scall = find_syscall(argv[0]); + if (scall == NULL) { + fprintf(stderr, "syscall '%s' not supported\n", argv[0]); + exit(1); } - exit(1); - + argc++; + argv++; + n = call_syscall(scall, argv); + argc += n; + argv += n; + if (argv[0] == NULL) + break; + argc++; + argv++; } - else { - - logfd = open("/dev/mactest",O_RDWR); - ioctl(logfd, BEGINLOG, NULL); - kill(pid, SIGUSER1); - waitpid(pid, NULL, 0); - close(logfd); - - } + + close(logfd); /* compare the configuration file and parse result */ { @@ -662,6 +652,7 @@ /* See if record_from_conf is contained in record_from_log */ /* pid == -1 means matching the running pid */ + pid = getpid(); while (record_from_conf) { struct mactestlog_record * iterator = record_from_log; while (iterator) { ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/misc.sh#2 (text+ko) ==== @@ -14,8 +14,11 @@ fi macproc="${maindir}/macproc" +mactest="${maindir}/mactest" + . ${maindir}/tests/conf + maccmdnotexpectanyerror() { m="${1}" @@ -35,6 +38,23 @@ ntest=`expr $ntest + 1` } + +mactestnotexpectanyerror() +{ + + ${mactest} $* 2>${tmp_file} 1>>${tmp_file} + r=`cat ${tmp_file}` + echo "${r}" | egrep '^''0''$' >/dev/null 2>&1 + if [ $? -eq 0 ] && [ ${#r} -eq 1 ] ; then + echo "ok ${ntest}" + else + echo ${r} + echo "not ok ${ntest}" + fi + ntest=`expr $ntest + 1` +} + + maccmdexpect() { e="${1}" @@ -52,7 +72,6 @@ echo "ok ${ntest}" else echo "not ok ${ntest}" - exit fi ntest=`expr $ntest + 1` } ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/signal/00.t#2 (text+ko) ==== @@ -6,29 +6,37 @@ dir=`dirname $0` . ${dir}/../misc.sh +#turn off all the switches +for i in `sysctl security.mac | grep "\.enabled"| + sed 's/\([a-z\.]*\.enabled\)\(:\ \)\([01]\)/\1/`; do +sysctl ${i}=0 +done + +mac_mls_support=`sysctl -n security.mac.mls.enabled 2>/dev/null` #following test case is to show, when subject's effective mls level does not dominate #object's effective mls level, a ESRCH is returned when signaling -t=`sysctl security.mac.mls.enabled=0` -maccmdnotexpectanyerror "mls/3(2-7)" ${macproc} -w 20 -f "${pid_file}" -getmacprocpid -t=`sysctl security.mac.mls.enabled=1` -maccmdexpect "No such process" "mls/low" kill ${pid} -maccmdnotexpectanyerror "mls/3(2-7)" kill ${pid} -t=`sysctl security.mac.mls.enabled=0` -rm ${pid_file} -rm ${tmp_file} +if [ "${mac_mls_support}" != "" ] ; then + maccmdnotexpectanyerror "mls/3(2-7)" ${macproc} -w 20 -f "${pid_file}" + getmacprocpid + t=`sysctl security.mac.mls.enabled=1` + maccmdexpect "No such process" "mls/low" kill ${pid} + maccmdnotexpectanyerror "mls/3(2-7)" kill ${pid} + t=`sysctl security.mac.mls.enabled=0` + rm ${pid_file} + rm ${tmp_file} #following test case is to show, when object's effective mls level does not dominate #subject's effective mls level, a EACCES is returned when signaling -t=`sysctl security.mac.mls.enabled=0` -maccmdnotexpectanyerror "mls/low(low-high)" ${macproc} -w 20 -f "${pid_file}" -getmacprocpid -t=`sysctl security.mac.mls.enabled=1` -maccmdexpect "Permission denied" "mls/3(2-7)" kill ${pid} -maccmdnotexpectanyerror "mls/low(low-high)" kill ${pid} -t=`sysctl security.mac.mls.enabled=0` -rm ${pid_file} -rm ${tmp_file} + t=`sysctl security.mac.mls.enabled=0` + maccmdnotexpectanyerror "mls/low(low-high)" ${macproc} -w 20 -f "${pid_file}" + getmacprocpid + t=`sysctl security.mac.mls.enabled=1` + maccmdexpect "Permission denied" "mls/3(2-7)" kill ${pid} + maccmdnotexpectanyerror "mls/low(low-high)" kill ${pid} + t=`sysctl security.mac.mls.enabled=0` + rm ${pid_file} + rm ${tmp_file} +fi From owner-p4-projects@FreeBSD.ORG Wed Jun 27 12:12:40 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7633216A468; Wed, 27 Jun 2007 12:12:40 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2D08016A400 for ; Wed, 27 Jun 2007 12:12:40 +0000 (UTC) (envelope-from thioretic@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 06B4B13C489 for ; Wed, 27 Jun 2007 12:12:40 +0000 (UTC) (envelope-from thioretic@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5RCCduH024044 for ; Wed, 27 Jun 2007 12:12:39 GMT (envelope-from thioretic@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5RCCdsj024041 for perforce@freebsd.org; Wed, 27 Jun 2007 12:12:39 GMT (envelope-from thioretic@FreeBSD.org) Date: Wed, 27 Jun 2007 12:12:39 GMT Message-Id: <200706271212.l5RCCdsj024041@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thioretic@FreeBSD.org using -f From: Maxim Zhuravlev To: Perforce Change Reviews Cc: Subject: PERFORCE change 122394 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Jun 2007 12:12:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=122394 Change 122394 by thioretic@thioretic on 2007/06/27 12:12:26 Just add a TODO file Affected files ... .. //depot/projects/soc2007/thioretic_gidl/TODO#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Wed Jun 27 12:44:20 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CF22E16A46D; Wed, 27 Jun 2007 12:44:19 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 964CC16A421 for ; Wed, 27 Jun 2007 12:44:19 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 87A9B13C44C for ; Wed, 27 Jun 2007 12:44:19 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5RCiJO3027867 for ; Wed, 27 Jun 2007 12:44:19 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5RCiJuJ027864 for perforce@freebsd.org; Wed, 27 Jun 2007 12:44:19 GMT (envelope-from rpaulo@FreeBSD.org) Date: Wed, 27 Jun 2007 12:44:19 GMT Message-Id: <200706271244.l5RCiJuJ027864@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 122395 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Jun 2007 12:44:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=122395 Change 122395 by rpaulo@rpaulo_epsilon on 2007/06/27 12:44:09 Remove the UQ_MS_IGNORE quirk. The atp driver only needs to return a proper value in the attach routine to win the device against ums(4). Affected files ... .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/ums.c#11 edit .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/usb_quirks.c#5 edit .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/usb_quirks.h#5 edit Differences ... ==== //depot/projects/soc2007/rpaulo-macbook/dev/usb/ums.c#11 (text+ko) ==== @@ -188,9 +188,6 @@ void *desc; usbd_status err; - if (usbd_get_quirks(uaa->device)->uq_flags & UQ_MS_IGNORE) - return (UMATCH_NONE); - if (!uaa->iface) return (UMATCH_NONE); id = usbd_get_interface_descriptor(uaa->iface); ==== //depot/projects/soc2007/rpaulo-macbook/dev/usb/usb_quirks.c#5 (text+ko) ==== @@ -102,7 +102,7 @@ ANY, { UQ_KBD_IGNORE }}, /* Devices that need special handling of the Fn key */ { USB_VENDOR_APPLE, USB_PRODUCT_APPLE_INTKBTP, - ANY, { UQ_KBD_FNKEY | UQ_MS_IGNORE } }, + ANY, { UQ_KBD_FNKEY } }, { 0, 0, 0, { 0 } } }; ==== //depot/projects/soc2007/rpaulo-macbook/dev/usb/usb_quirks.h#5 (text+ko) ==== @@ -56,7 +56,6 @@ #define UQ_HID_IGNORE 0x8000 /* device should be ignored by hid class */ #define UQ_KBD_IGNORE 0x18000 /* device should be ignored by both kbd and hid class */ #define UQ_KBD_FNKEY 0x40000 /* device needs special handling for the Fn key */ -#define UQ_MS_IGNORE 0x20000 /* device should be ignored by ums */ }; extern const struct usbd_quirks usbd_no_quirk; From owner-p4-projects@FreeBSD.ORG Wed Jun 27 12:48:25 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7D9AE16A46C; Wed, 27 Jun 2007 12:48:25 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 42EDA16A400 for ; Wed, 27 Jun 2007 12:48:25 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 3448313C44B for ; Wed, 27 Jun 2007 12:48:25 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5RCmP0q036612 for ; Wed, 27 Jun 2007 12:48:25 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5RCmPcV036609 for perforce@freebsd.org; Wed, 27 Jun 2007 12:48:25 GMT (envelope-from rpaulo@FreeBSD.org) Date: Wed, 27 Jun 2007 12:48:25 GMT Message-Id: <200706271248.l5RCmPcV036609@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 122396 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Jun 2007 12:48:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=122396 Change 122396 by rpaulo@rpaulo_epsilon on 2007/06/27 12:47:51 Add asmc. Affected files ... .. //depot/projects/soc2007/rpaulo-macbook/conf/NOTES#9 edit Differences ... ==== //depot/projects/soc2007/rpaulo-macbook/conf/NOTES#9 (text+ko) ==== @@ -2106,6 +2106,7 @@ # rc: RISCom/8 multiport card # rp: Comtrol Rocketport(ISA/PCI) - single card # si: Specialix SI/XIO 4-32 port terminal multiplexor +# asmc: Apple's System Management Console - Intel Macs # Notes on the Comtrol Rocketport driver: # @@ -2223,6 +2224,9 @@ # device bktr +# Apple's System Management Console +device asmc + # # PC Card/PCMCIA and Cardbus # From owner-p4-projects@FreeBSD.ORG Wed Jun 27 12:51:31 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A8F3816A468; Wed, 27 Jun 2007 12:51:31 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6049616A400 for ; Wed, 27 Jun 2007 12:51:31 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 509BF13C43E for ; Wed, 27 Jun 2007 12:51:31 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5RCpV2H037118 for ; Wed, 27 Jun 2007 12:51:31 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5RCpTCe037115 for perforce@freebsd.org; Wed, 27 Jun 2007 12:51:29 GMT (envelope-from rpaulo@FreeBSD.org) Date: Wed, 27 Jun 2007 12:51:29 GMT Message-Id: <200706271251.l5RCpTCe037115@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 122397 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Jun 2007 12:51:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=122397 Change 122397 by rpaulo@rpaulo_epsilon on 2007/06/27 12:50:52 IFC Affected files ... .. //depot/projects/soc2007/rpaulo-macbook/conf/NOTES#10 integrate .. //depot/projects/soc2007/rpaulo-macbook/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/ata/ata-all.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/ata/ata-disk.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/isp/isp_pci.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/iwi/if_iwi.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/rp/rp.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/if_ural.c#8 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/usbdevs#10 integrate .. //depot/projects/soc2007/rpaulo-macbook/fs/tmpfs/tmpfs.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/fs/tmpfs/tmpfs_fifoops.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/fs/tmpfs/tmpfs_subr.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/fs/tmpfs/tmpfs_uma.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/fs/tmpfs/tmpfs_uma.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/fs/tmpfs/tmpfs_vfsops.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/fs/tmpfs/tmpfs_vnops.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/kern_rwlock.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/kern_timeout.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/net/if_gre.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctputil.c#12 integrate .. //depot/projects/soc2007/rpaulo-macbook/security/audit/audit_syscalls.c#6 integrate .. //depot/projects/soc2007/rpaulo-macbook/security/mac/mac_audit.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/security/mac/mac_framework.h#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/security/mac/mac_policy.h#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/security/mac_stub/mac_stub.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/security/mac_test/mac_test.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/sys/_rwlock.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/sys/rwlock.h#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/vm/vm_pageout.c#7 integrate Differences ... ==== //depot/projects/soc2007/rpaulo-macbook/conf/NOTES#10 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1436 2007/06/25 05:06:55 rafan Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1437 2007/06/27 02:34:22 rafan Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # ==== //depot/projects/soc2007/rpaulo-macbook/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#5 (text+ko) ==== @@ -766,7 +766,7 @@ vn_lock(*vpp, flags, curthread); } ZFS_EXIT(zfsvfs); - return (0); + return (err); } static int ==== //depot/projects/soc2007/rpaulo-macbook/dev/ata/ata-all.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ata/ata-all.h,v 1.123 2007/04/08 19:18:51 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-all.h,v 1.124 2007/06/26 22:13:43 remko Exp $ */ /* ATA register defines */ @@ -294,6 +294,7 @@ #define ATA_DEV(device) ((device == ATA_MASTER) ? 0 : 1) #define ATA_CFA_MAGIC1 0x844A #define ATA_CFA_MAGIC2 0x848A +#define ATA_CFA_MAGIC3 0x8400 #define ATAPI_MAGIC_LSB 0x14 #define ATAPI_MAGIC_MSB 0xeb #define ATAPI_P_READ (ATA_S_DRQ | ATA_I_IN) ==== //depot/projects/soc2007/rpaulo-macbook/dev/ata/ata-disk.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-disk.c,v 1.203 2007/05/06 01:20:06 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-disk.c,v 1.204 2007/06/26 22:13:43 remko Exp $"); #include "opt_ata.h" #include @@ -80,7 +80,8 @@ if (!(atadev->param.config & ATA_PROTO_ATAPI) || (atadev->param.config == ATA_CFA_MAGIC1) || - (atadev->param.config == ATA_CFA_MAGIC2)) + (atadev->param.config == ATA_CFA_MAGIC2) || + (atadev->param.config == ATA_CFA_MAGIC3)) return 0; else return ENXIO; ==== //depot/projects/soc2007/rpaulo-macbook/dev/isp/isp_pci.c#5 (text+ko) ==== @@ -28,7 +28,7 @@ * FreeBSD Version. */ #include -__FBSDID("$FreeBSD: src/sys/dev/isp/isp_pci.c,v 1.145 2007/06/11 17:56:17 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/isp/isp_pci.c,v 1.148 2007/06/26 23:08:57 mjacob Exp $"); #include #include @@ -2847,10 +2847,22 @@ (ispextreq_t *)qep); break; case RQSTYPE_T2RQS: - isp_put_request_t2(isp, (ispreqt2_t *) rq, (ispreqt2_t *) qep); + if (FCPARAM(isp)->isp_2klogin) { + isp_put_request_t2e(isp, + (ispreqt2e_t *) rq, (ispreqt2e_t *) qep); + } else { + isp_put_request_t2(isp, + (ispreqt2_t *) rq, (ispreqt2_t *) qep); + } break; + case RQSTYPE_T3RQS: + if (FCPARAM(isp)->isp_2klogin) { + isp_put_request_t3e(isp, + (ispreqt3e_t *) rq, (ispreqt3e_t *) qep); + break; + } + /* FALLTHROUGH */ case RQSTYPE_A64: - case RQSTYPE_T3RQS: isp_put_request_t3(isp, (ispreqt3_t *) rq, (ispreqt3_t *) qep); break; case RQSTYPE_T7RQS: ==== //depot/projects/soc2007/rpaulo-macbook/dev/iwi/if_iwi.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/iwi/if_iwi.c,v 1.54 2007/06/11 10:56:06 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/iwi/if_iwi.c,v 1.55 2007/06/25 20:56:33 thompsa Exp $"); /*- * Intel(R) PRO/Wireless 2200BG/2225BG/2915ABG driver @@ -2630,6 +2630,7 @@ return error; } + memset(&rs, 0, sizeof rs); rs.mode = IWI_MODE_11G; rs.type = IWI_RATESET_TYPE_SUPPORTED; rs.nrates = ic->ic_sup_rates[IEEE80211_MODE_11G].rs_nrates; @@ -2640,6 +2641,7 @@ if (error != 0) return error; + memset(&rs, 0, sizeof rs); rs.mode = IWI_MODE_11A; rs.type = IWI_RATESET_TYPE_SUPPORTED; rs.nrates = ic->ic_sup_rates[IEEE80211_MODE_11A].rs_nrates; @@ -2866,7 +2868,7 @@ struct iwi_associate *assoc = &sc->assoc; struct iwi_rateset rs; uint16_t capinfo; - int error; + int error, mode; IWI_LOCK_ASSERT(sc); @@ -2877,12 +2879,22 @@ IWI_STATE_BEGIN(sc, IWI_FW_ASSOCIATING); error = 0; + mode = 0; + + if (IEEE80211_IS_CHAN_A(ic->ic_curchan)) + mode = IWI_MODE_11A; + else if (IEEE80211_IS_CHAN_G(ic->ic_curchan)) + mode = IWI_MODE_11G; + if (IEEE80211_IS_CHAN_B(ic->ic_curchan)) + mode = IWI_MODE_11B; + if (IEEE80211_IS_CHAN_2GHZ(ic->ic_curchan)) { memset(&config, 0, sizeof config); config.bluetooth_coexistence = sc->bluetooth; config.antenna = sc->antenna; config.multicast_enabled = 1; - config.use_protection = 1; + if (mode == IWI_MODE_11G) + config.use_protection = 1; config.answer_pbreq = (ic->ic_opmode == IEEE80211_M_IBSS) ? 1 : 0; config.disable_unicast_decryption = 1; @@ -2905,13 +2917,8 @@ goto done; /* the rate set has already been "negotiated" */ - if (IEEE80211_IS_CHAN_A(ic->ic_curchan)) - rs.mode = IWI_MODE_11A; - else if (IEEE80211_IS_CHAN_G(ic->ic_curchan)) - rs.mode = IWI_MODE_11G; - if (IEEE80211_IS_CHAN_B(ic->ic_curchan)) - rs.mode = IWI_MODE_11B; - + memset(&rs, 0, sizeof rs); + rs.mode = mode; rs.type = IWI_RATESET_TYPE_NEGOTIATED; rs.nrates = ni->ni_rates.rs_nrates; if (rs.nrates > IWI_RATESET_SIZE) { @@ -2946,13 +2953,7 @@ if (error != 0) goto done; - if (IEEE80211_IS_CHAN_A(ic->ic_curchan)) - assoc->mode = IWI_MODE_11A; - else if (IEEE80211_IS_CHAN_G(ic->ic_curchan)) - assoc->mode = IWI_MODE_11G; - else if (IEEE80211_IS_CHAN_B(ic->ic_curchan)) - assoc->mode = IWI_MODE_11B; - + assoc->mode = mode; assoc->chan = ic->ic_curchan->ic_ieee; /* * NB: do not arrange for shared key auth w/o privacy ==== //depot/projects/soc2007/rpaulo-macbook/dev/rp/rp.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/rp/rp.c,v 1.72 2006/11/20 12:59:27 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/rp/rp.c,v 1.73 2007/06/26 13:50:48 remko Exp $"); /* * rp.c - for RocketPort FreeBSD @@ -573,6 +573,7 @@ static void rpbreak(struct tty *, int); static void rpclose(struct tty *tp); +static void rphardclose(struct tty *tp); static int rpmodem(struct tty *, int, int); static int rpparam(struct tty *, struct termios *); static void rpstart(struct tty *); @@ -697,7 +698,7 @@ if((tp->t_state & TS_CARR_ON)) { (void)ttyld_modem(tp, 0); if(ttyld_modem(tp, 0) == 0) { - rpclose(tp); + rphardclose(tp); } } } @@ -935,6 +936,16 @@ rpclose(struct tty *tp) { struct rp_port *rp; + + rp = tp->t_sc; + rphardclose(tp); + device_unbusy(rp->rp_ctlp->dev); +} + +static void +rphardclose(struct tty *tp) +{ + struct rp_port *rp; CHANNEL_t *cp; rp = tp->t_sc; @@ -958,7 +969,6 @@ tp->t_actout = FALSE; wakeup(&tp->t_actout); wakeup(TSA_CARR_ON(tp)); - device_unbusy(rp->rp_ctlp->dev); } static void ==== //depot/projects/soc2007/rpaulo-macbook/dev/usb/if_ural.c#8 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb/if_ural.c,v 1.64 2007/06/23 06:52:56 imp Exp $ */ +/* $FreeBSD: src/sys/dev/usb/if_ural.c,v 1.65 2007/06/25 20:51:58 imp Exp $ */ /*- * Copyright (c) 2005, 2006 @@ -18,7 +18,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/if_ural.c,v 1.64 2007/06/23 06:52:56 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/if_ural.c,v 1.65 2007/06/25 20:51:58 imp Exp $"); /*- * Ralink Technology RT2500USB chipset driver @@ -89,9 +89,9 @@ { USB_VENDOR_GIGABYTE, USB_PRODUCT_GIGABYTE_GNWBKG }, { USB_VENDOR_GIGABYTE, USB_PRODUCT_GIGABYTE_GN54G }, { USB_VENDOR_GUILLEMOT, USB_PRODUCT_GUILLEMOT_HWGUSB254 }, - { USB_VENDOR_LINKSYS4, USB_PRODUCT_LINKSYS4_WUSB54G }, - { USB_VENDOR_LINKSYS4, USB_PRODUCT_LINKSYS4_WUSB54GP }, - { USB_VENDOR_LINKSYS4, USB_PRODUCT_LINKSYS4_HU200TS }, + { USB_VENDOR_CISCOLINKSYS, USB_PRODUCT_CISCOLINKSYS_WUSB54G }, + { USB_VENDOR_CISCOLINKSYS, USB_PRODUCT_CISCOLINKSYS_WUSB54GP }, + { USB_VENDOR_CISCOLINKSYS, USB_PRODUCT_CISCOLINKSYS_HU200TS }, { USB_VENDOR_MELCO, USB_PRODUCT_MELCO_KG54 }, { USB_VENDOR_MELCO, USB_PRODUCT_MELCO_KG54AI }, { USB_VENDOR_MELCO, USB_PRODUCT_MELCO_KG54YB }, ==== //depot/projects/soc2007/rpaulo-macbook/dev/usb/usbdevs#10 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/sys/dev/usb/usbdevs,v 1.309 2007/06/23 06:52:56 imp Exp $ +$FreeBSD: src/sys/dev/usb/usbdevs,v 1.311 2007/06/26 05:29:27 imp Exp $ /* $NetBSD: usbdevs,v 1.392 2004/12/29 08:38:44 imp Exp $ */ /*- @@ -62,13 +62,12 @@ * make the device recognised by the appropriate device driver. */ +vendor UNKNOWN1 0x0053 Unknown vendor +vendor UNKNOWN2 0x0105 Unknown vendor vendor EGALAX2 0x0123 eGalax -vendor DICKSMITH 0x1371 Dick Smith Electronics -vendor NETGEAR3 0x1385 Netgear -vendor CISCOLINKSYS 0x13b1 Cisco-Linksys -vendor WISTRONNEWEB 0x1435 Wistron NeWeb -vendor UMEDIA 0x157e U-MEDIA Communications +vendor HUMAX 0x02ad HUMAX vendor LTS 0x0386 LTS +vendor BWCT 0x03da Bernd Walter Computer Technology vendor AOX 0x03e8 AOX vendor THESYS 0x03e9 Thesys vendor DATABROADCAST 0x03ea Data Broadcasting @@ -103,46 +102,47 @@ vendor VIA 0x040d VIA vendor MCCI 0x040e MCCI vendor MELCO 0x0411 Melco +vendor LEADTEK 0x0413 Leadtek vendor WINBOND 0x0416 Winbond vendor PHOENIX 0x041a Phoenix vendor CREATIVE 0x041e Creative vendor NOKIA 0x0421 Nokia vendor ADI 0x0422 ADI vendor CATC 0x0423 Computer Access Technology -vendor SMC2 0x0424 SMC +vendor SMC2 0x0424 Standard Microsystems vendor MOTOROLA_HK 0x0425 Motorola HK -vendor GRAVIS 0x0428 Advanced Gravis Computer Tech. +vendor GRAVIS 0x0428 Advanced Gravis Computer vendor CIRRUSLOGIC 0x0429 Cirrus Logic vendor INNOVATIVE 0x042c Innovative Semiconductors vendor MOLEX 0x042f Molex -vendor SUN2 0x0430 Sun Microsystems (unofficial) +vendor SUN 0x0430 Sun Microsystems vendor UNISYS 0x0432 Unisys vendor TAUGA 0x0436 Taugagreining HF -vendor AMD 0x0438 ADM -vendor LEXMARK 0x043d Lexmark +vendor AMD 0x0438 Advanced Micro Devices +vendor LEXMARK 0x043d Lexmark International vendor LG 0x043e LG Electronics vendor NANAO 0x0440 NANAO vendor GATEWAY 0x0443 Gateway 2000 vendor NMB 0x0446 NMB -vendor ALPS 0x044e Alps +vendor ALPS 0x044e Alps Electric vendor THRUST 0x044f Thrustmaster vendor TI 0x0451 Texas Instruments vendor ANALOGDEVICES 0x0456 Analog Devices -vendor SIS 0x0457 SIS -vendor KYE 0x0458 KYE +vendor SIS 0x0457 Silicon Integrated Systems Corp. +vendor KYE 0x0458 KYE Systems vendor DIAMOND2 0x045a Diamond (Supra) vendor RENESAS 0x045b Renesas vendor MICROSOFT 0x045e Microsoft -vendor PRIMAX 0x0461 Primax -vendor MGE 0x0463 MGE +vendor PRIMAX 0x0461 Primax Electronics +vendor MGE 0x0463 MGE UPS Systems vendor AMP 0x0464 AMP -vendor CHERRY 0x046a Cherry +vendor CHERRY 0x046a Cherry Mikroschalter vendor MEGATRENDS 0x046b American Megatrends vendor LOGITECH 0x046d Logitech -vendor BTC 0x046e BTC +vendor BTC 0x046e Behavior Tech. Computer vendor PHILIPS 0x0471 Philips -vendor SUN 0x0472 Sun Microsystems (offical) -vendor SANYO 0x0474 Sanyo +vendor SUN2 0x0472 Sun Microsystems (offical) +vendor SANYO 0x0474 Sanyo Electric vendor SEAGATE 0x0477 Seagate vendor CONNECTIX 0x0478 Connectix vendor SEMTECH 0x047a Semtech @@ -156,32 +156,33 @@ vendor COMPAQ 0x049f Compaq vendor HITACHI 0x04a4 Hitachi vendor ACERP 0x04a5 Acer Peripherals +vendor DAVICOM 0x04a6 Davicom vendor VISIONEER 0x04a7 Visioneer vendor CANON 0x04a9 Canon vendor NIKON 0x04b0 Nikon vendor PAN 0x04b1 Pan International vendor IBM 0x04b3 IBM -vendor CYPRESS 0x04b4 Cypress +vendor CYPRESS 0x04b4 Cypress Semiconductor vendor ROHM 0x04b5 ROHM vendor COMPAL 0x04b7 Compal vendor EPSON 0x04b8 Seiko Epson -vendor RAINBOW 0x04b9 Rainbow +vendor RAINBOW 0x04b9 Rainbow Technologies vendor IODATA 0x04bb I-O Data vendor TDK 0x04bf TDK vendor 3COMUSR 0x04c1 U.S. Robotics -vendor METHODE 0x04c2 Methode +vendor METHODE 0x04c2 Methode Electronics Far East vendor MAXISWITCH 0x04c3 Maxi Switch vendor LOCKHEEDMER 0x04c4 Lockheed Martin Energy Research vendor FUJITSU 0x04c5 Fujitsu -vendor TOSHIBAAM 0x04c6 Toshiba -vendor MICROMACRO 0x04c7 Micro Macro +vendor TOSHIBAAM 0x04c6 Toshiba America +vendor MICROMACRO 0x04c7 Micro Macro Technologies vendor KONICA 0x04c8 Konica -vendor LITEON 0x04ca Lite-On -vendor FUJIPHOTO 0x04cb Fuji Photo -vendor PHILIPSSEMI 0x04cc Philips -vendor TATUNG 0x04cd Tatung +vendor LITEON 0x04ca Lite-On Technology +vendor FUJIPHOTO 0x04cb Fuji Photo Film +vendor PHILIPSSEMI 0x04cc Philips Semiconductors +vendor TATUNG 0x04cd Tatung Co. Of America vendor SCANLOGIC 0x04ce ScanLogic -vendor MYSON 0x04cf Myson +vendor MYSON 0x04cf Myson Technology vendor DIGI2 0x04d0 Digi vendor ITTCANON 0x04d1 ITT Canon vendor ALTEC 0x04d2 Altec Lansing @@ -528,18 +529,25 @@ vendor HUAWEI 0x12d1 Huawei Technologies vendor AINCOMM 0x12fd Aincomm vendor MOBILITY 0x1342 Mobility -vendor LINKSYS4 0x13b1 Linksys +vendor DICKSMITH 0x1371 Dick Smith Electronics +vendor NETGEAR3 0x1385 Netgear +vendor CISCOLINKSYS 0x13b1 Cisco-Linksys vendor SHARK 0x13d2 Shark vendor NOVATEL 0x1410 Novatel Wireless +vendor WISTRONNEWEB 0x1435 Wistron NeWeb vendor RADIOSHACK 0x1453 Radio Shack vendor HUAWEI3COM 0x1472 Huawei 3Com vendor SILICOM 0x1485 Silicom vendor RALINK 0x148f Ralink Technology vendor IMAGINATION 0x149a Imagination Technologies vendor CONCEPTRONIC2 0x14b2 Conceptronic +vendor PLANEX3 0x14ea Planex Communications vendor SILICONPORTALS 0x1527 Silicon Portals vendor UBIQUAM 0x1529 UBIQUAM Co., Ltd. +vendor UBLOX 0x1546 U-blox vendor PNY 0x154b PNY +vendor OQO 0x1557 OQO +vendor UMEDIA 0x157e U-MEDIA Communications vendor SOHOWARE 0x15e8 SOHOware vendor UMAX 0x1606 UMAX vendor INSIDEOUT 0x1608 Inside Out Networks @@ -551,6 +559,7 @@ vendor GLOBALSUN 0x16ab Global Sun Technology vendor ANYDATA 0x16d5 AnyData Corporation vendor CMOTECH 0x16d8 CMOTECH CO., LTD. +vendor LINKSYS4 0x1737 Linksys vendor AMIT 0x18c5 AMIT vendor QCOM 0x18e8 Qcom vendor LINKSYS3 0x1915 Linksys @@ -611,9 +620,12 @@ product ABOCOM XX5 0x4007 XX5 product ABOCOM XX6 0x400b XX6 product ABOCOM XX7 0x400c XX7 +product ABOCOM RTL8151 0x401a RTL8151 product ABOCOM XX8 0x4102 XX8 product ABOCOM XX9 0x4104 XX9 +product ABOCOM UF200 0x420a UF200 Ethernet product ABOCOM XX10 0xabc1 XX10 +product ABOCOM BWU613 0xb000 BWU613 product ABOCOM HWU54DM 0xb21b HWU54DM product ABOCOM RT2573_2 0xb21c RT2573 product ABOCOM RT2573_3 0xb21d RT2573 @@ -622,11 +634,18 @@ /* Accton products */ product ACCTON USB320_EC 0x1046 USB320-EC Ethernet +product ACCTON 2664W 0x3501 2664W +product ACCTON 111 0x3503 T-Sinus 111 WLAN +product ACCTON SMCWUSBG 0x4505 SMCWUSB-G product ACCTON SS1001 0x5046 SpeedStream Ethernet +product ACCTON ZD1211B 0xe501 ZD1211B /* Aceeca products */ product ACEECA MEZ1000 0x0001 Aceeca Mez1000 RDA +/* Acer Communications & Multimedia (oemd by Surecom) */ +product ACERCM EP1427X2 0x0893 EP-1427X-2 Ethernet + /* Acer Labs products */ product ACERLABS M5632 0x5632 USB 2.0 Data Link @@ -752,6 +771,8 @@ /* ASIX Electronics products */ product ASIX AX88172 0x1720 10/100 ethernet +product ASIX AX88178 0x1780 AX88178 +product ASIX AX88772 0x7720 AX88772 /* ASUS products */ product ASUS WL167G 0x1707 WL-167g wireless adapter @@ -791,25 +812,34 @@ /* Belkin products */ /*product BELKIN F5U111 0x???? F5U111 Ethernet*/ -product BELKIN2 F5U002 0x0002 F5U002 Parallel printer -product BELKIN USB2LAN 0x0121 USB to LAN +product BELKIN F5D6050 0x0050 F5D6050 802.11b Wireless adapter +product BELKIN FBT001V 0x0081 FBT001v2 Bluetooth +product BELKIN FBT003V 0x0084 FBT003v2 Bluetooth product BELKIN F5U103 0x0103 F5U103 Serial product BELKIN F5U109 0x0109 F5U109 Serial +product BELKIN SCSI 0x0115 SCSI +product BELKIN USB2LAN 0x0121 USB to LAN product BELKIN F5U208 0x0208 F5U208 VideoBus II +product BELKIN F5U237 0x0237 F5U237 USB 2.0 7-Port Hub +product BELKIN F5U257 0x0257 F5U257 Serial product BELKIN F5U409 0x0409 F5U409 Serial product BELKIN F6C550AVR 0x0551 F6C550-AVR UPS product BELKIN F5U120 0x1203 F5U120-PC Hub +product BELKIN ZD1211B 0x4050 ZD1211B +product BELKIN F5D5055 0x5055 F5D5055 product BELKIN F5D7050 0x7050 F5D7050 wireless adapter product BELKIN F5D7051 0x7051 F5D7051 54g USB Network Adapter product BELKIN F5D7050A 0x705a F5D7050A wireless adapter product BELKIN F5D7050_V4000 0x705c F5D7050 v4000 wireless adapter product BELKIN F5D9050V3 0x905b F5D9050 ver 3 wireless adapter +product BELKIN2 F5U002 0x0002 F5U002 Parallel printer /* Billionton products */ product BILLIONTON USB100 0x0986 USB100N 10/100 FastEthernet product BILLIONTON USBLP100 0x0987 USB100LP product BILLIONTON USBEL100 0x0988 USB100EL product BILLIONTON USBE100 0x8511 USBE100 +product BILLIONTON USB2AR 0x90ff USB2AR Ethernet /* Broadcom products */ product BROADCOM BCM2033 0x2033 BCM2033 Bluetooth USB dongle @@ -854,8 +884,13 @@ product CHICONY KB8933 0x0001 KB-8933 keyboard /* Cisco-Linksys products */ +product CISCOLINKSYS WUSB54G 0x000d WUSB54G wireless adapter +product CISCOLINKSYS WUSB54GP 0x0011 WUSB54GP wireless adapter +product CISCOLINKSYS USB200MV2 0x0018 USB200M v2 +product CISCOLINKSYS HU200TS 0x001a HU200TS wireless adapter product CISCOLINKSYS WUSB54GC 0x0020 WUSB54GC product CISCOLINKSYS WUSB54GR 0x0023 WUSB54GR +product CISCOLINKSYS WUSBF54G 0x0024 WUSBF54G /* CMOTECH products */ product CMOTECH CNU510 0x5141 CMOTECH CDMA Technologies USB modem @@ -872,7 +907,12 @@ /* Corega products */ product COREGA ETHER_USB_T 0x0001 Ether USB-T product COREGA FETHER_USB_TX 0x0004 FEther USB-TX +product COREGA WLAN_USB_USB_11 0x000c WirelessLAN USB-11 product COREGA FETHER_USB_TXS 0x000d FEther USB-TXS +product COREGA WLANUSB 0x0012 Wireless LAN Stick-11 +product COREGA FETHER_USB2_TX 0x0017 FEther USB2-TX +product COREGA WLUSB_11_KEY 0x001a ULUSB-11 Key +product COREGA WLUSB_11_STICK 0x7613 WLAN USB Stick 11 product COREGA FETHER_USB_TXC 0x9601 FEther USB-TXC /* Creative products */ @@ -937,17 +977,18 @@ /*product DLINK DSBS25 0x0100 DSB-S25 serial*/ product DLINK DUBE100 0x1a00 10/100 ethernet product DLINK DSB650TX4 0x200c 10/100 ethernet -product DLINK DWLG122 0x3c00 DWL-G122 b1 wireless adapter -product DLINK DWLAG122 0x3a04 DWL-AG122 -product DLINK DWLAG122_NF 0x3a05 DWL-AG122 (no firmware) +product DLINK DWL120E 0x3200 DWL-120 rev E +product DLINK DWL122 0x3700 DWL-122 +product DLINK DWLG120 0x3701 DWL-G120 +product DLINK DWL120F 0x3702 DWL-120 rev F product DLINK DWLAG132 0x3a00 DWL-AG132 product DLINK DWLAG132_NF 0x3a01 DWL-AG132 (no firmware) product DLINK DWLG132 0x3a02 DWL-G132 product DLINK DWLG132_NF 0x3a03 DWL-G132 (no firmware) product DLINK DWLAG122 0x3a04 DWL-AG122 product DLINK DWLAG122_NF 0x3a05 DWL-AG122 (no firmware) -product DLINK2 DWLG122C1 0x3c03 DWL-G122 c1 -product DLINK2 WUA1340 0x3c04 WUA-1340 +product DLINK DWLG122 0x3c00 DWL-G122 b1 wireless adapter +product DLINK DUBE100B1 0x3c05 DUB-E100 rev B1 product DLINK DSB650C 0x4000 10Mbps ethernet product DLINK DSB650TX1 0x4001 10/100 ethernet product DLINK DSB650TX 0x4002 10/100 ethernet @@ -955,6 +996,8 @@ product DLINK DSB650TX3 0x400b 10/100 ethernet product DLINK DSB650TX2 0x4102 10/100 ethernet product DLINK DSB650 0xabc1 10/100 ethernet +product DLINK2 DWLG122C1 0x3c03 DWL-G122 c1 +product DLINK2 WUA1340 0x3c04 WUA-1340 /* EIZO products */ product EIZO HUB 0x0000 hub @@ -1044,11 +1087,11 @@ product FTDI TACTRIX_OPENPORT_13M 0xcc48 OpenPort 1.3 Mitsubishi product FTDI TACTRIX_OPENPORT_13S 0xcc49 OpenPort 1.3 Subaru product FTDI TACTRIX_OPENPORT_13U 0xcc4a OpenPort 1.3 Universal -product FTDI EISCOU 0xe888 "Expert ISDN Control USB" -product FTDI UOPTBR 0xe889 "USB-RS232 OptoBridge" -product FTDI EMCU2D 0xe88a "Expert mouseCLOCK USB II" -product FTDI PCMSFU 0xe88b "Precision Clock MSF USB" -product FTDI EMCU2H 0xe88c "Expert mouseCLOCK USB II HBG" +product FTDI EISCOU 0xe888 Expert ISDN Control USB +product FTDI UOPTBR 0xe889 USB-RS232 OptoBridge +product FTDI EMCU2D 0xe88a Expert mouseCLOCK USB II +product FTDI PCMSFU 0xe88b Precision Clock MSF USB +product FTDI EMCU2H 0xe88c Expert mouseCLOCK USB II HBG product FTDI USBSERIAL 0xfa00 Matrix Orbital USB Serial product FTDI MX2_3 0xfa01 Matrix Orbital MX2 or MX3 product FTDI MX4_5 0xfa02 Matrix Orbital MX4 or MX5 @@ -1110,6 +1153,7 @@ product GOHUBS GOCOM232 0x1001 GoCOM232 Serial /* Good Way Technology products */ +product GOODWAY GWUSB2E 0x6200 GWUSB2E product GOODWAY RT2573 0xc019 RT2573 /* Gravis products */ @@ -1228,10 +1272,16 @@ /* I/O DATA products */ product IODATA IU_CD2 0x0204 DVD Multi-plus unit iU-CD2 product IODATA DVR_UEH8 0x0206 DVD Multi-plus unit DVR-UEH8 +product IODATA USBSSMRW 0x0314 USB-SSMRW SD-card +product IODATA USBSDRW 0x031e USB-SDRW SD-card product IODATA USBETT 0x0901 USB ETT product IODATA USBETTX 0x0904 USB ETTX product IODATA USBETTXS 0x0913 USB ETTX +product IODATA USBWNB11A 0x0919 USB WN-B11 +product IODATA USBWNB11 0x0922 USB Airport WN-B11 +product IODATA ETGUS2 0x0930 ETG-US2 product IODATA USBRSAQ 0x0a03 Serial USB-RSAQ1 +product IODATA2 USB2SC 0x0a09 USB2.0-SCSI Bridge USB2-SC /* Iomega products */ product IOMEGA ZIP100 0x0001 Zip 100 @@ -1339,9 +1389,7 @@ product LINKSYS2 WUSB11 0x2219 WUSB11 Wireless adapter product LINKSYS2 USB200M 0x2226 USB 2.0 10/100 ethernet product LINKSYS3 WUSB11v28 0x2233 WUSB11 v2.8 wireless adapter -product LINKSYS4 WUSB54G 0x000d WUSB54G wireless adapter -product LINKSYS4 WUSB54GP 0x0011 WUSB54GP wireless adapter -product LINKSYS4 HU200TS 0x001a HU200TS wireless adapter +product LINKSYS4 USB1000 0x0039 USB1000 /* Logitech products */ product LOGITECH M2452 0x0203 M2452 keyboard @@ -1426,9 +1474,16 @@ product MICROSOFT DDS80 0x0014 Digital Sound System 80 product MICROSOFT SIDEWINDER 0x001a Sidewinder Precision Racing Wheel product MICROSOFT INETPRO 0x001c Internet Keyboard Pro +product MICROSOFT TBEXPLORER 0x0024 Trackball Explorer product MICROSOFT INTELLIEYE 0x0025 IntelliEye mouse product MICROSOFT INETPRO2 0x002b Internet Keyboard Pro +product MICROSOFT MN510 0x006e MN510 Wireless product MICROSOFT MN110 0x007a 10/100 USB NIC +product MICROSOFT WLINTELLIMOUSE 0x008c Wireless Optical IntelliMouse +product MICROSOFT WLNOTEBOOK 0x00b9 Wireless Optical Mouse (Model 1023) +product MICROSOFT WLNOTEBOOK2 0x00e1 Wireless Optical Mouse 3000 (Model 1056) +product MICROSOFT WLUSBMOUSE 0x00b9 Wireless USB Mouse +product MICROSOFT XBOX360 0x0292 XBOX 360 WLAN /* Microtech products */ product MICROTECH SCSIDB25 0x0004 USB-SCSI-DB25 @@ -1542,6 +1597,12 @@ /* OnSpec Electronic, Inc. */ product ONSPEC UCF100 0xa400 FlashLink UCF-100 CompactFlash Reader +/* OQO */ +product OQO WIFI01 0x0002 model 01 WiFi interface +product OQO BT01 0x0003 model 01 Bluetooth interface +product OQO ETHER01PLUS 0x7720 model 01+ Ethernet +product OQO ETHER01 0x8150 model 01 Ethernet interface + /* Palm Computing, Inc. product */ product PALM SERIAL 0x0080 USB Serial product PALM M500 0x0001 Palm m500 @@ -1585,9 +1646,15 @@ product PIENGINEERING PS2USB 0x020b PS2 to Mac USB Adapter /* Planex Communications products */ +product PLANEX GW_US11H 0x14ea GW-US11H WLAN +product PLANEX2 GW_US11S 0x3220 GW-US11S WLAN product PLANEX2 GWUS54HP 0xab01 GW-US54HP product PLANEX2 GWUS54MINI2 0xab50 GW-US54Mini2 +product PLANEX2 GWUS54SG 0xc002 GW-US54SG +product PLANEX2 GWUS54GZL 0xc007 GW-US54GZL product PLANEX2 GWUSMM 0xed02 GW-USMM +product PLANEX3 GU1000T 0xab11 GU-1000T +product PLANEX3 GWUS54MINI 0xab13 GW-US54Mini /* Plextor Corp. */ product PLEXTOR 40_12_40U 0x0011 PlexWriter 40/12/40U @@ -1744,7 +1811,7 @@ /* Also: Omnidirectional Control Technology products */ product SIIG DIGIFILMREADER 0x0004 DigiFilm-Combo Reader product SIIG WINTERREADER 0x0330 WINTERREADER Reader -product SIIG2 USBTOETHER 0x0109 USB TO Ethernet +product SIIG2 USBTOETHER 0x0109 USB TO Ethernet product SIIG2 US2308 0x0421 Serial /* Silicom products */ @@ -1761,8 +1828,12 @@ /* Sitecom products */ product SITECOM LN029 0x182d USB 2.0 Ethernet product SITECOM SERIAL 0x2068 USB to serial cable (v2) +product SITECOM2 WL022 0x182d WL-022 /* Sitecom Europe products */ +product SITECOMEU LN028 0x061c LN-028 +product SITECOMEU WL113 0x9071 WL-113 +product SITECOMEU ZD1211B 0x9075 ZD1211B product SITECOMEU WL172 0x90ac WL-172 product SITECOMEU WL113R2 0x9712 WL-113 rev 2 @@ -1825,9 +1896,9 @@ product SUNTAC AS144L4 0x0011 SUNTAC U-Cable type A4 /* Sun Microsystems products */ -product SUN2 KEYBOARD 0x0005 Type 6 USB keyboard +product SUN KEYBOARD 0x0005 Type 6 USB keyboard /* XXX The above is a North American PC style keyboard possibly */ -product SUN2 MOUSE 0x0100 Type 6 USB mouse +product SUN MOUSE 0x0100 Type 6 USB mouse /* Supra products */ product DIAMOND2 SUPRAEXPRESS56K 0x07da Supra Express 56K modem ==== //depot/projects/soc2007/rpaulo-macbook/fs/tmpfs/tmpfs.h#2 (text+ko) ==== @@ -36,7 +36,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/tmpfs/tmpfs.h,v 1.1 2007/06/16 01:56:04 delphij Exp $ + * $FreeBSD: src/sys/fs/tmpfs/tmpfs.h,v 1.3 2007/06/26 02:07:08 delphij Exp $ */ #ifndef _FS_TMPFS_TMPFS_H_ @@ -268,7 +268,7 @@ struct tmpfs_mount { /* Maximum number of memory pages available for use by the file * system, set during mount time. This variable must never be - * used directly as it may be bigger that the current amount of + * used directly as it may be bigger than the current amount of * free memory; in the extreme case, it will hold the SIZE_MAX * value. Instead, use the TMPFS_PAGES_MAX macro. */ size_t tm_pages_max; @@ -314,7 +314,6 @@ * they will go into the available list, remaining alive until the * file system is unmounted. */ struct tmpfs_node_list tm_nodes_used; - struct tmpfs_node_list tm_nodes_avail; /* All node lock to protect the node list and tmp_pages_used */ struct mtx allnode_lock; @@ -470,10 +469,14 @@ } /* Returns the available space for the given file system. */ -#define TMPFS_META_SIZE(tmp) ((tmp)->tm_nodes_inuse * (sizeof(struct tmpfs_node) \ - + sizeof(struct dirent))) -#define TMPFS_PAGES_AVAIL(tmp) (TMPFS_PAGES_MAX(tmp) - (tmp)->tm_pages_used - \ - TMPFS_META_SIZE(tmp) / PAGE_SIZE - 1) +#define TMPFS_META_PAGES(tmp) ((tmp)->tm_nodes_inuse * (sizeof(struct tmpfs_node) \ + + sizeof(struct tmpfs_dirent))/PAGE_SIZE + 1) +#define TMPFS_FILE_PAGES(tmp) ((tmp)->tm_pages_used) + +#define TMPFS_PAGES_AVAIL(tmp) (TMPFS_PAGES_MAX(tmp) > \ + TMPFS_META_PAGES(tmp)+TMPFS_FILE_PAGES(tmp)? \ + TMPFS_PAGES_MAX(tmp) - TMPFS_META_PAGES(tmp) \ + - TMPFS_FILE_PAGES(tmp):0) #endif ==== //depot/projects/soc2007/rpaulo-macbook/fs/tmpfs/tmpfs_fifoops.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $NetBSD: tmpfs_fifoops.h,v 1.3.2.2 2005/12/11 10:29:11 christos Exp $ */ +/* $NetBSD: tmpfs_fifoops.h,v 1.4 2005/12/03 17:34:44 christos Exp $ */ /* * Copyright (c) 2005 The NetBSD Foundation, Inc. @@ -36,7 +36,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/tmpfs/tmpfs_fifoops.h,v 1.1 2007/06/16 01:56:04 delphij Exp $ + * $FreeBSD: src/sys/fs/tmpfs/tmpfs_fifoops.h,v 1.2 2007/06/26 02:07:08 delphij Exp $ */ #ifndef _FS_TMPFS_TMPFS_FIFOOPS_H_ ==== //depot/projects/soc2007/rpaulo-macbook/fs/tmpfs/tmpfs_subr.c#3 (text+ko) ==== @@ -41,7 +41,7 @@ * Efficient memory file system supporting functions. */ #include -__FBSDID("$FreeBSD: src/sys/fs/tmpfs/tmpfs_subr.c,v 1.3 2007/06/18 14:40:19 delphij Exp $"); +__FBSDID("$FreeBSD: src/sys/fs/tmpfs/tmpfs_subr.c,v 1.4 2007/06/25 18:46:13 delphij Exp $"); #include #include @@ -100,47 +100,23 @@ MPASS(IFF(type == VLNK, target != NULL)); MPASS(IFF(type == VBLK || type == VCHR, rdev != VNOVAL)); - nnode = NULL; + if (tmp->tm_nodes_inuse > tmp->tm_nodes_max) + return (ENOSPC); - TMPFS_LOCK(tmp); - if (LIST_EMPTY(&tmp->tm_nodes_avail)) { - MPASS(tmp->tm_nodes_last <= tmp->tm_nodes_max); - if (tmp->tm_nodes_last == tmp->tm_nodes_max) { - TMPFS_UNLOCK(tmp); - return ENOSPC; - } - TMPFS_UNLOCK(tmp); - nnode = (struct tmpfs_node *)tmpfs_zone_alloc( - tmp->tm_node_pool, M_WAITOK); - if (nnode == NULL) - return ENOSPC; - nnode->tn_id = tmp->tm_nodes_last++; - nnode->tn_gen = arc4random(); - } else { - nnode = LIST_FIRST(&tmp->tm_nodes_avail); - LIST_REMOVE(nnode, tn_entries); - TMPFS_UNLOCK(tmp); - nnode->tn_gen++; - } - MPASS(nnode != NULL); + nnode = (struct tmpfs_node *)uma_zalloc_arg( + tmp->tm_node_pool, tmp, M_WAITOK); + if (nnode == NULL) + return (ENOSPC); /* Generic initialization. */ nnode->tn_type = type; - nnode->tn_size = 0; - nnode->tn_status = 0; - nnode->tn_flags = 0; - nnode->tn_links = 0; nanotime(&nnode->tn_atime); nnode->tn_birthtime = nnode->tn_ctime = nnode->tn_mtime = nnode->tn_atime; nnode->tn_uid = uid; nnode->tn_gid = gid; nnode->tn_mode = mode; - nnode->tn_lockf = NULL; - nnode->tn_vnode = NULL; - nnode->tn_vpstate = 0; - mtx_init(&nnode->tn_interlock, "tmpfs node interlock", NULL, MTX_DEF); /* Type-specific initialization. */ switch (nnode->tn_type) { case VBLK: @@ -169,7 +145,7 @@ M_WAITOK, nnode->tn_size); if (nnode->tn_link == NULL) { nnode->tn_type = VNON; - tmpfs_free_node(tmp, nnode); + uma_zfree(tmp->tm_node_pool, nnode); return ENOSPC; } memcpy(nnode->tn_link, target, nnode->tn_size); @@ -216,9 +192,7 @@ void tmpfs_free_node(struct tmpfs_mount *tmp, struct tmpfs_node *node) { - ino_t id; - unsigned long gen; - size_t pages; + size_t pages = 0; TMPFS_LOCK(tmp); LIST_REMOVE(node, tn_entries); @@ -240,38 +214,28 @@ case VFIFO: /* FALLTHROUGH */ case VSOCK: - pages = 0; break; case VLNK: tmpfs_str_zone_free(&tmp->tm_str_pool, node->tn_link, node->tn_size); - pages = 0; break; case VREG: if (node->tn_reg.tn_aobj != NULL) { vm_object_deallocate(node->tn_reg.tn_aobj); - node->tn_reg.tn_aobj = 0; } pages = node->tn_reg.tn_aobj_pages; break; default: MPASS(0); - pages = 0; /* Shut up gcc when !DIAGNOSTIC. */ break; } - id = node->tn_id; - gen = node->tn_gen; - memset(node, 0, sizeof(struct tmpfs_node)); - node->tn_id = id; - node->tn_type = VNON; - node->tn_gen = gen; + uma_zfree(tmp->tm_node_pool, node); TMPFS_LOCK(tmp); - LIST_INSERT_HEAD(&tmp->tm_nodes_avail, node, tn_entries); tmp->tm_pages_used -= pages; TMPFS_UNLOCK(tmp); } @@ -293,14 +257,14 @@ { struct tmpfs_dirent *nde; - nde = (struct tmpfs_dirent *)tmpfs_zone_alloc( + nde = (struct tmpfs_dirent *)uma_zalloc( tmp->tm_dirent_pool, M_WAITOK); if (nde == NULL) return ENOSPC; nde->td_name = tmpfs_str_zone_alloc(&tmp->tm_str_pool, M_WAITOK, len); if (nde->td_name == NULL) { - tmpfs_zone_free(tmp->tm_dirent_pool, nde); + uma_zfree(tmp->tm_dirent_pool, nde); return ENOSPC; } nde->td_namelen = len; @@ -339,7 +303,7 @@ } tmpfs_str_zone_free(&tmp->tm_str_pool, de->td_name, de->td_namelen); - tmpfs_zone_free(tmp->tm_dirent_pool, de); + uma_zfree(tmp->tm_dirent_pool, de); } /* --------------------------------------------------------------------- */ @@ -576,7 +540,6 @@ dnode->tn_size += sizeof(struct tmpfs_dirent); dnode->tn_status |= TMPFS_NODE_ACCESSED | TMPFS_NODE_CHANGED | \ TMPFS_NODE_MODIFIED; - vnode_pager_setsize(vp, dnode->tn_size); } /* --------------------------------------------------------------------- */ @@ -602,8 +565,6 @@ dnode->tn_size -= sizeof(struct tmpfs_dirent); dnode->tn_status |= TMPFS_NODE_ACCESSED | TMPFS_NODE_CHANGED | \ TMPFS_NODE_MODIFIED; - - vnode_pager_setsize(vp, dnode->tn_size); } /* --------------------------------------------------------------------- */ @@ -905,7 +866,7 @@ node->tn_size = newsize; vnode_pager_setsize(vp, newsize); if (newsize < oldsize) { - int zerolen = MIN(round_page(newsize), node->tn_size) - newsize; + size_t zerolen = MIN(round_page(newsize), node->tn_size) - newsize; struct vm_object *uobj = node->tn_reg.tn_aobj; vm_page_t m; ==== //depot/projects/soc2007/rpaulo-macbook/fs/tmpfs/tmpfs_uma.c#2 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jun 27 14:00:01 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A334F16A46B; Wed, 27 Jun 2007 14:00:01 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7535516A41F for ; Wed, 27 Jun 2007 14:00:01 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 5EA9E13C483 for ; Wed, 27 Jun 2007 14:00:01 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5RE01qU043455 for ; Wed, 27 Jun 2007 14:00:01 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5RE01NM043450 for perforce@freebsd.org; Wed, 27 Jun 2007 14:00:01 GMT (envelope-from rdivacky@FreeBSD.org) Date: Wed, 27 Jun 2007 14:00:01 GMT Message-Id: <200706271400.l5RE01NM043450@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 122403 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Jun 2007 14:00:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=122403 Change 122403 by rdivacky@rdivacky_witten on 2007/06/27 13:59:49 Style(9) + change mode param in kern_chmod to mode_t to be consistent with kern_lchmod. Affected files ... .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#32 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/syscallsubr.h#13 edit Differences ... ==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#32 (text+ko) ==== @@ -966,7 +966,8 @@ int openat(struct thread *td, struct openat_args *args) { - return kern_openat(td, args->path, UIO_USERSPACE, args->flag, args->mode, args->fd); + return kern_openat(td, args->path, UIO_USERSPACE, args->flag, + args->mode, args->fd); } int @@ -1041,8 +1042,8 @@ if (error && !kern_absolute_path(path, pathseg)) return (error); - NDINIT_AT(&nd, LOOKUP, ((error) ? ATBADF : 0) | FOLLOW | AUDITVNODE1 - | MPSAFE, pathseg, path, td, dir_vn); + NDINIT_AT(&nd, LOOKUP, ((error) ? ATBADF : 0) | FOLLOW | AUDITVNODE1 | + MPSAFE, pathseg, path, td, dir_vn); if ((flags & O_ACCMODE) == O_ACCMODE) { error = EINVAL; @@ -1224,7 +1225,8 @@ int mknodat(struct thread *td, struct mknodat_args *args) { - return kern_mknodat(td, args->path, UIO_USERSPACE, args->mode, args->dev, args->fd); + return kern_mknodat(td, args->path, UIO_USERSPACE, args->mode, + args->dev, args->fd); } int @@ -1272,8 +1274,8 @@ if (error && !kern_absolute_path(path, pathseg)) return (error); bwillwrite(); - NDINIT_AT(&nd, CREATE, ((error) ? ATBADF : 0) | LOCKPARENT | SAVENAME - | MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn); + NDINIT_AT(&nd, CREATE, ((error) ? ATBADF : 0) | LOCKPARENT | + SAVENAME | MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn); if ((error = namei(&nd)) != 0) { if (dir_vn) vrele(dir_vn); @@ -1395,7 +1397,8 @@ } int -kern_mkfifoat(struct thread *td, char *path, enum uio_seg pathseg, int mode, int dirfd) +kern_mkfifoat(struct thread *td, char *path, enum uio_seg pathseg, int mode, + int dirfd) { struct mount *mp; struct vattr vattr; @@ -1412,8 +1415,8 @@ if (error && !kern_absolute_path(path, pathseg)) return (error); bwillwrite(); - NDINIT_AT(&nd, CREATE, ((error) ? ATBADF : 0) | LOCKPARENT | SAVENAME - | MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn); + NDINIT_AT(&nd, CREATE, ((error) ? ATBADF : 0) | LOCKPARENT | + SAVENAME | MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn); if ((error = namei(&nd)) != 0) { if (dir_vn) vrele(dir_vn); @@ -1509,9 +1512,11 @@ return (EINVAL); if (args->flag & AT_SYMLINK_FOLLOW) - return kern_linkat(td, args->path1, args->path2, UIO_USERSPACE, args->fd1, args->fd2, FOLLOW); + return kern_linkat(td, args->path1, args->path2, + UIO_USERSPACE, args->fd1, args->fd2, FOLLOW); else - return kern_linkat(td, args->path1, args->path2, UIO_USERSPACE, args->fd1, args->fd2, 0); + return kern_linkat(td, args->path1, args->path2, + UIO_USERSPACE, args->fd1, args->fd2, 0); } static int hardlink_check_uid = 0; @@ -1575,15 +1580,15 @@ if (error && !kern_absolute_path(path, segflg)) return (error); - NDINIT_AT(&ndp, LOOKUP, ((error) ? ATBADF : 0) | follow | MPSAFE - | AUDITVNODE1, segflg, path, td, pdir_vn); + NDINIT_AT(&ndp, LOOKUP, ((error) ? ATBADF : 0) | follow | MPSAFE | + AUDITVNODE1, segflg, path, td, pdir_vn); error = kern_get_at(td, newdirfd, &ldir_vn); if (error && !kern_absolute_path(link, segflg)) return (error); - NDINIT_AT(&ndl, CREATE, ((error) ? ATBADF : 0) | LOCKPARENT | SAVENAME - | MPSAFE | AUDITVNODE1, segflg, link, td, ldir_vn); + NDINIT_AT(&ndl, CREATE, ((error) ? ATBADF : 0) | LOCKPARENT | + SAVENAME | MPSAFE | AUDITVNODE1, segflg, link, td, ldir_vn); bwillwrite(); if ((error = namei(&ndp)) != 0) @@ -1708,8 +1713,8 @@ if (error && !kern_absolute_path(link, segflg)) return (error); bwillwrite(); - NDINIT_AT(&nd, CREATE, ((error) ? ATBADF : 0) | LOCKPARENT | SAVENAME - | MPSAFE | AUDITVNODE1, segflg, link, td, dir_vn); + NDINIT_AT(&nd, CREATE, ((error) ? ATBADF : 0) | LOCKPARENT | + SAVENAME | MPSAFE | AUDITVNODE1, segflg, link, td, dir_vn); if ((error = namei(&nd)) != 0) goto out; vfslocked = NDHASGIANT(&nd); @@ -1876,8 +1881,8 @@ if (error && !kern_absolute_path(path, pathseg)) return (error); bwillwrite(); - NDINIT_AT(&nd, DELETE, ((error) ? ATBADF : 0) | LOCKPARENT | LOCKLEAF - | MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn); + NDINIT_AT(&nd, DELETE, ((error) ? ATBADF : 0) | LOCKPARENT | + LOCKLEAF | MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn); if ((error = namei(&nd)) != 0) { if (dir_vn) vrele(dir_vn); @@ -2150,8 +2155,8 @@ if (error && !kern_absolute_path(path, pathseg)) return (error); - NDINIT_AT(&nd, LOOKUP, ((error) ? ATBADF : 0) | FOLLOW | LOCKLEAF - | MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn); + NDINIT_AT(&nd, LOOKUP, ((error) ? ATBADF : 0) | FOLLOW | LOCKLEAF | + MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn); /* * Create and modify a temporary credential instead of one that @@ -2369,7 +2374,8 @@ } int -kern_statat(struct thread *td, char *path, enum uio_seg pathseg, struct stat *sbp, int dirfd) +kern_statat(struct thread *td, char *path, enum uio_seg pathseg, + struct stat *sbp, int dirfd) { struct nameidata nd; struct vnode *dir_vn; @@ -2380,8 +2386,8 @@ if (error && !kern_absolute_path(path, pathseg)) return (error); - NDINIT_AT(&nd, LOOKUP, ((error) ? ATBADF : 0) | FOLLOW | LOCKSHARED - | LOCKLEAF | AUDITVNODE1 | MPSAFE, pathseg, path, td, dir_vn); + NDINIT_AT(&nd, LOOKUP, ((error) ? ATBADF : 0) | FOLLOW | LOCKSHARED | + LOCKLEAF | AUDITVNODE1 | MPSAFE, pathseg, path, td, dir_vn); if ((error = namei(&nd)) != 0) goto out; @@ -2437,7 +2443,8 @@ } int -kern_lstatat(struct thread *td, char *path, enum uio_seg pathseg, struct stat *sbp, int dirfd) +kern_lstatat(struct thread *td, char *path, enum uio_seg pathseg, + struct stat *sbp, int dirfd) { struct nameidata nd; struct vnode *dir_vn; @@ -2449,8 +2456,8 @@ if (error && !kern_absolute_path(path, pathseg)) return (error); - NDINIT_AT(&nd, LOOKUP, ((error) ? ATBADF : 0) | NOFOLLOW | LOCKLEAF - | LOCKSHARED | AUDITVNODE1 | MPSAFE, pathseg, path, td, dir_vn); + NDINIT_AT(&nd, LOOKUP, ((error) ? ATBADF : 0) | NOFOLLOW | LOCKLEAF | + LOCKSHARED | AUDITVNODE1 | MPSAFE, pathseg, path, td, dir_vn); if ((error = namei(&nd)) != 0) goto out; @@ -2630,7 +2637,7 @@ ssize_t readlinkat(struct thread *td, struct readlinkat_args *args) { - return kern_readlinkat(td, args->path, UIO_USERSPACE, + return kern_readlinkat(td, args->path, UIO_USERSPACE, args->buf, UIO_USERSPACE, args->bufsize, args->fd); } @@ -2656,8 +2663,8 @@ if (error && !kern_absolute_path(path, pathseg)) return (error); - NDINIT_AT(&nd, LOOKUP, ((error) ? ATBADF : 0) | NOFOLLOW | LOCKLEAF - | MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn); + NDINIT_AT(&nd, LOOKUP, ((error) ? ATBADF : 0) | NOFOLLOW | LOCKLEAF | + MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn); if ((error = namei(&nd)) != 0) goto out; @@ -2901,9 +2908,11 @@ return (EINVAL); if (args->flag & AT_SYMLINK_NOFOLLOW) - return kern_lchmodat(td, args->path, UIO_USERSPACE, args->mode, args->dirfd); + return kern_lchmodat(td, args->path, UIO_USERSPACE, + args->mode, args->dirfd); else - return kern_chmodat(td, args->path, UIO_USERSPACE, args->mode, args->dirfd); + return kern_chmodat(td, args->path, UIO_USERSPACE, + args->mode, args->dirfd); } int @@ -2913,7 +2922,8 @@ } int -kern_chmodat(struct thread *td, char *path, enum uio_seg pathseg, int mode, int dirfd) +kern_chmodat(struct thread *td, char *path, enum uio_seg pathseg, + mode_t mode, int dirfd) { struct nameidata nd; struct vnode *dir_vn; @@ -2923,8 +2933,8 @@ if (error && !kern_absolute_path(path, pathseg)) return (error); - NDINIT_AT(&nd, LOOKUP, ((error) ? ATBADF : 0) | FOLLOW | MPSAFE - | AUDITVNODE1, pathseg, path, td, dir_vn); + NDINIT_AT(&nd, LOOKUP, ((error) ? ATBADF : 0) | FOLLOW | MPSAFE | + AUDITVNODE1, pathseg, path, td, dir_vn); if ((error = namei(&nd)) != 0) goto out; @@ -2961,7 +2971,8 @@ int -kern_lchmodat(struct thread *td, char *path, enum uio_seg pathseg, mode_t mode, int dirfd) +kern_lchmodat(struct thread *td, char *path, enum uio_seg pathseg, + mode_t mode, int dirfd) { int error; struct nameidata nd; @@ -3087,13 +3098,12 @@ if (args->flag & AT_SYMLINK_NOFOLLOW) return kern_lchownat(td, args->path, UIO_USERSPACE, args->uid, - args->gid, args->dirfd); + args->gid, args->dirfd); else return kern_chownat(td, args->path, UIO_USERSPACE, args->uid, - args->gid, args->dirfd); + args->gid, args->dirfd); } - int kern_chown(struct thread *td, char *path, enum uio_seg pathseg, int uid, int gid) @@ -3113,8 +3123,8 @@ if (error && !kern_absolute_path(path, pathseg)) return (error); - NDINIT_AT(&nd, LOOKUP, ((error) ? ATBADF : 0) | FOLLOW | MPSAFE - | AUDITVNODE1, pathseg, path, td, dir_vn); + NDINIT_AT(&nd, LOOKUP, ((error) ? ATBADF : 0) | FOLLOW | MPSAFE | + AUDITVNODE1, pathseg, path, td, dir_vn); if ((error = namei(&nd)) != 0) goto out; @@ -3171,8 +3181,8 @@ if (error && !kern_absolute_path(path, pathseg)) return (error); - NDINIT_AT(&nd, LOOKUP, ((error) ? ATBADF : 0) | NOFOLLOW | MPSAFE - | AUDITVNODE1, pathseg, path, td, dir_vn); + NDINIT_AT(&nd, LOOKUP, ((error) ? ATBADF : 0) | NOFOLLOW | MPSAFE | + AUDITVNODE1, pathseg, path, td, dir_vn); if ((error = namei(&nd)) != 0) goto out; @@ -3354,8 +3364,8 @@ if (error && !kern_absolute_path(path, pathseg)) return (error); - NDINIT_AT(&nd, LOOKUP, ((error) ? ATBADF : 0) | FOLLOW | AUDITVNODE1 - | MPSAFE, pathseg, path, td, dir_vn); + NDINIT_AT(&nd, LOOKUP, ((error) ? ATBADF : 0) | FOLLOW | AUDITVNODE1 | + MPSAFE, pathseg, path, td, dir_vn); if ((error = getutimes(tptr, tptrseg, ts)) != 0) goto out; @@ -3727,7 +3737,8 @@ int renameat(struct thread *td, struct renameat_args *args) { - return kern_renameat(td, args->old, args->new, UIO_USERSPACE, args->oldfd, args->newfd); + return kern_renameat(td, args->old, args->new, UIO_USERSPACE, + args->oldfd, args->newfd); } int @@ -3737,7 +3748,8 @@ } int -kern_renameat(struct thread *td, char *from, char *to, enum uio_seg pathseg, int fdirfd, int tdirfd) +kern_renameat(struct thread *td, char *from, char *to, enum uio_seg pathseg, + int fdirfd, int tdirfd) { struct nameidata fromnd, tond; struct vnode *fdir_vn, *tdir_vn; @@ -3755,14 +3767,15 @@ return (error); #ifdef MAC - NDINIT_AT(&fromnd, DELETE, ((error) ? ATBADF : 0) | LOCKPARENT | LOCKLEAF - | SAVESTART | MPSAFE | AUDITVNODE1, pathseg, from, td, fdir_vn); + NDINIT_AT(&fromnd, DELETE, ((error) ? ATBADF : 0) | LOCKPARENT | + LOCKLEAF | SAVESTART | MPSAFE | AUDITVNODE1, pathseg, from, td, fdir_vn); #else - NDINIT_AT(&fromnd, DELETE, ((error) ? ATBADF : 0) | WANTPARENT | SAVESTART - | MPSAFE | AUDITVNODE1, pathseg, from, td, fdir_vn); + NDINIT_AT(&fromnd, DELETE, ((error) ? ATBADF : 0) | WANTPARENT | + SAVESTART | MPSAFE | AUDITVNODE1, pathseg, from, td, fdir_vn); #endif - NDINIT_AT(&tond, RENAME, ((error) ? ATBADF : 0) | LOCKPARENT | LOCKLEAF - | NOCACHE | SAVESTART | MPSAFE | AUDITVNODE2, pathseg, to, td, tdir_vn); + NDINIT_AT(&tond, RENAME, ((error) ? ATBADF : 0) | LOCKPARENT | + LOCKLEAF | NOCACHE | SAVESTART | MPSAFE | AUDITVNODE2, + pathseg, to, td, tdir_vn); bwillwrite(); if ((error = namei(&fromnd)) != 0) @@ -3923,8 +3936,8 @@ if (error && !kern_absolute_path(path, segflg)) return (error); bwillwrite(); - NDINIT_AT(&nd, CREATE, ((error) ? ATBADF : 0) | LOCKPARENT | SAVENAME - | MPSAFE | AUDITVNODE1, segflg, path, td, dir_vn); + NDINIT_AT(&nd, CREATE, ((error) ? ATBADF : 0) | LOCKPARENT | + SAVENAME | MPSAFE | AUDITVNODE1, segflg, path, td, dir_vn); nd.ni_cnd.cn_flags |= WILLBEDIR; if ((error = namei(&nd)) != 0) { if (dir_vn) @@ -4027,8 +4040,8 @@ if (error && !kern_absolute_path(path, pathseg)) return (error); bwillwrite(); - NDINIT_AT(&nd, DELETE, ((error) ? ATBADF : 0) | LOCKPARENT | LOCKLEAF - | MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn); + NDINIT_AT(&nd, DELETE, ((error) ? ATBADF : 0) | LOCKPARENT | + LOCKLEAF | MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn); if ((error = namei(&nd)) != 0) return (error); vfslocked = NDHASGIANT(&nd); ==== //depot/projects/soc2007/rdivacky/linux_at/sys/sys/syscallsubr.h#13 (text+ko) ==== @@ -67,7 +67,7 @@ int kern_chmod(struct thread *td, char *path, enum uio_seg pathseg, int mode); int kern_chmodat(struct thread *td, char *path, enum uio_seg pathseg, - int mode, int dirfd); + mode_t mode, int dirfd); int kern_chown(struct thread *td, char *path, enum uio_seg pathseg, int uid, int gid); int kern_lchmodat(struct thread *td, char *path, enum uio_seg pathseg, From owner-p4-projects@FreeBSD.ORG Wed Jun 27 14:18:25 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8C38E16A469; Wed, 27 Jun 2007 14:18:25 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 44F8216A400 for ; Wed, 27 Jun 2007 14:18:25 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 1EBA113C457 for ; Wed, 27 Jun 2007 14:18:25 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5REIPF7047097 for ; Wed, 27 Jun 2007 14:18:25 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5REIOIu047094 for perforce@freebsd.org; Wed, 27 Jun 2007 14:18:24 GMT (envelope-from rdivacky@FreeBSD.org) Date: Wed, 27 Jun 2007 14:18:24 GMT Message-Id: <200706271418.l5REIOIu047094@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 122404 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Jun 2007 14:18:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=122404 Change 122404 by rdivacky@rdivacky_witten on 2007/06/27 14:17:32 Remove some left-over debugging printf. Affected files ... .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_file.c#13 edit Differences ... ==== //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_file.c#13 (text+ko) ==== @@ -198,9 +198,9 @@ #ifdef DEBUG if (ldebug(openat)) -#endif printf(ARGS(openat, "%i, %s, 0x%x, 0x%x"), args->dfd, path, args->flags, args->mode); +#endif return linux_common_open(td, path, args->flags, args->mode, dfd); } From owner-p4-projects@FreeBSD.ORG Wed Jun 27 14:24:34 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B6BDD16A46B; Wed, 27 Jun 2007 14:24:34 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7456D16A41F for ; Wed, 27 Jun 2007 14:24:34 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6451413C48A for ; Wed, 27 Jun 2007 14:24:34 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5REOYqo047649 for ; Wed, 27 Jun 2007 14:24:34 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5REOWTY047646 for perforce@freebsd.org; Wed, 27 Jun 2007 14:24:32 GMT (envelope-from rdivacky@FreeBSD.org) Date: Wed, 27 Jun 2007 14:24:32 GMT Message-Id: <200706271424.l5REOWTY047646@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 122405 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Jun 2007 14:24:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=122405 Change 122405 by rdivacky@rdivacky_witten on 2007/06/27 14:24:01 IFC Affected files ... .. //depot/projects/soc2007/rdivacky/linux_at/sys/boot/forth/loader.conf#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/conf/NOTES#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/conf/files#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/conf/options#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/acpica/acpi.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/acpica/acpiio.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/acpica/acpivar.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ata/ata-all.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ata/ata-chipset.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ata/ata-disk.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ata/ata-pci.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ata/ata-usb.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ath/if_ath.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/isp/isp.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/isp/isp_pci.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/iwi/if_iwi.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/rp/rp.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sym/sym_hipd.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/ehci_pci.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/if_aue.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/if_cdce.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/if_cue.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/if_kue.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/if_rum.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/if_ural.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/ohci_pci.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/ubsa.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/ubser.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/ucom.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/ucycom.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/udbp.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/ufm.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/ufoma.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/uftdi.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/uhci_pci.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/uhid.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/uhub.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/uipaq.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/ukbd.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/ulpt.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/umass.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/umodem.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/ums.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/urio.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/usb_port.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/usb_quirks.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/usb_quirks.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/usbdevs#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/uscanner.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/uvisor.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/tmpfs/tmpfs.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/tmpfs/tmpfs_fifoops.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/tmpfs/tmpfs_subr.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/tmpfs/tmpfs_uma.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/tmpfs/tmpfs_uma.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/tmpfs/tmpfs_vfsops.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/tmpfs/tmpfs_vnops.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/umapfs/umap.h#2 delete .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/umapfs/umap_subr.c#2 delete .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/umapfs/umap_vfsops.c#2 delete .. //depot/projects/soc2007/rdivacky/linux_at/sys/fs/umapfs/umap_vnops.c#3 delete .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/acpica/acpi_machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/Make.tags.inc#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/Makefile#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_malloc.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_rwlock.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_timeout.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/modules/acpi/acpi_video/Makefile#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/modules/i2c/controllers/alpm/Makefile#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/modules/i2c/controllers/viapm/Makefile#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/modules/umapfs/Makefile#2 delete .. //depot/projects/soc2007/rdivacky/linux_at/sys/net/bridgestp.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/net/if_gre.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/net80211/ieee80211_freebsd.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netatm/atm_cm.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netatm/ipatm/ipatm_event.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netatm/spans/spans_proto.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netatm/uni/sscf_uni_lower.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netatm/uni/uniarp.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netatm/uni/uniarp_timer.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netatm/uni/unisig_decode.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netatm/uni/unisig_proto.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netgraph/ng_parse.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_indata.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_indata.h#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_input.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctp_uio.h#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/netinet/sctputil.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/powerpc/powerpc/busdma_machdep.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/security/audit/audit_syscalls.c#5 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/security/mac/mac_audit.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/security/mac/mac_framework.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/security/mac/mac_policy.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/security/mac_stub/mac_stub.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/security/mac_test/mac_test.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/_rwlock.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/rwlock.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/ufs/ffs/ffs_softdep.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/ufs/ufs/ufs_inode.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/vm/swap_pager.c#4 integrate .. //depot/projects/soc2007/rdivacky/linux_at/sys/vm/vm_pageout.c#5 integrate Differences ... ==== //depot/projects/soc2007/rdivacky/linux_at/sys/boot/forth/loader.conf#2 (text+ko) ==== @@ -6,7 +6,7 @@ # # All arguments must be in double quotes. # -# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.120 2007/04/09 22:09:09 pjd Exp $ +# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.121 2007/06/25 05:06:55 rafan Exp $ ############################################################## ### Basic configuration options ############################ @@ -135,7 +135,6 @@ portalfs_load="NO" # Portal filesystem procfs_load="NO" # Process filesystem reiserfs_load="NO" # ReiserFS -#umapfs_load="NO" # User-id map filesystem unionfs_load="NO" # Union filesystem xfs_load="NO" # XFS zfs_load="NO" # ZFS ==== //depot/projects/soc2007/rdivacky/linux_at/sys/conf/NOTES#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1434 2007/06/16 04:57:03 alc Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1437 2007/06/27 02:34:22 rafan Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -938,10 +938,12 @@ # currently be demand-loaded.) Some people still prefer to statically # compile other filesystems as well. # -# NB: The NULL, PORTAL, UMAP and UNION filesystems are known to be -# buggy, and WILL panic your system if you attempt to do anything with -# them. They are included here as an incentive for some enterprising -# soul to sit down and fix them. +# NB: The PORTAL filesystem is known to be buggy, and WILL panic your +# system if you attempt to do anything with it. It is included here +# as an incentive for some enterprising soul to sit down and fix it. +# The UNION filesystem was known to be buggy in the past. It is now +# being actively maintained, although there are still some issues being +# resolved. # # One of these is mandatory: @@ -964,8 +966,6 @@ options PSEUDOFS_TRACE #Debugging support for PSEUDOFS options SMBFS #SMB/CIFS filesystem options UDF #Universal Disk Format -# Broken (seriously (functionally) broken): -#options UMAPFS #UID map filesystem options UNIONFS #Union filesystem # The xFS_ROOT options REQUIRE the associated ``options xFS'' options NFS_ROOT #NFS usable as root device ==== //depot/projects/soc2007/rdivacky/linux_at/sys/conf/files#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1222 2007/06/16 04:57:04 alc Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1223 2007/06/25 05:06:55 rafan Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1199,9 +1199,6 @@ fs/udf/udf_iconv.c optional udf_iconv fs/udf/udf_vfsops.c optional udf fs/udf/udf_vnops.c optional udf -fs/umapfs/umap_subr.c optional umapfs -fs/umapfs/umap_vfsops.c optional umapfs -fs/umapfs/umap_vnops.c optional umapfs fs/unionfs/union_subr.c optional unionfs fs/unionfs/union_vfsops.c optional unionfs fs/unionfs/union_vnops.c optional unionfs ==== //depot/projects/soc2007/rdivacky/linux_at/sys/conf/options#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.596 2007/06/16 04:57:04 alc Exp $ +# $FreeBSD: src/sys/conf/options,v 1.597 2007/06/25 05:06:55 rafan Exp $ # # On the handling of kernel options # @@ -198,7 +198,6 @@ SMBFS opt_dontuse.h TMPFS opt_dontuse.h UDF opt_dontuse.h -UMAPFS opt_dontuse.h UNIONFS opt_dontuse.h # Pseudofs debugging ==== //depot/projects/soc2007/rdivacky/linux_at/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#4 (text+ko) ==== @@ -766,7 +766,7 @@ vn_lock(*vpp, flags, curthread); } ZFS_EXIT(zfsvfs); - return (0); + return (err); } static int ==== //depot/projects/soc2007/rdivacky/linux_at/sys/dev/acpica/acpi.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi.c,v 1.239 2007/06/15 18:02:33 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi.c,v 1.240 2007/06/21 22:50:37 njl Exp $"); #include "opt_acpi.h" #include @@ -136,6 +136,7 @@ static ACPI_STATUS acpi_probe_child(ACPI_HANDLE handle, UINT32 level, void *context, void **status); static BOOLEAN acpi_MatchHid(ACPI_HANDLE h, const char *hid); +static ACPI_STATUS acpi_EnterSleepState(struct acpi_softc *sc, int state); static void acpi_shutdown_final(void *arg, int howto); static void acpi_enable_fixed_events(struct acpi_softc *sc); static int acpi_wake_sleep_prep(ACPI_HANDLE handle, int sstate); @@ -410,6 +411,7 @@ sc = device_get_softc(dev); sc->acpi_dev = dev; + callout_init(&sc->susp_force_to, TRUE); error = ENXIO; @@ -592,7 +594,7 @@ /* Pick the first valid sleep state for the sleep button default. */ sc->acpi_sleep_button_sx = ACPI_S_STATES_MAX + 1; - for (state = ACPI_STATE_S1; state < ACPI_STATE_S5; state++) + for (state = ACPI_STATE_S1; state <= ACPI_STATE_S4; state++) if (ACPI_SUCCESS(AcpiGetSleepTypeData(state, &TypeA, &TypeB))) { sc->acpi_sleep_button_sx = state; break; @@ -2118,7 +2120,151 @@ return (acpi_SetInteger(ACPI_ROOT_OBJECT, "_PIC", model)); } +/* + * DEPRECATED. This interface has serious deficiencies and will be + * removed. + * + * Immediately enter the sleep state. In the old model, acpiconf(8) ran + * rc.suspend and rc.resume so we don't have to notify devd(8) to do this. + */ +ACPI_STATUS +acpi_SetSleepState(struct acpi_softc *sc, int state) +{ + static int once; + + if (!once) { + printf( +"warning: acpi_SetSleepState() deprecated, need to update your software\n"); + once = 1; + } + return (acpi_EnterSleepState(sc, state)); +} + static void +acpi_sleep_force(void *arg) +{ + struct acpi_softc *sc; + + printf("acpi: suspend request timed out, forcing sleep now\n"); + sc = arg; + if (ACPI_FAILURE(acpi_EnterSleepState(sc, sc->acpi_next_sstate))) + printf("acpi: force sleep state S%d failed\n", sc->acpi_next_sstate); +} + +/* + * Request that the system enter the given suspend state. All /dev/apm + * devices and devd(8) will be notified. Userland then has a chance to + * save state and acknowledge the request. The system sleeps once all + * acks are in. + */ +int +acpi_ReqSleepState(struct acpi_softc *sc, int state) +{ + struct apm_clone_data *clone; + + if (state < ACPI_STATE_S1 || state > ACPI_STATE_S5) + return (EINVAL); + + /* S5 (soft-off) should be entered directly with no waiting. */ + if (state == ACPI_STATE_S5) { + if (ACPI_SUCCESS(acpi_EnterSleepState(sc, state))) + return (0); + else + return (ENXIO); + } + + /* If a suspend request is already in progress, just return. */ + ACPI_LOCK(acpi); + if (sc->acpi_next_sstate != 0) { + ACPI_UNLOCK(acpi); + return (0); + } + + /* Record the pending state and notify all apm devices. */ + sc->acpi_next_sstate = state; + STAILQ_FOREACH(clone, &sc->apm_cdevs, entries) { + clone->notify_status = APM_EV_NONE; + if ((clone->flags & ACPI_EVF_DEVD) == 0) { + selwakeuppri(&clone->sel_read, PZERO); + KNOTE_UNLOCKED(&clone->sel_read.si_note, 0); + } + } + + /* Now notify devd(8) also. */ + acpi_UserNotify("Suspend", ACPI_ROOT_OBJECT, state); + + /* + * Set a timeout to fire if userland doesn't ack the suspend request + * in time. This way we still eventually go to sleep if we were + * overheating or running low on battery, even if userland is hung. + * We cancel this timeout once all userland acks are in or the + * suspend request is aborted. + */ + callout_reset(&sc->susp_force_to, 10 * hz, acpi_sleep_force, sc); + ACPI_UNLOCK(acpi); + return (0); +} + +/* + * Acknowledge (or reject) a pending sleep state. The caller has + * prepared for suspend and is now ready for it to proceed. If the + * error argument is non-zero, it indicates suspend should be cancelled + * and gives an errno value describing why. Once all votes are in, + * we suspend the system. + */ +int +acpi_AckSleepState(struct apm_clone_data *clone, int error) +{ + struct acpi_softc *sc; + int ret, sleeping; + + /* If no pending sleep state, return an error. */ + ACPI_LOCK(acpi); + sc = clone->acpi_sc; + if (sc->acpi_next_sstate == 0) { + ACPI_UNLOCK(acpi); + return (ENXIO); + } + + /* Caller wants to abort suspend process. */ + if (error) { + sc->acpi_next_sstate = 0; + callout_stop(&sc->susp_force_to); + printf("acpi: listener on %s cancelled the pending suspend\n", + devtoname(clone->cdev)); + ACPI_UNLOCK(acpi); + return (0); + } + + /* + * Mark this device as acking the suspend request. Then, walk through + * all devices, seeing if they agree yet. We only count devices that + * are writable since read-only devices couldn't ack the request. + */ + clone->notify_status = APM_EV_ACKED; + sleeping = TRUE; + STAILQ_FOREACH(clone, &sc->apm_cdevs, entries) { + if ((clone->flags & ACPI_EVF_WRITE) != 0 && + clone->notify_status != APM_EV_ACKED) { + sleeping = FALSE; + break; + } + } + + /* If all devices have voted "yes", we will suspend now. */ + if (sleeping) + callout_stop(&sc->susp_force_to); + ACPI_UNLOCK(acpi); + ret = 0; + if (sleeping) { + if (ACPI_FAILURE(acpi_EnterSleepState(sc, sc->acpi_next_sstate))) + ret = ENODEV; + } + + return (ret); +} + +static void acpi_sleep_enable(void *arg) { @@ -2134,12 +2280,12 @@ }; /* - * Set the system sleep state + * Enter the desired system sleep state. * * Currently we support S1-S5 but S4 is only S4BIOS */ -ACPI_STATUS -acpi_SetSleepState(struct acpi_softc *sc, int state) +static ACPI_STATUS +acpi_EnterSleepState(struct acpi_softc *sc, int state) { ACPI_STATUS status; UINT8 TypeA; @@ -2148,14 +2294,13 @@ ACPI_FUNCTION_TRACE_U32((char *)(uintptr_t)__func__, state); + /* Re-entry once we're suspending is not allowed. */ status = AE_OK; ACPI_LOCK(acpi); if (sc->acpi_sleep_disabled) { - if (sc->acpi_sstate != ACPI_STATE_S0) - status = AE_ERROR; ACPI_UNLOCK(acpi); printf("acpi: suspend request ignored (not ready yet)\n"); - return (status); + return (AE_ERROR); } sc->acpi_sleep_disabled = 1; ACPI_UNLOCK(acpi); @@ -2251,6 +2396,7 @@ * Back out state according to how far along we got in the suspend * process. This handles both the error and success cases. */ + sc->acpi_next_sstate = 0; if (slp_state >= ACPI_SS_GPE_SET) { acpi_wake_prep_walk(state); sc->acpi_sstate = ACPI_STATE_S0; @@ -2264,7 +2410,10 @@ /* Allow another sleep request after a while. */ if (state != ACPI_STATE_S5) - timeout(acpi_sleep_enable, (caddr_t)sc, hz * ACPI_MINIMUM_AWAKETIME); + timeout(acpi_sleep_enable, sc, hz * ACPI_MINIMUM_AWAKETIME); + + /* Run /etc/rc.resume after we are back. */ + acpi_UserNotify("Resume", ACPI_ROOT_OBJECT, state); mtx_unlock(&Giant); return_ACPI_STATUS (status); @@ -2574,11 +2723,15 @@ static void acpi_system_eventhandler_sleep(void *arg, int state) { + int ret; ACPI_FUNCTION_TRACE_U32((char *)(uintptr_t)__func__, state); - if (state >= ACPI_STATE_S0 && state <= ACPI_S_STATES_MAX) - acpi_SetSleepState((struct acpi_softc *)arg, state); + /* Request that the system prepare to enter the given suspend state. */ + ret = acpi_ReqSleepState((struct acpi_softc *)arg, state); + if (ret != 0) + printf("acpi: request to enter state S%d failed (err %d)\n", + state, ret); return_VOID; } @@ -2840,7 +2993,20 @@ /* Core system ioctls. */ switch (cmd) { - case ACPIIO_SETSLPSTATE: + case ACPIIO_REQSLPSTATE: + state = *(int *)addr; + if (state != ACPI_STATE_S5) + error = acpi_ReqSleepState(sc, state); + else { + printf("power off via acpi ioctl not supported\n"); + error = ENXIO; + } + break; + case ACPIIO_ACKSLPSTATE: + error = *(int *)addr; + error = acpi_AckSleepState(sc->acpi_clone, error); + break; + case ACPIIO_SETSLPSTATE: /* DEPRECATED */ error = EINVAL; state = *(int *)addr; if (state >= ACPI_STATE_S0 && state <= ACPI_S_STATES_MAX) @@ -3171,7 +3337,8 @@ goto out; } - acpi_SetSleepState(sc, acpi_state); + if (ACPI_FAILURE(acpi_EnterSleepState(sc, acpi_state))) + error = ENXIO; break; default: error = EINVAL; ==== //depot/projects/soc2007/rdivacky/linux_at/sys/dev/acpica/acpiio.h#2 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpiio.h,v 1.16 2005/10/23 00:16:41 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpiio.h,v 1.17 2007/06/21 22:50:37 njl Exp $ */ #ifndef _ACPIIO_H_ @@ -33,7 +33,13 @@ /* * Core ACPI subsystem ioctls */ -#define ACPIIO_SETSLPSTATE _IOW('P', 3, int) +#define ACPIIO_SETSLPSTATE _IOW('P', 3, int) /* DEPRECATED */ + +/* Request S1-5 sleep state. User is notified and then sleep proceeds. */ +#define ACPIIO_REQSLPSTATE _IOW('P', 4, int) + +/* Allow suspend to continue (0) or abort it (errno). */ +#define ACPIIO_ACKSLPSTATE _IOW('P', 5, int) struct acpi_battinfo { int cap; /* percent */ ==== //depot/projects/soc2007/rdivacky/linux_at/sys/dev/acpica/acpivar.h#4 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpivar.h,v 1.106 2007/06/15 18:02:34 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpivar.h,v 1.107 2007/06/21 22:50:37 njl Exp $ */ #ifndef _ACPIVAR_H_ @@ -39,12 +39,14 @@ #include #include #include +#include #include #include #include #include +struct apm_clone_data; struct acpi_softc { device_t acpi_dev; struct cdev *acpi_dev_t; @@ -76,6 +78,11 @@ bus_dmamap_t acpi_wakemap; vm_offset_t acpi_wakeaddr; vm_paddr_t acpi_wakephys; + + int acpi_next_sstate; /* Next suspend Sx state. */ + struct apm_clone_data *acpi_clone; /* Pseudo-dev for devd(8). */ + STAILQ_HEAD(,apm_clone_data) apm_cdevs; /* All apm/apmctl/acpi cdevs. */ + struct callout susp_force_to; /* Force suspend if no acks. */ }; struct acpi_device { @@ -89,6 +96,22 @@ struct resource_list ad_rl; }; +/* Track device (/dev/{apm,apmctl} and /dev/acpi) notification status. */ +struct apm_clone_data { + STAILQ_ENTRY(apm_clone_data) entries; + struct cdev *cdev; + int flags; +#define ACPI_EVF_NONE 0 /* /dev/apm semantics */ +#define ACPI_EVF_DEVD 1 /* /dev/acpi is handled via devd(8) */ +#define ACPI_EVF_WRITE 2 /* Device instance is opened writable. */ + int notify_status; +#define APM_EV_NONE 0 /* Device not yet aware of pending sleep. */ +#define APM_EV_NOTIFIED 1 /* Device saw next sleep state. */ +#define APM_EV_ACKED 2 /* Device agreed sleep can occur. */ + struct acpi_softc *acpi_sc; + struct selinfo sel_read; +}; + #define ACPI_PRW_MAX_POWERRES 8 struct acpi_prw_data { @@ -304,6 +327,8 @@ ACPI_RESOURCE *res); ACPI_STATUS acpi_OverrideInterruptLevel(UINT32 InterruptNumber); ACPI_STATUS acpi_SetIntrModel(int model); +int acpi_ReqSleepState(struct acpi_softc *sc, int state); +int acpi_AckSleepState(struct apm_clone_data *clone, int error); ACPI_STATUS acpi_SetSleepState(struct acpi_softc *sc, int state); int acpi_wake_init(device_t dev, int type); int acpi_wake_set_enable(device_t dev, int enable); ==== //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ata/ata-all.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ata/ata-all.h,v 1.123 2007/04/08 19:18:51 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-all.h,v 1.124 2007/06/26 22:13:43 remko Exp $ */ /* ATA register defines */ @@ -294,6 +294,7 @@ #define ATA_DEV(device) ((device == ATA_MASTER) ? 0 : 1) #define ATA_CFA_MAGIC1 0x844A #define ATA_CFA_MAGIC2 0x848A +#define ATA_CFA_MAGIC3 0x8400 #define ATAPI_MAGIC_LSB 0x14 #define ATAPI_MAGIC_MSB 0xeb #define ATAPI_P_READ (ATA_S_DRQ | ATA_I_IN) ==== //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ata/ata-chipset.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.197 2007/06/13 17:44:49 bms Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.198 2007/06/25 08:21:21 sos Exp $"); #include "opt_ata.h" #include @@ -2890,6 +2890,10 @@ { ATA_NFORCE_MCP55, 0, AMDNVIDIA, NVIDIA, ATA_UDMA6, "nForce MCP55" }, { ATA_NFORCE_MCP55_S1, 0, 0, NV4|NVQ, ATA_SA300, "nForce MCP55" }, { ATA_NFORCE_MCP55_S2, 0, 0, NV4|NVQ, ATA_SA300, "nForce MCP55" }, + { ATA_NFORCE_MCP61, 0, AMDNVIDIA, NVIDIA, ATA_UDMA6, "nForce MCP61" }, + { ATA_NFORCE_MCP61_S1, 0, 0, NV4|NVQ, ATA_SA300, "nForce MCP61" }, + { ATA_NFORCE_MCP61_S2, 0, 0, NV4|NVQ, ATA_SA300, "nForce MCP61" }, + { ATA_NFORCE_MCP61_S3, 0, 0, NV4|NVQ, ATA_SA300, "nForce MCP61" }, { 0, 0, 0, 0, 0, 0}} ; char buffer[64] ; ==== //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ata/ata-disk.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-disk.c,v 1.203 2007/05/06 01:20:06 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-disk.c,v 1.204 2007/06/26 22:13:43 remko Exp $"); #include "opt_ata.h" #include @@ -80,7 +80,8 @@ if (!(atadev->param.config & ATA_PROTO_ATAPI) || (atadev->param.config == ATA_CFA_MAGIC1) || - (atadev->param.config == ATA_CFA_MAGIC2)) + (atadev->param.config == ATA_CFA_MAGIC2) || + (atadev->param.config == ATA_CFA_MAGIC3)) return 0; else return ENXIO; ==== //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ata/ata-pci.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ata/ata-pci.h,v 1.76 2007/03/09 22:23:39 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-pci.h,v 1.77 2007/06/25 08:21:21 sos Exp $ */ /* structure holding chipset config info */ @@ -222,6 +222,10 @@ #define ATA_NFORCE_MCP55 0x036e10de #define ATA_NFORCE_MCP55_S1 0x037e10de #define ATA_NFORCE_MCP55_S2 0x037f10de +#define ATA_NFORCE_MCP61 0x03ec10de +#define ATA_NFORCE_MCP61_S1 0x03e710de +#define ATA_NFORCE_MCP61_S2 0x03f610de +#define ATA_NFORCE_MCP61_S3 0x03f710de #define ATA_PROMISE_ID 0x105a #define ATA_PDC20246 0x4d33105a ==== //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ata/ata-usb.c#2 (text) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-usb.c,v 1.6 2007/02/21 19:07:18 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-usb.c,v 1.7 2007/06/23 21:52:05 imp Exp $"); #include "opt_ata.h" #include @@ -45,6 +45,7 @@ #include #include #include +#include #include #include #include ==== //depot/projects/soc2007/rdivacky/linux_at/sys/dev/ath/if_ath.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.171 2007/06/11 03:36:49 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.172 2007/06/24 01:57:20 sam Exp $"); /* * Driver for the Atheros Wireless LAN controller. @@ -4798,8 +4798,10 @@ bf->bf_node = NULL; if (ni != NULL) { /* - * Reclaim node reference. + * Do any callback and reclaim the node reference. */ + if (bf->bf_m->m_flags & M_TXCB) + ieee80211_process_callback(ni, bf->bf_m, -1); ieee80211_free_node(ni); } m_freem(bf->bf_m); ==== //depot/projects/soc2007/rdivacky/linux_at/sys/dev/isp/isp.c#3 (text+ko) ==== @@ -46,7 +46,7 @@ #endif #ifdef __FreeBSD__ #include -__FBSDID("$FreeBSD: src/sys/dev/isp/isp.c,v 1.146 2007/05/05 20:17:22 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/isp/isp.c,v 1.147 2007/06/24 01:41:16 mjacob Exp $"); #include #endif #ifdef __OpenBSD__ @@ -812,7 +812,7 @@ } cp = isp->isp_rquest; for (i = 0; i < nw; i++) { - cp[i] = ptr[wi++]; + ISP_IOXPUT_32(isp, ptr[wi++], &cp[i]); wl--; } MEMORYBARRIER(isp, SYNC_REQUEST, @@ -875,7 +875,7 @@ } cp = isp->isp_rquest; for (i = 0; i < nw; i++) { - cp[i] = ptr[wi++]; + ISP_IOXPUT_16(isp, ptr[wi++], &cp[i]); wl--; } MEMORYBARRIER(isp, SYNC_REQUEST, ==== //depot/projects/soc2007/rdivacky/linux_at/sys/dev/isp/isp_pci.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ * FreeBSD Version. */ #include -__FBSDID("$FreeBSD: src/sys/dev/isp/isp_pci.c,v 1.145 2007/06/11 17:56:17 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/isp/isp_pci.c,v 1.148 2007/06/26 23:08:57 mjacob Exp $"); #include #include @@ -2847,10 +2847,22 @@ (ispextreq_t *)qep); break; case RQSTYPE_T2RQS: - isp_put_request_t2(isp, (ispreqt2_t *) rq, (ispreqt2_t *) qep); + if (FCPARAM(isp)->isp_2klogin) { + isp_put_request_t2e(isp, + (ispreqt2e_t *) rq, (ispreqt2e_t *) qep); + } else { + isp_put_request_t2(isp, + (ispreqt2_t *) rq, (ispreqt2_t *) qep); + } break; + case RQSTYPE_T3RQS: + if (FCPARAM(isp)->isp_2klogin) { + isp_put_request_t3e(isp, + (ispreqt3e_t *) rq, (ispreqt3e_t *) qep); + break; + } + /* FALLTHROUGH */ case RQSTYPE_A64: - case RQSTYPE_T3RQS: isp_put_request_t3(isp, (ispreqt3_t *) rq, (ispreqt3_t *) qep); break; case RQSTYPE_T7RQS: ==== //depot/projects/soc2007/rdivacky/linux_at/sys/dev/iwi/if_iwi.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/iwi/if_iwi.c,v 1.54 2007/06/11 10:56:06 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/iwi/if_iwi.c,v 1.55 2007/06/25 20:56:33 thompsa Exp $"); /*- * Intel(R) PRO/Wireless 2200BG/2225BG/2915ABG driver @@ -2630,6 +2630,7 @@ return error; } + memset(&rs, 0, sizeof rs); rs.mode = IWI_MODE_11G; rs.type = IWI_RATESET_TYPE_SUPPORTED; rs.nrates = ic->ic_sup_rates[IEEE80211_MODE_11G].rs_nrates; @@ -2640,6 +2641,7 @@ if (error != 0) return error; + memset(&rs, 0, sizeof rs); rs.mode = IWI_MODE_11A; rs.type = IWI_RATESET_TYPE_SUPPORTED; rs.nrates = ic->ic_sup_rates[IEEE80211_MODE_11A].rs_nrates; @@ -2866,7 +2868,7 @@ struct iwi_associate *assoc = &sc->assoc; struct iwi_rateset rs; uint16_t capinfo; - int error; + int error, mode; IWI_LOCK_ASSERT(sc); @@ -2877,12 +2879,22 @@ IWI_STATE_BEGIN(sc, IWI_FW_ASSOCIATING); error = 0; + mode = 0; + + if (IEEE80211_IS_CHAN_A(ic->ic_curchan)) + mode = IWI_MODE_11A; + else if (IEEE80211_IS_CHAN_G(ic->ic_curchan)) + mode = IWI_MODE_11G; + if (IEEE80211_IS_CHAN_B(ic->ic_curchan)) + mode = IWI_MODE_11B; + if (IEEE80211_IS_CHAN_2GHZ(ic->ic_curchan)) { memset(&config, 0, sizeof config); config.bluetooth_coexistence = sc->bluetooth; config.antenna = sc->antenna; config.multicast_enabled = 1; - config.use_protection = 1; + if (mode == IWI_MODE_11G) + config.use_protection = 1; config.answer_pbreq = (ic->ic_opmode == IEEE80211_M_IBSS) ? 1 : 0; config.disable_unicast_decryption = 1; @@ -2905,13 +2917,8 @@ goto done; /* the rate set has already been "negotiated" */ - if (IEEE80211_IS_CHAN_A(ic->ic_curchan)) - rs.mode = IWI_MODE_11A; - else if (IEEE80211_IS_CHAN_G(ic->ic_curchan)) - rs.mode = IWI_MODE_11G; - if (IEEE80211_IS_CHAN_B(ic->ic_curchan)) - rs.mode = IWI_MODE_11B; - + memset(&rs, 0, sizeof rs); + rs.mode = mode; rs.type = IWI_RATESET_TYPE_NEGOTIATED; rs.nrates = ni->ni_rates.rs_nrates; if (rs.nrates > IWI_RATESET_SIZE) { @@ -2946,13 +2953,7 @@ if (error != 0) goto done; - if (IEEE80211_IS_CHAN_A(ic->ic_curchan)) - assoc->mode = IWI_MODE_11A; - else if (IEEE80211_IS_CHAN_G(ic->ic_curchan)) - assoc->mode = IWI_MODE_11G; - else if (IEEE80211_IS_CHAN_B(ic->ic_curchan)) - assoc->mode = IWI_MODE_11B; - + assoc->mode = mode; assoc->chan = ic->ic_curchan->ic_ieee; /* * NB: do not arrange for shared key auth w/o privacy ==== //depot/projects/soc2007/rdivacky/linux_at/sys/dev/rp/rp.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/rp/rp.c,v 1.72 2006/11/20 12:59:27 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/rp/rp.c,v 1.73 2007/06/26 13:50:48 remko Exp $"); /* * rp.c - for RocketPort FreeBSD @@ -573,6 +573,7 @@ static void rpbreak(struct tty *, int); static void rpclose(struct tty *tp); +static void rphardclose(struct tty *tp); static int rpmodem(struct tty *, int, int); static int rpparam(struct tty *, struct termios *); static void rpstart(struct tty *); @@ -697,7 +698,7 @@ if((tp->t_state & TS_CARR_ON)) { (void)ttyld_modem(tp, 0); if(ttyld_modem(tp, 0) == 0) { - rpclose(tp); + rphardclose(tp); } } } @@ -935,6 +936,16 @@ rpclose(struct tty *tp) { struct rp_port *rp; + + rp = tp->t_sc; + rphardclose(tp); + device_unbusy(rp->rp_ctlp->dev); +} + +static void +rphardclose(struct tty *tp) +{ + struct rp_port *rp; CHANNEL_t *cp; rp = tp->t_sc; @@ -958,7 +969,6 @@ tp->t_actout = FALSE; wakeup(&tp->t_actout); wakeup(TSA_CARR_ON(tp)); - device_unbusy(rp->rp_ctlp->dev); } static void ==== //depot/projects/soc2007/rdivacky/linux_at/sys/dev/sym/sym_hipd.c#4 (text+ko) ==== @@ -56,7 +56,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/sym/sym_hipd.c,v 1.65 2007/06/17 05:55:52 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/sym/sym_hipd.c,v 1.66 2007/06/23 00:02:19 mjacob Exp $"); #define SYM_DRIVER_NAME "sym-1.6.5-20000902" @@ -202,7 +202,7 @@ } #define sym_que_entry(ptr, type, member) \ - ((type *)((char *)(ptr)-(unsigned int)(&((type *)0)->member))) + ((type *)((char *)(ptr)-(size_t)(&((type *)0)->member))) #define sym_insque(new, pos) __sym_que_add(new, pos, (pos)->flink) ==== //depot/projects/soc2007/rdivacky/linux_at/sys/dev/usb/ehci_pci.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/ehci_pci.c,v 1.26 2007/06/20 05:10:52 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/ehci_pci.c,v 1.27 2007/06/21 14:42:33 imp Exp $"); /* * USB Enhanced Host Controller Driver, a.k.a. USB 2.0 controller. @@ -153,11 +153,11 @@ #define DPRINTF(x) #endif -static int ehci_pci_attach(device_t self); -static int ehci_pci_detach(device_t self); -static int ehci_pci_shutdown(device_t self); -static int ehci_pci_suspend(device_t self); -static int ehci_pci_resume(device_t self); +static device_attach_t ehci_pci_attach; +static device_detach_t ehci_pci_detach; +static device_shutdown_t ehci_pci_shutdown; +static device_suspend_t ehci_pci_suspend; +static device_resume_t ehci_pci_resume; static void ehci_pci_givecontroller(device_t self); static void ehci_pci_takecontroller(device_t self); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jun 27 15:06:28 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 07B5616A46B; Wed, 27 Jun 2007 15:06:28 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B0EB116A468 for ; Wed, 27 Jun 2007 15:06:27 +0000 (UTC) (envelope-from taleks@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id A1C3B13C44B for ; Wed, 27 Jun 2007 15:06:27 +0000 (UTC) (envelope-from taleks@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5RF6Rkn052190 for ; Wed, 27 Jun 2007 15:06:27 GMT (envelope-from taleks@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5RF6R0I052187 for perforce@freebsd.org; Wed, 27 Jun 2007 15:06:27 GMT (envelope-from taleks@FreeBSD.org) Date: Wed, 27 Jun 2007 15:06:27 GMT Message-Id: <200706271506.l5RF6R0I052187@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to taleks@FreeBSD.org using -f From: Alexey Tarasov To: Perforce Change Reviews Cc: Subject: PERFORCE change 122406 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Jun 2007 15:06:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=122406 Change 122406 by taleks@taleks_th on 2007/06/27 15:06:11 Main changes are done to TCP related module. Due to rather big number of lines and functions it is divided in three modules: connection, tcp and segment module. tcp module contains rewritten to be more compliant to RFC 793 callback function and state handlers. This module task now is to dispatch packets to coorect connection and send confirmation/system packets using segments module. connection module is responsible for establishing and breaking communcation. It's task to work with pxe_tcp_connection objects. segment module - organizes creating of segment, checking of acked segments, resending of segments including some memory managment for this purposes. Other updates: added sending mss option, some macro are moved to other headers, cosmetic changes to comments. Affected files ... .. //depot/projects/soc2007/taleks-pxe_http/Makefile#7 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_buffer.h#3 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_connection.c#1 add .. //depot/projects/soc2007/taleks-pxe_http/pxe_connection.h#1 add .. //depot/projects/soc2007/taleks-pxe_http/pxe_core.c#16 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_core.h#13 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_ip.h#6 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_segment.c#1 add .. //depot/projects/soc2007/taleks-pxe_http/pxe_segment.h#1 add .. //depot/projects/soc2007/taleks-pxe_http/pxe_sock.h#8 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_tcp.c#3 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_tcp.h#5 edit Differences ... ==== //depot/projects/soc2007/taleks-pxe_http/Makefile#7 (text+ko) ==== @@ -3,8 +3,9 @@ LIB= pxe_http INTERNALLIB= -SRCS= pxe_conv.c pxe_isr.S pxe_mem.c pxe_buffer.c pxe_sock.c pxe_await.c pxe_arp.c pxe_ip.c pxe_mutex.c \ - pxe_core.c pxe_icmp.c pxe_udp.c pxe_filter.c pxe_dns.c pxe_dhcp.c +SRCS= pxe_conv.c pxe_isr.S pxe_mem.c pxe_buffer.c pxe_await.c pxe_arp.c pxe_ip.c pxe_mutex.c \ + pxe_core.c pxe_icmp.c pxe_udp.c pxe_filter.c pxe_dns.c pxe_dhcp.c pxe_segment.c pxe_tcp.c pxe_sock.c \ + pxe_connection.c CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR}/../btx/lib \ -I${.CURDIR}/../../../contrib/dev/acpica \ @@ -13,7 +14,7 @@ CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/ #debug flag -#CFLAGS+= -DPXE_DEBUG +CFLAGS+= -DPXE_DEBUG #CFLAGS+= -DPXE_DEBUG_HELL .include ==== //depot/projects/soc2007/taleks-pxe_http/pxe_buffer.h#3 (text+ko) ==== @@ -3,6 +3,10 @@ #include +/* buffer size choosed by default for sending/recieving*/ +#define PXE_DEFAULT_RECV_BUFSIZE 8192 +#define PXE_DEFAULT_SEND_BUFSIZE 4096 + /* pxe_buffer - buffer related information */ typedef struct pxe_buffer { ==== //depot/projects/soc2007/taleks-pxe_http/pxe_core.c#16 (text+ko) ==== @@ -1009,3 +1009,19 @@ core_ips[id].ip = new_ip; } } + +/* pxe_get_secs() - returns time in seconds + * in: + * none + * out: + * elapsed time in seconds + */ +time_t +pxe_get_secs() +{ + time_t secs; + + time(&secs); + + return (secs); +} ==== //depot/projects/soc2007/taleks-pxe_http/pxe_core.h#13 (text+ko) ==== @@ -1,6 +1,7 @@ #ifndef PXE_CORE_H_INCLUDED #define PXE_CORE_H_INCLUDED +#include #include #include @@ -119,4 +120,7 @@ uint32_t pxe_get_ip32(uint8_t id); void pxe_set_ip32(uint8_t id, uint32_t ip); +/* returns time in seconds */ +time_t pxe_get_secs(); + #endif // PXE_CORE_H_INCLUDED ==== //depot/projects/soc2007/taleks-pxe_http/pxe_ip.h#6 (text+ko) ==== @@ -26,6 +26,16 @@ uint32_t dst_ip; /* destination ip address */ } __packed PXE_IP_HDR; +/* pseudo header, used in checksum calculation for UDP and TCP */ +typedef struct pxe_ip4_pseudo_hdr { + + uint32_t src_ip; /* source ip */ + uint32_t dst_ip; /* destination ip */ + uint8_t zero; /* filled by zero */ + uint8_t proto; /* protocol */ + uint16_t length; /* length (protocol header + data) */ +} __packed PXE_IP4_PSEUDO_HDR; + /* IPv4 address */ typedef struct pxe_ipaddr { union { ==== //depot/projects/soc2007/taleks-pxe_http/pxe_sock.h#8 (text+ko) ==== @@ -7,12 +7,7 @@ #include "pxe_buffer.h" #include "pxe_filter.h" #include "pxe_ip.h" -/* buffer size choosed by default for sending/recieving*/ -#define PXE_DEFAULT_RECV_BUFSIZE 8192 -#define PXE_DEFAULT_SEND_BUFSIZE 2048 -/* minimal and max packet sizes to optimize tcp usage*/ -#define PXE_MIN_SEND_PACKET_SIZE 512 -#define PXE_MTU 1500 + /* default count of sockets used at the same time */ #define PXE_DEFAULT_SOCKETS 8 /* default count of waiting queue */ ==== //depot/projects/soc2007/taleks-pxe_http/pxe_tcp.c#3 (text+ko) ==== @@ -1,27 +1,23 @@ #include #include "pxe_await.h" +#include "pxe_connection.h" #include "pxe_conv.h" #include "pxe_core.h" #include "pxe_filter.h" #include "pxe_ip.h" -#include "pxe_sock.h" #include "pxe_tcp.h" /* state handle functions */ -static int tcp_syn_sent(PXE_TCP_PACKET *tcp_packet, PXE_TCP_CONNECTION *connection); -static int tcp_established(PXE_TCP_PACKET *tcp_packet, PXE_TCP_CONNECTION *connection); -static int tcp_fin_wait1(PXE_TCP_PACKET *tcp_packet, PXE_TCP_CONNECTION *connection); -static int tcp_closing(PXE_TCP_PACKET *tcp_packet, PXE_TCP_CONNECTION *connection); -static int tcp_fin_wait2(PXE_TCP_PACKET *tcp_packet, PXE_TCP_CONNECTION *connection); -static int tcp_time_wait(PXE_TCP_PACKET *tcp_packet, PXE_TCP_CONNECTION *connection); -static int tcp_close_wait(PXE_TCP_PACKET *tcp_packet, PXE_TCP_CONNECTION *connection); -static int tcp_last_ack(PXE_TCP_PACKET *tcp_packet, PXE_TCP_CONNECTION *connection); +static int tcp_syn_sent(PXE_TCP_PACKET *tcp_packet, PXE_TCP_CONNECTION *connection, uint16_t seglen); +static int tcp_established(PXE_TCP_PACKET *tcp_packet, PXE_TCP_CONNECTION *connection, uint16_t seglen); +static int tcp_fin_wait1(PXE_TCP_PACKET *tcp_packet, PXE_TCP_CONNECTION *connection, uint16_t seglen); +static int tcp_closing(PXE_TCP_PACKET *tcp_packet, PXE_TCP_CONNECTION *connection, uint16_t seglen); +static int tcp_fin_wait2(PXE_TCP_PACKET *tcp_packet, PXE_TCP_CONNECTION *connection, uint16_t seglen); +static int tcp_time_wait(PXE_TCP_PACKET *tcp_packet, PXE_TCP_CONNECTION *connection, uint16_t seglen); +static int tcp_close_wait(PXE_TCP_PACKET *tcp_packet, PXE_TCP_CONNECTION *connection, uint16_t seglen); +static int tcp_last_ack(PXE_TCP_PACKET *tcp_packet, PXE_TCP_CONNECTION *connection, uint16_t seglen); -/* connection structs storage */ -static PXE_TCP_CONNECTION tcp_connections[PXE_MAX_TCP_CONNECTIONS]; -/* currently allocated connections */ -static int all_connections = 0; /* pointers to appropriate state handlers */ static pxe_tcp_state_func state_functions[PXE_TCP_ALL_STATES] = { NULL, /* PXE_TCP_CLOSED */ @@ -36,135 +32,300 @@ tcp_time_wait, /* PXE_TCP_TIME_WAIT */ }; -/* filter_to_connection() - returns connections, associated with provided filter +/* check_time_to_die() - moves to CLOSED state connections from state + * TIME_WAIT if last received packet (ACK for FIN in most cases) + * was more than 2*MSL time ago. * in: - * filter - pointer to filter entry structure, for which connection is searched + * connection - connection to check * out: - * NULL - failed to find - * not NULL- searched connections + * none */ -static PXE_TCP_CONNECTION * -filter_to_connection(PXE_FILTER_ENTRY *filter) +static void +check_time_to_die(PXE_TCP_CONNECTION *connection) { - int con_index = 0; - - for ( ; con_index < PXE_MAX_TCP_CONNECTIONS; ++con_index) { + /* if connection in other states - do nothing */ + if (connection->state != PXE_TCP_TIME_WAIT) + return; + + time_t cur_time = pxe_get_secs(); - if (tcp_connections[con_index].filter == filter) { - return (&tcp_connections[con_index]); - } + if (cur_time - connection->last_recv > 2 * PXE_TCP_MSL) { + /* release filter */ + PXE_FILTER_ENTRY *filter = connection->filter; + + if (filter != NULL) /* it must always be non NULL */ + pxe_filter_remove(filter); + + /* release connection */ + free_connection(connection); } +} - return (NULL); +/* tcp_send_rst_for() - sends RST in reply to provided packet + * in: + * tcp_packet - packet which caused RST sending + * out: + * 0 - failed + * 1 - success + */ +static int +tcp_send_rst_for(PXE_TCP_PACKET *tcp_packet, uint32_t ack, uint32_t seq, uint8_t flags, uint16_t seglen) +{ + PXE_TCP_CONNECTION connection; + pxe_memset(&connection, 0, sizeof(PXE_TCP_CONNECTION)); + + connection.dst_port = tcp_packet->tcphdr.src_port; + connection.src_port = tcp_packet->tcphdr.dst_port; + connection.dst_ip = tcp_packet->iphdr.src_ip; + + connection.next_recv = seq + seglen; /* acking */ + connection.next_send = ack; /* next send */ + + return pxe_tcp_send(&connection, 0, flags); } -/* alloc_connection() - returns pointer to free connection structure +/* tcp_is_acceptable() - first check for SYN_RECEIVED, ESTABLISHED, FIN_WAIT_1, FIN_WAIT_2, + * CLOSE_WAIT, CLOSING, LAST_ACK, TIME_WAIT states * in: - * none + * connection - connection for which packet received + * tcp_packet - received packet + * seglen - segment length * out: - * NULL - failed to alloc - * non NULL- pointer to allocated structure + * 0 - not acceptable + * 1 - acceptable */ -PXE_TCP_CONNECTION * -alloc_connection() +int +tcp_is_acceptable(PXE_TCP_CONNECTION *connection, PXE_TCP_PACKET *tcp_packet, uint16_t seglen) { - if (all_connections == PXE_MAX_TCP_CONNECTIONS) - return (NULL); - - uint16_t index = 0; + uint16_t window = connection->recv->bufleft; + uint32_t seq = tcp_packet->tcphdr.sequence; - for ( ; index < PXE_MAX_TCP_CONNECTIONS; ++index) { + if (seglen == 0) { - if (tcp_connections[index].state == PXE_TCP_CLOSED) { - /* if state is closed, it's free structure*/ - all_connections += 1; - return &tcp_connections[index]; + if (window == 0) { + if (seq == connection->next_recv) + return (1); } + + if (connection->next_recv > seq) + return (0); + + if (seq < connection->next_recv + window) + return (1); + + } else { /* segment size > 0 */ + + if (window == 0) + return (0); + + if ((connection->next_recv <= seq) && + (seq < connection->next_recv + window) ) + return (1); + + /* or? */ + if ((connection->next_recv <= seq + seglen - 1) && + (seq +seglen -1 < connection->next_recv + window) ) + return (1); } - /* NOTE: we must not ever get here */ - return (NULL); + return (0); +} + +/* tcp checks has same numbers as in RFC 793, page 65+ */ + +/* tcp_check_1() - check if packet is acceptable, sends ACK if not + * in: + * connection - connection for which packet received + * tcp_packet - received packet + * seglen - segment length + * out: + * 0 - not acceptable + * 1 - acceptable + */ +static int +tcp_check_1(PXE_TCP_CONNECTION *connection, PXE_TCP_PACKET *tcp_packet, uint16_t seglen) +{ + if (tcp_is_acceptable(connection, tcp_packet, seglen)) { + return (1); + } + + pxe_tcp_send(connection, 0, PXE_TCP_ACK); + +#ifdef PXE_DEBUG_HELL + printf("tcp_check_1(): failed\n"); +#endif + return (0); } -/* free_connection() - releases connections +/* tcp_check_2() - check if packet has RST flag * in: - * connection - pointer to connection to release (assuming it's valid connection) + * tcp_packet - received packet * out: - * none + * 0 - not have + * 1 - have */ -void -free_connection(PXE_TCP_CONNECTION *connection) +static int +tcp_check_2(PXE_TCP_PACKET *tcp_packet) { + if (tcp_packet->tcphdr.flags & PXE_TCP_RST) + return (1); - connection->state = PXE_TCP_CLOSED; - all_connections -= 1; +#ifdef PXE_DEBUG_HELL + printf("tcp_check_2(): failed\n"); +#endif + return (0); +} + +/* tcp_check_3() - check precedence + * in: + * connection - connection for which packet received + * tcp_packet - received packet + * out: + * 0 - failed + * 1 - precedence ok + */ +static int +tcp_check_3(PXE_TCP_CONNECTION *connection, PXE_TCP_PACKET *tcp_packet) +{ + /* TODO?: implement */ + return (1); } -/* get_secs() - returns time in seconds +/* tcp_check_4() - check if packet has SYN flag and sends RST * in: - * none + * connection - connection for which packet received + * tcp_packet - received packet + * seglen - segment length * out: - * elapsed time in seconds + * 0 - not have + * 1 - have */ -static time_t -get_secs() +static int +tcp_check_4(PXE_TCP_CONNECTION *connection, PXE_TCP_PACKET *tcp_packet, uint16_t seglen) { - time_t secs; - time(&secs); + if ( (tcp_packet->tcphdr.flags & PXE_TCP_SYN) == 0) { +#ifdef PXE_DEBUG_HELL + printf("tcp_check_4(): failed\n"); +#endif + return (0); + } + + tcp_send_rst_for(tcp_packet, 0, connection->next_send, PXE_TCP_RST, seglen); - return (secs); + return (1); } -/* check_time_to_die() - moves to CLOSED state connections from state - * TIME_WAIT if last received packet (ACK for FIN in most cases) - * was more than 2*MSL time ago. +/* tcp_check_5() - check if packet has ACK flag * in: - * connection - connection to check + * connection - connection for which packet received + * tcp_packet - received packet * out: - * none + * 0 - not have + * 1 - have */ -static void -check_time_to_die(PXE_TCP_CONNECTION *connection) +static int +tcp_check_5(PXE_TCP_CONNECTION *connection, PXE_TCP_PACKET *tcp_packet) { - /* if connection in other states - do nothing */ - if (connection->state != PXE_TCP_TIME_WAIT) - return; + if ((tcp_packet->tcphdr.flags & PXE_TCP_ACK) == 0) { +#ifdef PXE_DEBUG_HELL + printf("tcp_check_5(): failed\n"); +#endif + return (0); + } - time_t cur_time = get_secs(); + uint32_t ack = tcp_packet->tcphdr.ack_next; + + if (ack > connection->next_send) { /* acked something, that was not sent */ +#ifdef PXE_DEBUG_HELL + printf("tcp_check_5(): acked %d, but nxt_snd = %d. Check failed\n", ack, connection->next_send); +#endif + pxe_tcp_send(connection, 0, PXE_TCP_ACK); + return (0); + } + +/* printf("tcp_check_5(): una = %d, ack = %d\n", connection->una, ack); + if ( connection->una < ack) { */ + connection->una = ack; + pxe_resend_update(connection); +/* } else { /* ignore dublicate packet */ +/* #ifdef PXE_DEBUG + printf("tcp_check_5(): failed\n"); +#endif + return (0); + } +*/ + + connection->remote_window = tcp_packet->tcphdr.window_size; + + return (1); +} + +/* tcp_check_6() - check if packet has URG flag + * in: + * tcp_packet - received packet + * out: + * 0 - not have + * 1 - have + */ +static int +tcp_check_6(PXE_TCP_PACKET *tcp_packet) +{ + if (tcp_packet->tcphdr.flags & PXE_TCP_URG) + return (1); + +#ifdef PXE_DEBUG + printf("tcp_check_6(): failed\n"); +#endif + return (0); +} - if (cur_time - connection->last_recv > 2 * PXE_TCP_MSL) { - /* release filter */ - PXE_FILTER_ENTRY *filter = connection->filter; - - if (filter != NULL) /* it must always be non NULL */ - pxe_filter_remove(filter); - - /* release connection */ - free_connection(connection); +/* tcp_process_7() - processes data and sends ACK + * in: + * connection - connection for which packet received + * tcp_packet - received packet + * seglen - segment length + * out: + * 0 - not have + * 1 - have + */ +static void +tcp_process_7(PXE_TCP_CONNECTION *connection, PXE_TCP_PACKET *tcp_packet, uint16_t seglen) +{ + connection->next_recv += seglen; + + if (seglen == 0 ) + connection->next_recv += 1; + +#ifdef PXE_DEBUG + printf("tcp_process_7(): ack = %d, seq = %d, seglen = %d\n", connection->next_recv, connection->next_send, seglen); +#endif + if (seglen > 0) { + /* write data to buffer */ + void *data = ((void *)tcp_packet) + sizeof(PXE_IP_HDR) + 4 * (tcp_packet->tcphdr.data_off >> 4); + pxe_buffer_write(connection->recv, data, seglen); } + + pxe_tcp_send(connection, 0, PXE_TCP_ACK); + connection->last_recv = pxe_get_secs(); } -/* tcp_send_rst_for() - sends RST in reply to provided packet +/* tcp_check_8() - check if packet has FIN flag * in: - * tcp_packet - packet which caused RST sending + * tcp_packet - received packet * out: - * 0 - failed - * 1 - success + * 0 - not have + * 1 - have */ static int -tcp_send_rst_for(PXE_TCP_PACKET *tcp_packet) +tcp_check_8(PXE_TCP_PACKET *tcp_packet) { - PXE_TCP_CONNECTION connection; - pxe_memset(&connection, 0, sizeof(PXE_TCP_CONNECTION)); - - connection.dst_port = le2be16(tcp_packet->tcphdr.src_port); - connection.src_port = le2be16(tcp_packet->tcphdr.dst_port); - connection.dst_ip = tcp_packet->iphdr.src_ip; - connection.next_recv = le2be32(tcp_packet->tcphdr.sequence) + 1; - connection.next_send = le2be32(tcp_packet->tcphdr.ack_next); - - return pxe_tcp_send(&connection, 0, PXE_TCP_RST | PXE_TCP_ACK); + if (tcp_packet->tcphdr.flags & PXE_TCP_FIN) + return (1); +#ifdef PXE_DEBUG + printf("tcp_check_8(): failed\n"); +#endif + return (0); } /* tcp_syn_sent() - SYN_SENT state handler @@ -177,34 +338,81 @@ * 2 - try next state handler */ static int -tcp_syn_sent(PXE_TCP_PACKET *tcp_packet, PXE_TCP_CONNECTION *connection) +tcp_syn_sent(PXE_TCP_PACKET *tcp_packet, PXE_TCP_CONNECTION *connection, uint16_t seglen) { - uint8_t flags = tcp_packet->tcphdr.flags; + uint8_t flags = tcp_packet->tcphdr.flags; + uint32_t ack = tcp_packet->tcphdr.ack_next; + uint32_t seq = tcp_packet->tcphdr.sequence; + int acceptable = 1; - /* accepting only SYN+ACK */ - if ( (flags & (PXE_TCP_SYN | PXE_TCP_ACK)) - != (PXE_TCP_SYN | PXE_TCP_ACK)) - { - return (0); /* drop, may be better RST */ - } + /* first check */ + if ( flags & PXE_TCP_ACK) { + + if ( (ack <= connection->iss) || (ack > connection->next_send) ) { + - connection->next_recv = le2be32(tcp_packet->tcphdr.sequence) + 1; - connection->next_send = le2be32(tcp_packet->tcphdr.ack_next); - -#ifdef PXE_DEBUG_HELL - printf("tcp_syn_sent(): ack = %d, seq = %d\n", connection->next_recv, connection->next_send); -#endif - if (pxe_tcp_send(connection, 0, PXE_TCP_ACK)) { - connection->state = PXE_TCP_ESTABLISHED; -#ifdef PXE_DEBUG_HELL - printf("tcp_syn_sent(): new state - ESTABLISHED\n"); + if ( (flags & PXE_TCP_RST) == 0) { /* sending RST, if it was not sent to us */ +#ifdef PXE_DEBUG + printf("tcp_syn_sent(): resetting, ack = %d, iss = %d, nxt = %d\n", + ack, connection->iss, connection->next_send); #endif - /* updating last recv time. Used in resending and TIME_WAIT state */ - connection->last_recv = get_secs(); - } else { - printf("tcp_syn_sent(): failed to ack syn reply packet.\n"); + tcp_send_rst_for(tcp_packet, ack, 0, PXE_TCP_RST, 0); + } + + /* drop segment and return */ + return (0); + } + + /* check if ACK acceptable */ + if ( (connection->una > ack) || (ack > connection->next_send) ) { + acceptable = 0; + } + } + + /* second check, check RST */ + if (flags & PXE_TCP_RST) { + + if (acceptable == 0) { /* just drop */ + return (0); + } + + /* destroy connection */ +#ifdef PXE_DEBUG + printf("tcp_syn_sent(): new state - CLOSED\n"); +#endif + connection->state = PXE_TCP_CLOSED; + return (0); } + + /* third check */ + /* TODO?: check security/compartment and precedence */ + + /* fourth check, check SYN */ + if (flags & PXE_TCP_SYN) { + if (acceptable == 1) { + connection->next_recv = seq + 1; + connection->irs = seq; + connection->una = ack; + pxe_resend_update(connection); + } + + if ((connection->una > connection->iss) || (acceptable == 1) ) { + /* acking */ + if (pxe_tcp_send(connection, 0, PXE_TCP_ACK)) { +#ifdef PXE_DEBUG + printf("tcp_syn_sent(): new state - ESTABLISHED\n"); +#endif + connection->state = PXE_TCP_ESTABLISHED; + connection->last_recv = pxe_get_secs(); + } else { + printf("tcp_syn_sent(): failed to ack syn reply packet.\n"); + } + } else { + /* enter SYN_RECEIVED, form SYN+ACK */ + } + } + return (0); } @@ -218,35 +426,46 @@ * 2 - try next state handler */ static int -tcp_established(PXE_TCP_PACKET *tcp_packet, PXE_TCP_CONNECTION *connection) +tcp_established(PXE_TCP_PACKET *tcp_packet, PXE_TCP_CONNECTION *connection, uint16_t seglen) { - uint8_t flags = tcp_packet->tcphdr.flags; + /* first check, if acceptable at all */ + if (!tcp_check_1(connection, tcp_packet, seglen)) + return (0); + + /* check, if have RST flag, sequentially incorrect or have SYN */ + if (( tcp_check_2(tcp_packet)) || + (!tcp_check_3(connection, tcp_packet)) || + ( tcp_check_4(connection, tcp_packet, seglen))) + { + connection->state = PXE_TCP_CLOSED; +#ifdef PXE_DEBUG + printf("tcp_established(): new state - CLOSED\n"); +#endif + pxe_resend_free(connection); + return (0); + } + + /* fifth check, if ACK received */ + if (!tcp_check_5(connection, tcp_packet)) { + return (0); + } - if (flags & PXE_TCP_FIN) { /* remote host requested connection break */ + /* sixth check, if urgent */ + if (tcp_check_6(tcp_packet)) { /* ignore for now */ + return (0); + } - connection->next_recv = le2be32(tcp_packet->tcphdr.sequence) + 1; - connection->next_send = le2be32(tcp_packet->tcphdr.ack_next); - -#ifdef PXE_DEBUG_HELL - printf("tcp_established(): ack = %d, seq = %d\n", connection->next_recv, connection->next_send); -#endif - if (!pxe_tcp_send(connection, 0, PXE_TCP_ACK)) { - printf("tcp_established(): failed to ack FIN request.\n"); - return (0); - } + /* seventh, process segment */ + tcp_process_7(connection, tcp_packet, seglen); - connection->last_recv = get_secs(); + /* eighth, check FIN */ + if (tcp_check_8(tcp_packet)) { /* remote host requested connection break */ connection->state = PXE_TCP_CLOSE_WAIT; -#ifdef PXE_DEBUG_HELL +#ifdef PXE_DEBUG printf("tcp_established(): new state - CLOSE_WAIT\n"); #endif - return (0); } - /* TODO: process data receiving */ - - - connection->last_recv = get_secs(); return (0); } @@ -260,45 +479,64 @@ * 2 - try next state handler */ static int -tcp_fin_wait1(PXE_TCP_PACKET *tcp_packet, PXE_TCP_CONNECTION *connection) +tcp_fin_wait1(PXE_TCP_PACKET *tcp_packet, PXE_TCP_CONNECTION *connection, uint16_t seglen) { - uint8_t flags = tcp_packet->tcphdr.flags; + /* first check, if acceptable at all */ + if (!tcp_check_1(connection, tcp_packet, seglen)) + return (0); + + /* check, if have RST or SYN flag */ + if ((tcp_check_2(tcp_packet)) || + (tcp_check_4(connection, tcp_packet, seglen)) ) + { + connection->state = PXE_TCP_CLOSED; +#ifdef PXE_DEBUG + printf("tcp_fin_wait1(): new state - CLOSED\n"); +#endif + pxe_resend_free(connection); + return (0); + } - if ( (flags & (PXE_TCP_ACK | PXE_TCP_FIN)) == ((PXE_TCP_ACK | PXE_TCP_FIN)) ) { - /* remote host acked our FIN and sent FIN */ - - connection->next_recv = le2be32(tcp_packet->tcphdr.sequence) + 1; - connection->next_send = le2be32(tcp_packet->tcphdr.ack_next); - -#ifdef PXE_DEBUG_HELL - printf("tcp_fin_wait1(): ack = %d, seq = %d\n", connection->next_recv, connection->next_send); -#endif - - if (!pxe_tcp_send(connection, 0, PXE_TCP_ACK)) { - printf("tcp_fin_wait2(): failed to ack FIN request.\n"); - return (0); - } - - connection->state = PXE_TCP_CLOSING; -#ifdef PXE_DEBUG_HELL - printf("tcp_fin_wait1(): new state - CLOSING\n"); -#endif - connection->last_recv = get_secs(); + /* check if ACK */ + if (!tcp_check_5(connection, tcp_packet)) { return (0); + } else { + /* TODO: move updating of next_send to pxe_tcp_send() */ + connection->next_send = tcp_packet->tcphdr.ack_next; } - if (flags & PXE_TCP_ACK) { /* remote host just acked our FIN */ - -/* connection->next_recv = le2be32(tcp_packet->tcphdr.sequence) + 1; */ - connection->next_send = le2be32(tcp_packet->tcphdr.ack_next); + /* if acked FIN */ +/* if (tcp_check_8(tcp_packet)) { */ + if (connection->state_out == PXE_TCP_FIN) { connection->state = PXE_TCP_FIN_WAIT2; -#ifdef PXE_DEBUG_HELL - printf("tcp_fin_wait1(): ack = %d, seq = %d\n", connection->next_recv, connection->next_send); +#ifdef PXE_DEBUG printf("tcp_fin_wait1(): new state - FIN_WAIT_2\n"); -#endif - connection->last_recv = get_secs(); +#endif + return (0); + } + + if (tcp_check_6(tcp_packet)) { /* ignore for now */ + return (0); } + tcp_process_7(connection, tcp_packet, seglen); + + /* check acked FIN */ + if (tcp_check_8(tcp_packet)) { + if (connection->state_out == PXE_TCP_FIN) { + connection->state = PXE_TCP_TIME_WAIT; +#ifdef PXE_DEBUG + printf("tcp_fin_wait1(): new state - TIME_WAIT\n"); +#endif + /* TODO: start TIME_WAIT timer */ + } else { + connection->state = PXE_TCP_CLOSING; +#ifdef PXE_DEBUG + printf("tcp_fin_wait1(): new state - CLOSING\n"); +#endif + } + } + return (0); } @@ -312,16 +550,34 @@ * 2 - try next state handler */ static int -tcp_closing(PXE_TCP_PACKET *tcp_packet, PXE_TCP_CONNECTION *connection) +tcp_closing(PXE_TCP_PACKET *tcp_packet, PXE_TCP_CONNECTION *connection, uint16_t seglen) { - uint8_t flags = tcp_packet->tcphdr.flags; + /* first check, if acceptable at all */ + if (!tcp_check_1(connection, tcp_packet, seglen)) + return (0); + + /* check, if have RST OR SYN flag */ + if ( (tcp_check_2(tcp_packet)) || + (tcp_check_4(connection, tcp_packet, seglen)) ) + { + connection->state = PXE_TCP_CLOSED; +#ifdef PXE_DEBUG + printf("tcp_closing(): new state - CLOSED\n"); +#endif + pxe_resend_free(connection); + return (0); + } - if (flags & PXE_TCP_ACK) { /* remote host acked FIN */ + /* check ACK */ + if (!tcp_check_5(connection, tcp_packet)) { + return (0); + } + + if (connection->state_out = PXE_TCP_FIN) { connection->state = PXE_TCP_TIME_WAIT; -#ifdef PXE_DEBUG_HELL +#ifdef PXE_DEBUG printf("tcp_closing(): new state - TIME_WAIT\n"); #endif - connection->last_recv = get_secs(); } return (0); @@ -337,27 +593,50 @@ * 2 - try next state handler */ static int -tcp_fin_wait2(PXE_TCP_PACKET *tcp_packet, PXE_TCP_CONNECTION *connection) +tcp_fin_wait2(PXE_TCP_PACKET *tcp_packet, PXE_TCP_CONNECTION *connection, uint16_t seglen) { - uint8_t flags = tcp_packet->tcphdr.flags; + /* first check, if acceptable at all */ + if (!tcp_check_1(connection, tcp_packet, seglen)) + return (0); + + /* check, if have RST or SYN flag */ + if ((tcp_check_2(tcp_packet)) || + (tcp_check_4(connection, tcp_packet, seglen)) ) + { + connection->state = PXE_TCP_CLOSED; +#ifdef PXE_DEBUG + printf("tcp_fin_wait2(): new state - CLOSED\n"); +#endif + pxe_resend_free(connection); + return (0); + } + + if (!tcp_check_5(connection, tcp_packet)) { + return (0); + } + +/* + if (tcp_queue_size(connection) == 0) { + connection->state = PXE_TCP_CLOSE; + } +*/ + /* check URG flag */ + if (tcp_check_6(tcp_packet)) { /* ignore for now */ + return (0); + } + + connection->next_send = tcp_packet->tcphdr.ack_next; - if (flags & PXE_TCP_FIN) { /* remote sent FIN */ + /* process data */ + tcp_process_7(connection, tcp_packet, seglen); - connection->next_recv = le2be32(tcp_packet->tcphdr.sequence) + 1; - connection->next_send = le2be32(tcp_packet->tcphdr.ack_next); -#ifdef PXE_DEBUG_HELL - printf("tcp_fin_wait2(): ack = %d, seq = %d\n", connection->next_recv, connection->next_send); -#endif - if (!pxe_tcp_send(connection, 0, PXE_TCP_ACK)) { - printf("tcp_fin_wait2(): failed to ack FIN request.\n"); - return (0); - } - + /* check acked FIN */ + if (tcp_check_8(tcp_packet)) { connection->state = PXE_TCP_TIME_WAIT; -#ifdef PXE_DEBUG_HELL +#ifdef PXE_DEBUG printf("tcp_fin_wait2(): new state - TIME_WAIT\n"); -#endif - connection->last_recv = get_secs(); +#endif + /* TODO: start TIME_WAIT timer */ } return (0); @@ -373,12 +652,36 @@ * 2 - try next state handler */ static int -tcp_time_wait(PXE_TCP_PACKET *tcp_packet, PXE_TCP_CONNECTION *connection) +tcp_time_wait(PXE_TCP_PACKET *tcp_packet, PXE_TCP_CONNECTION *connection, uint16_t seglen) { - /* this state grabs lost packets */ + /* first check, if acceptable at all */ + if (!tcp_check_1(connection, tcp_packet, seglen)) + return (0); + + /* check, if have RST or SYN flag */ + if ((tcp_check_2(tcp_packet)) || + (tcp_check_4(connection, tcp_packet, seglen)) ) + { + connection->state = PXE_TCP_CLOSED; +#ifdef PXE_DEBUG + printf("tcp_time_wait(): new state - CLOSED\n"); +#endif + pxe_resend_free(connection); + return (0); + } - check_time_to_die(connection); + if (!tcp_check_5(connection, tcp_packet)) { + /* testart 2MSL timeout */ + return (0); + } + /* ignore URG flag in this state */ +/* if (tcp_check_6(tcp_packet)) { + return (0); + } +*/ + /* ignore data processing */ + return (0); } @@ -392,11 +695,35 @@ * 2 - try next state handler */ static int -tcp_close_wait(PXE_TCP_PACKET *tcp_packet, PXE_TCP_CONNECTION *connection) +tcp_close_wait(PXE_TCP_PACKET *tcp_packet, PXE_TCP_CONNECTION *connection, uint16_t seglen) { -#ifdef PXE_DEBUG_HELL - printf("tcp_close_wait(): started.\n"); + /* first check, if acceptable at all */ + if (!tcp_check_1(connection, tcp_packet, seglen)) + return (0); + + /* check, if have RST or SYN flag */ + if ((tcp_check_2(tcp_packet)) || + (tcp_check_4(connection, tcp_packet, seglen)) ) + { + connection->state = PXE_TCP_CLOSED; +#ifdef PXE_DEBUG + printf("tcp_close_wait(): new state - CLOSED\n"); #endif + pxe_resend_free(connection); + return (0); + } + >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Jun 27 16:25:11 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2D38D16A468; Wed, 27 Jun 2007 16:25:11 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id DC37D16A400 for ; Wed, 27 Jun 2007 16:25:10 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id CE61213C4B9 for ; Wed, 27 Jun 2007 16:25:10 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5RGPA7I059559 for ; Wed, 27 Jun 2007 16:25:10 GMT (envelope-from lulf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5RGPAYI059556 for perforce@freebsd.org; Wed, 27 Jun 2007 16:25:10 GMT (envelope-from lulf@FreeBSD.org) Date: Wed, 27 Jun 2007 16:25:10 GMT Message-Id: <200706271625.l5RGPAYI059556@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lulf@FreeBSD.org using -f From: Ulf Lilleengen To: Perforce Change Reviews Cc: Subject: PERFORCE change 122412 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Jun 2007 16:25:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=122412 Change 122412 by lulf@lulf_carrot on 2007/06/27 16:24:10 - Remove unused debug info. - Add support for mounted RAID5 rebuild. Requests are delayed if they interfere with the rebuild, and are executed right after rebuild is finished. If they don't interfere, just pass them through. - Add handling of REBUILD flag in setstate - Add padding so userland sets the correct size of gv_plex struct. Affected files ... .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_events.c#4 edit .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_plex.c#15 edit .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_raid5.c#8 edit .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_state.c#13 edit .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_var.h#16 edit Differences ... ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_events.c#4 (text+ko) ==== @@ -384,6 +384,8 @@ bioq_init(p->bqueue); p->wqueue = g_malloc(sizeof(struct bio_queue_head), M_WAITOK | M_ZERO); bioq_init(p->wqueue); + p->rqueue = g_malloc(sizeof(struct bio_queue_head), M_WAITOK | M_ZERO); + bioq_init(p->rqueue); } void ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_plex.c#15 (text+ko) ==== @@ -50,6 +50,7 @@ static void gv_init_complete(struct gv_plex *, struct bio *); static struct bio * gv_plexbuffer(struct gv_plex *, struct bio *, caddr_t, off_t, off_t, int *); +static void gv_plex_flush(struct gv_plex *); void gv_plex_start(struct gv_plex *p, struct bio *bp) @@ -65,9 +66,6 @@ addr = bp->bio_data; boff = bp->bio_offset; - if (!(bp->bio_cflags & GV_BIO_REBUILD)) - printf("New BIO!, not rebuild\n"); - /* Walk over the whole length of the request, we might split it up. */ while (bcount > 0) { wp = NULL; @@ -716,6 +714,9 @@ if (error) { printf("VINUM: rebuild of %s failed at offset %jd errno: %d\n", p->name, (intmax_t)offset, error); + p->flags &= ~GV_PLEX_REBUILDING; + p->synced = 0; + gv_plex_flush(p); /* Flush out remaining rebuild BIOs. */ return; } @@ -730,6 +731,7 @@ /* Try to up all subdisks. */ LIST_FOREACH(s, &p->subdisks, in_plex) gv_update_sd_state(s); + gv_plex_flush(p); /* Flush out remaining rebuild BIOs. */ return; } @@ -737,6 +739,20 @@ gv_parity_request(p, flags, offset); } +static void +gv_plex_flush(struct gv_plex *p) +{ + struct gv_softc *sc; + struct bio *bp; + + sc = p->vinumconf; + bp = bioq_takefirst(p->rqueue); + while (bp != NULL) { + gv_plex_start(p, bp); + bp = bioq_takefirst(p->rqueue); + } +} + void gv_parityop(struct gv_softc *sc, struct gctl_req *req) { ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_raid5.c#8 (text+ko) ==== @@ -379,6 +379,11 @@ if ((p->flags & GV_PLEX_REBUILDING) && (boff + real_len < p->synced)) type = REQ_TYPE_NORMAL; + if ((p->flags & GV_PLEX_REBUILDING) && (boff + real_len >= p->synced)) { + bioq_disksort(p->rqueue, bp); + return (0); + } + switch (bp->bio_cmd) { case BIO_READ: /* ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_state.c#13 (text+ko) ==== @@ -453,7 +453,8 @@ /* Some of our subdisks are initializing. */ } else if (sdstates & GV_SD_INITSTATE) { - if (p->flags & GV_PLEX_SYNCING) + if (p->flags & GV_PLEX_SYNCING || + p->flags & GV_PLEX_REBUILDING) p->state = GV_PLEX_DEGRADED; else p->state = GV_PLEX_DOWN; ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_var.h#16 (text+ko) ==== @@ -336,8 +336,9 @@ #ifdef _KERNEL struct bio_queue_head *bqueue; /* BIO queue. */ struct bio_queue_head *wqueue; /* Waiting BIO queue. */ + struct bio_queue_head *rqueue; /* Rebuild waiting BIO queue. */ #else - char *bpad, *wpad; /* Padding for userland. */ + char *bpad, *wpad, *rpad; /* Padding for userland. */ #endif struct gv_softc *vinumconf; /* Pointer to the vinum config. */ From owner-p4-projects@FreeBSD.ORG Wed Jun 27 16:51:44 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CD9D516A46C; Wed, 27 Jun 2007 16:51:43 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 842A616A469 for ; Wed, 27 Jun 2007 16:51:43 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 7703113C45D for ; Wed, 27 Jun 2007 16:51:43 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5RGphUg070039 for ; Wed, 27 Jun 2007 16:51:43 GMT (envelope-from lulf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5RGphrl070026 for perforce@freebsd.org; Wed, 27 Jun 2007 16:51:43 GMT (envelope-from lulf@FreeBSD.org) Date: Wed, 27 Jun 2007 16:51:43 GMT Message-Id: <200706271651.l5RGphrl070026@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lulf@FreeBSD.org using -f From: Ulf Lilleengen To: Perforce Change Reviews Cc: Subject: PERFORCE change 122413 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Jun 2007 16:51:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=122413 Change 122413 by lulf@lulf_carrot on 2007/06/27 16:50:59 - Issue requests that are delayed due to synchronization right after the sync is finished. The way it was earlier, the requests could be issued in incorrect order. Affected files ... .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_volume.c#9 edit Differences ... ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_volume.c#9 (text+ko) ==== @@ -248,10 +248,7 @@ /* Issue all delayed requests. */ bp = bioq_takefirst(v->wqueue); while (bp != NULL) { -/* gv_volume_start(v, bp);*/ - mtx_lock(&sc->queue_mtx); - bioq_disksort(sc->bqueue, bp); - mtx_unlock(&sc->queue_mtx); + gv_volume_start(sc, bp); bp = bioq_takefirst(v->wqueue); } return (0); From owner-p4-projects@FreeBSD.ORG Wed Jun 27 17:22:23 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 86A8516A421; Wed, 27 Jun 2007 17:22:23 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E233A16A400 for ; Wed, 27 Jun 2007 17:22:22 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id D357E13C489 for ; Wed, 27 Jun 2007 17:22:22 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5RHMMuJ075198 for ; Wed, 27 Jun 2007 17:22:22 GMT (envelope-from lulf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5RHMMQQ075195 for perforce@freebsd.org; Wed, 27 Jun 2007 17:22:22 GMT (envelope-from lulf@FreeBSD.org) Date: Wed, 27 Jun 2007 17:22:22 GMT Message-Id: <200706271722.l5RHMMQQ075195@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lulf@FreeBSD.org using -f From: Ulf Lilleengen To: Perforce Change Reviews Cc: Subject: PERFORCE change 122415 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Jun 2007 17:22:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=122415 Change 122415 by lulf@lulf_carrot on 2007/06/27 17:22:20 - Modify gv_event structure to contain to intmax variables, and remove one pointer. This way we won't have to allocate and deallocate memory for passing integer values. intmax_t should be large enough i think. - Modify all code that uses the event-structure and post_event to use the structure correctly. Affected files ... .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum.c#20 edit .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum.h#16 edit .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_events.c#5 edit .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_init.c#12 edit .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_plex.c#16 edit .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_rm.c#7 edit .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_state.c#14 edit .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_var.h#17 edit Differences ... ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum.c#20 (text+ko) ==== @@ -73,7 +73,7 @@ g_trace(G_T_TOPOLOGY, "gv_orphan(%s)", gp->name); - gv_post_event(sc, GV_EVENT_DRIVE_LOST, d, NULL, NULL); + gv_post_event(sc, GV_EVENT_DRIVE_LOST, d, NULL, 0, 0); } void @@ -186,7 +186,7 @@ sc = gp->softc; if (sc != NULL) { - gv_post_event(sc, GV_EVENT_THREAD_EXIT, NULL, NULL, NULL); + gv_post_event(sc, GV_EVENT_THREAD_EXIT, NULL, NULL, 0, 0); gp->softc = NULL; g_wither_geom(gp, ENXIO); return (EAGAIN); @@ -231,7 +231,7 @@ v = gv_find_vol(sc, parent); p = gv_find_plex(sc, child); /* XXX: Rename not supported yet. */ - gv_post_event(sc, GV_EVENT_ATTACH_PLEX, p, v, NULL); + gv_post_event(sc, GV_EVENT_ATTACH_PLEX, p, v, 0, 0); break; case GV_TYPE_SD: if (type_parent != GV_TYPE_PLEX) { @@ -241,7 +241,7 @@ p = gv_find_plex(sc, parent); s = gv_find_sd(sc, child); /* XXX: Rename not supported yet. */ - gv_post_event(sc, GV_EVENT_ATTACH_SD, s, p, NULL); + gv_post_event(sc, GV_EVENT_ATTACH_SD, s, p, 0, 0); break; default: gctl_error(req, "invalid child type"); @@ -270,12 +270,12 @@ case GV_TYPE_PLEX: /* XXX: Support flags. */ p = gv_find_plex(sc, object); - gv_post_event(sc, GV_EVENT_DETACH_PLEX, p, NULL, NULL); + gv_post_event(sc, GV_EVENT_DETACH_PLEX, p, NULL, 0, 0); break; case GV_TYPE_SD: /* XXX: Support flags. */ s = gv_find_sd(sc, object); - gv_post_event(sc, GV_EVENT_DETACH_SD, s, NULL, NULL); + gv_post_event(sc, GV_EVENT_DETACH_SD, s, NULL, 0, 0); break; default: gctl_error(req, "invalid object type"); @@ -328,7 +328,7 @@ d = g_malloc(sizeof(*d), M_WAITOK | M_ZERO); bcopy(d2, d, sizeof(*d)); - gv_post_event(sc, GV_EVENT_CREATE_DRIVE, d, NULL, NULL); + gv_post_event(sc, GV_EVENT_CREATE_DRIVE, d, NULL, 0, 0); } /* ... then volume definitions ... */ @@ -345,7 +345,7 @@ v = g_malloc(sizeof(*v), M_WAITOK | M_ZERO); bcopy(v2, v, sizeof(*v)); - gv_post_event(sc, GV_EVENT_CREATE_VOLUME, v, NULL, NULL); + gv_post_event(sc, GV_EVENT_CREATE_VOLUME, v, NULL, 0, 0); } /* ... then plex definitions ... */ @@ -362,7 +362,7 @@ p = g_malloc(sizeof(*p), M_WAITOK | M_ZERO); bcopy(p2, p, sizeof(*p)); - gv_post_event(sc, GV_EVENT_CREATE_PLEX, p, NULL, NULL); + gv_post_event(sc, GV_EVENT_CREATE_PLEX, p, NULL, 0, 0); } /* ... and, finally, subdisk definitions. */ @@ -379,10 +379,10 @@ s = g_malloc(sizeof(*s), M_WAITOK | M_ZERO); bcopy(s2, s, sizeof(*s)); - gv_post_event(sc, GV_EVENT_CREATE_SD, s, NULL, NULL); + gv_post_event(sc, GV_EVENT_CREATE_SD, s, NULL, 0, 0); } - gv_post_event(sc, GV_EVENT_SAVE_CONFIG, sc, NULL, NULL); + gv_post_event(sc, GV_EVENT_SAVE_CONFIG, sc, NULL, 0, 0); return (0); } @@ -411,7 +411,7 @@ /* Save our configuration back to disk. */ } else if (!strcmp(verb, "saveconfig")) { - gv_post_event(sc, GV_EVENT_SAVE_CONFIG, sc, NULL, NULL); + gv_post_event(sc, GV_EVENT_SAVE_CONFIG, sc, NULL, 0, 0); /* Return configuration in string form. */ } else if (!strcmp(verb, "getconfig")) { @@ -442,7 +442,7 @@ gv_rename(gp, req); } else if (!strcmp(verb, "resetconfig")) { - gv_post_event(sc, GV_EVENT_RESET_CONFIG, sc, NULL, NULL); + gv_post_event(sc, GV_EVENT_RESET_CONFIG, sc, NULL, 0, 0); } else if (!strcmp(verb, "start")) { gv_start_obj(gp, req); @@ -495,7 +495,8 @@ /* Check if what we've been given is a valid vinum drive. */ if (vhdr != NULL) { if (vhdr->magic == GV_MAGIC) - gv_post_event(sc, GV_EVENT_DRIVE_TASTED, pp, NULL, NULL); + gv_post_event(sc, GV_EVENT_DRIVE_TASTED, pp, NULL, 0, + 0); g_free(vhdr); } @@ -602,53 +603,45 @@ case GV_EVENT_SET_SD_STATE: printf("VINUM: event 'setstate sd'\n"); s = ev->arg1; - newstate = *(int *)ev->arg2; - flags = *(int *)ev->arg3; + newstate = ev->arg3; + flags = ev->arg4; err = gv_set_sd_state(s, newstate, flags); if (err) printf("VINUM: error setting subdisk " "state: error code %d\n", err); - g_free(ev->arg2); - g_free(ev->arg3); break; case GV_EVENT_SET_DRIVE_STATE: printf("VINUM: event 'setstate drive'\n"); d = ev->arg1; - newstate = *(int *)ev->arg2; - flags = *(int *)ev->arg3; + newstate = ev->arg3; + flags = ev->arg4; err = gv_set_drive_state(d, newstate, flags); if (err) printf("VINUM: error setting drive " "state: error code %d\n", err); - g_free(ev->arg2); - g_free(ev->arg3); break; case GV_EVENT_SET_VOL_STATE: printf("VINUM: event 'setstate volume'\n"); v = ev->arg1; - newstate = *(int *)ev->arg2; - flags = *(int *)ev->arg3; + newstate = ev->arg3; + flags = ev->arg4; err = gv_set_vol_state(v, newstate, flags); if (err) printf("VINUM: error setting volume " "state: error code %d\n", err); - g_free(ev->arg2); - g_free(ev->arg3); break; case GV_EVENT_SET_PLEX_STATE: printf("VINUM: event 'setstate plex'\n"); p = ev->arg1; - newstate = *(int *)ev->arg2; - flags = *(int *)ev->arg3; + newstate = ev->arg3; + flags = ev->arg4; err = gv_set_plex_state(p, newstate, flags); if (err) printf("VINUM: error setting plex " "state: error code %d\n", err); - g_free(ev->arg2); - g_free(ev->arg3); break; case GV_EVENT_RESET_CONFIG: ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum.h#16 (text+ko) ==== @@ -96,7 +96,8 @@ int gv_detach_sd(struct gv_sd *, int); void gv_worker(void *); -void gv_post_event(struct gv_softc *, int, void *, void *, void *); +void gv_post_event(struct gv_softc *, int, void *, void *, intmax_t, + intmax_t); void gv_drive_tasted(struct gv_softc *, struct g_provider *); void gv_drive_lost(struct gv_softc *, struct gv_drive *); void gv_setup_objects(struct gv_softc *); ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_events.c#5 (text+ko) ==== @@ -43,7 +43,7 @@ void gv_post_event(struct gv_softc *sc, int event, void *arg1, void *arg2, - void *arg3) + intmax_t arg3, intmax_t arg4) { struct gv_event *ev; @@ -52,6 +52,7 @@ ev->arg1 = arg1; ev->arg2 = arg2; ev->arg3 = arg3; + ev->arg4 = arg4; mtx_lock(&sc->queue_mtx); TAILQ_INSERT_TAIL(&sc->equeue, ev, events); @@ -174,7 +175,7 @@ if (cp->nstart != cp->nend) { printf("VINUM: dead drive '%s' has still active " "requests, can't detach consumer\n", d->name); - gv_post_event(sc, GV_EVENT_DRIVE_LOST, d, NULL, NULL); + gv_post_event(sc, GV_EVENT_DRIVE_LOST, d, NULL, 0, 0); return; } g_topology_lock(); ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_init.c#12 (text+ko) ==== @@ -74,14 +74,14 @@ v = gv_find_vol(sc, argv); if (v != NULL) gv_post_event(sc, GV_EVENT_START_VOLUME, v, - NULL, NULL); + NULL, *initsize, 0); break; case GV_TYPE_PLEX: p = gv_find_plex(sc, argv); if (p != NULL) gv_post_event(sc, GV_EVENT_START_PLEX, p, NULL, - NULL); + *initsize, 0); break; case GV_TYPE_SD: ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_plex.c#16 (text+ko) ==== @@ -800,7 +800,7 @@ /* XXX: The state of the plex might have changed when this event is * picked up ... We should really check this afterwards. */ if (*rebuild) - gv_post_event(sc, GV_EVENT_PARITY_REBUILD, p, NULL, NULL); + gv_post_event(sc, GV_EVENT_PARITY_REBUILD, p, NULL, 0, 0); else - gv_post_event(sc, GV_EVENT_PARITY_CHECK, p, NULL, NULL); + gv_post_event(sc, GV_EVENT_PARITY_CHECK, p, NULL, 0, 0); } ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_rm.c#7 (text+ko) ==== @@ -83,7 +83,7 @@ return; } - gv_post_event(sc, GV_EVENT_RM_VOLUME, v, NULL, NULL); + gv_post_event(sc, GV_EVENT_RM_VOLUME, v, NULL, 0, 0); break; case GV_TYPE_PLEX: @@ -108,7 +108,7 @@ return; } - gv_post_event(sc, GV_EVENT_RM_PLEX, p, NULL, NULL); + gv_post_event(sc, GV_EVENT_RM_PLEX, p, NULL, 0, 0); break; case GV_TYPE_SD: @@ -121,7 +121,7 @@ return; } - gv_post_event(sc, GV_EVENT_RM_SD, s, NULL, NULL); + gv_post_event(sc, GV_EVENT_RM_SD, s, NULL, 0, 0); break; case GV_TYPE_DRIVE: @@ -140,7 +140,7 @@ return; } - gv_post_event(sc, GV_EVENT_RM_DRIVE, d, NULL, NULL); + gv_post_event(sc, GV_EVENT_RM_DRIVE, d, NULL, 0, 0); break; default: @@ -149,7 +149,7 @@ } } - gv_post_event(sc, GV_EVENT_SAVE_CONFIG, sc, NULL, NULL); + gv_post_event(sc, GV_EVENT_SAVE_CONFIG, sc, NULL, 0, 0); } /* Resets configuration */ @@ -177,7 +177,7 @@ LIST_FOREACH_SAFE(v, &sc->volumes, volume, v2) gv_rm_vol(sc, v); - gv_post_event(sc, GV_EVENT_SAVE_CONFIG, sc, NULL, NULL); + gv_post_event(sc, GV_EVENT_SAVE_CONFIG, sc, NULL, 0, 0); return (0); } ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_state.c#14 (text+ko) ==== @@ -46,7 +46,7 @@ struct gv_volume *v; struct gv_plex *p; char *obj, *state; - int f, *flags, *newstatep, *flagp, type; + int f, *flags, type; f = 0; obj = gctl_get_param(req, "object", NULL); @@ -79,13 +79,8 @@ break; } v = gv_find_vol(sc, obj); - - /* XXX: Should try to avoid malloc. */ - newstatep = g_malloc(sizeof(int), M_WAITOK | M_ZERO); - *newstatep = gv_volstatei(state); - flagp = g_malloc(sizeof(int), M_WAITOK | M_ZERO); - *flagp = f; - gv_post_event(sc, GV_EVENT_SET_VOL_STATE, v, newstatep, flagp); + gv_post_event(sc, GV_EVENT_SET_VOL_STATE, v, NULL, + gv_volstatei(state), f); break; case GV_TYPE_PLEX: @@ -94,13 +89,8 @@ break; } p = gv_find_plex(sc, obj); - - /* XXX: Should try to avoid malloc. */ - newstatep = g_malloc(sizeof(int), M_WAITOK | M_ZERO); - *newstatep = gv_plexstatei(state); - flagp = g_malloc(sizeof(int), M_WAITOK | M_ZERO); - *flagp = f; - gv_post_event(sc, GV_EVENT_SET_PLEX_STATE, p, newstatep, flagp); + gv_post_event(sc, GV_EVENT_SET_PLEX_STATE, p, NULL, + gv_plexstatei(state), f); break; case GV_TYPE_SD: @@ -109,13 +99,8 @@ break; } s = gv_find_sd(sc, obj); - - /* XXX: Should try to avoid malloc. */ - newstatep = g_malloc(sizeof(int), M_WAITOK | M_ZERO); - *newstatep = gv_sdstatei(state); - flagp = g_malloc(sizeof(int), M_WAITOK | M_ZERO); - *flagp = f; - gv_post_event(sc, GV_EVENT_SET_SD_STATE, s, newstatep, flagp); + gv_post_event(sc, GV_EVENT_SET_SD_STATE, s, NULL, + gv_sdstatei(state), f); break; case GV_TYPE_DRIVE: @@ -124,14 +109,8 @@ break; } d = gv_find_drive(sc, obj); - - /* XXX: Should try to avoid malloc. */ - newstatep = g_malloc(sizeof(int), M_WAITOK | M_ZERO); - *newstatep = gv_drivestatei(state); - flagp = g_malloc(sizeof(int), M_WAITOK | M_ZERO); - *flagp = f; - gv_post_event(sc, GV_EVENT_SET_DRIVE_STATE, d, newstatep, - flagp); + gv_post_event(sc, GV_EVENT_SET_DRIVE_STATE, d, NULL, + gv_drivestatei(state), f); break; default: ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_var.h#17 (text+ko) ==== @@ -204,7 +204,8 @@ int type; void *arg1; void *arg2; - void *arg3; + intmax_t arg3; + intmax_t arg4; TAILQ_ENTRY(gv_event) events; }; From owner-p4-projects@FreeBSD.ORG Wed Jun 27 17:35:40 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9AF1016A46E; Wed, 27 Jun 2007 17:35:39 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6F74D16A41F for ; Wed, 27 Jun 2007 17:35:39 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 621DC13C46A for ; Wed, 27 Jun 2007 17:35:39 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5RHZdBh076390 for ; Wed, 27 Jun 2007 17:35:39 GMT (envelope-from lulf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5RHZdZl076387 for perforce@freebsd.org; Wed, 27 Jun 2007 17:35:39 GMT (envelope-from lulf@FreeBSD.org) Date: Wed, 27 Jun 2007 17:35:39 GMT Message-Id: <200706271735.l5RHZdZl076387@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lulf@FreeBSD.org using -f From: Ulf Lilleengen To: Perforce Change Reviews Cc: Subject: PERFORCE change 122416 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Jun 2007 17:35:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=122416 Change 122416 by lulf@lulf_carrot on 2007/06/27 17:35:18 - Fix bug in renaming code where we missed an 's' - Enable support for renaming in 'attach' command. - Enable support for setting subdisk offset when attaching a subdisk to a plex. Affected files ... .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum.c#21 edit .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_subr.c#12 edit Differences ... ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum.c#21 (text+ko) ==== @@ -216,9 +216,17 @@ gctl_error(req, "no parent given"); return; } - offset = gctl_get_paraml(req, "offset", sizeof(*offset)); + if (offset == NULL) { + gctl_error(req, "no offset given"); + return; + } rename = gctl_get_paraml(req, "rename", sizeof(*rename)); + if (rename == NULL) { + gctl_error(req, "no rename flag given"); + return; + } + type_child = gv_object_type(sc, child); type_parent = gv_object_type(sc, parent); @@ -230,8 +238,7 @@ } v = gv_find_vol(sc, parent); p = gv_find_plex(sc, child); - /* XXX: Rename not supported yet. */ - gv_post_event(sc, GV_EVENT_ATTACH_PLEX, p, v, 0, 0); + gv_post_event(sc, GV_EVENT_ATTACH_PLEX, p, v, *offset, *rename); break; case GV_TYPE_SD: if (type_parent != GV_TYPE_PLEX) { @@ -241,7 +248,7 @@ p = gv_find_plex(sc, parent); s = gv_find_sd(sc, child); /* XXX: Rename not supported yet. */ - gv_post_event(sc, GV_EVENT_ATTACH_SD, s, p, 0, 0); + gv_post_event(sc, GV_EVENT_ATTACH_SD, s, p, *offset, *rename); break; default: gctl_error(req, "invalid child type"); @@ -514,7 +521,8 @@ struct gv_sd *s; struct gv_drive *d; struct bio *bp; - int newstate, flags, err; + int newstate, flags, err, rename; + off_t offset; sc = arg; KASSERT(sc != NULL, ("NULL sc")); @@ -699,7 +707,8 @@ printf("VINUM: event 'attach'\n"); p = ev->arg1; v = ev->arg2; - err = gv_attach_plex(p, v, 0); + rename = ev->arg4; + err = gv_attach_plex(p, v, rename); if (err) printf("VINUM: error attaching %s to " "%s: error code %d\n", p->name, @@ -710,7 +719,9 @@ printf("VINUM: event 'attach'\n"); s = ev->arg1; p = ev->arg2; - err = gv_attach_sd(s, p, -1, 0); + offset = ev->arg3; + rename = ev->arg4; + err = gv_attach_sd(s, p, offset, rename); if (err) printf("VINUM: error attaching %s to " "%s: error code %d\n", s->name, ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_subr.c#12 (text+ko) ==== @@ -1105,7 +1105,7 @@ gv_update_plex_config(p); if (rename) { - snprintf(s->name, GV_MAXSDNAME, "%s.%d", s->plex, + snprintf(s->name, GV_MAXSDNAME, "%s.s%d", s->plex, p->sdcount - 1); } gv_save_config(p->vinumconf); From owner-p4-projects@FreeBSD.ORG Wed Jun 27 18:08:22 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A094816A46D; Wed, 27 Jun 2007 18:08:22 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5413C16A46B for ; Wed, 27 Jun 2007 18:08:22 +0000 (UTC) (envelope-from thioretic@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 4677A13C4B0 for ; Wed, 27 Jun 2007 18:08:22 +0000 (UTC) (envelope-from thioretic@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5RI8M6K079877 for ; Wed, 27 Jun 2007 18:08:22 GMT (envelope-from thioretic@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5RI8Mif079874 for perforce@freebsd.org; Wed, 27 Jun 2007 18:08:22 GMT (envelope-from thioretic@FreeBSD.org) Date: Wed, 27 Jun 2007 18:08:22 GMT Message-Id: <200706271808.l5RI8Mif079874@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thioretic@FreeBSD.org using -f From: Maxim Zhuravlev To: Perforce Change Reviews Cc: Subject: PERFORCE change 122417 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Jun 2007 18:08:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=122417 Change 122417 by thioretic@thioretic on 2007/06/27 18:08:09 Specifies some basic interfaces. See TODO file. Affected files ... .. //depot/projects/soc2007/thioretic_gidl/TODO#2 edit .. //depot/projects/soc2007/thioretic_gidl/kern/device_if.m#2 edit .. //depot/projects/soc2007/thioretic_gidl/kern/driverops_if.m#1 add .. //depot/projects/soc2007/thioretic_gidl/kern/stackns_if.m#1 add .. //depot/projects/soc2007/thioretic_gidl/sys/uio.h#2 edit Differences ... ==== //depot/projects/soc2007/thioretic_gidl/TODO#2 (text+ko) ==== @@ -1,1 +1,45 @@ -=== Generic Input Device Layer project TODO file ===+=== Generic Input Device Layer project TODO file === +1. Specify stack namespace kobj (add/delete/...) and associated args' types + SOLUTION: specify method sufficent for handling different + kinds of objects. + FILE(S) AFFECTED: kern/stackns_if.m + # the kobj implements the *core* of namespace functionality. + # detailed *outerspace* interfaces is not yet specified. The + # way the namespace will interact with outer world is a matter + # of discussion. + # + # ex. drivers namespace. The namespace is to handle device parts + # of drivers, their driverops part and i/o requests. All these + # can be handled by same operations (add/delete/...), so there + # will be only one set of operations and the kind of object will + # be a parameter. +2. Specify new driver's interface + includes: + a. device interface (attach, detach, probe...) + SOLUTION: add info method + FILE(S) AFFECTED: kern/device_if.m + # currently it returns info of a kinda drivers'-specified + # type. Well, possibly it will become a more standardized + # type in a distant future. It may nicely fit a *caps* + # functionality, when a driver specifies devices with + # which capibilities it supports, and is probed just + # against suitable devices (ex. only against mice devices). + # This would reduce autoconfiguration time and provide a + # user with info in well-defined format. Don't tell me about + # sysctl. I do know, I do know ... ;o) + b. driverops kobj (more likely former cdevsw) + SOLUTION: convert devfs's cdevsw struct t kobj. + FILE(S) AFFECTED: kern/driverops_if.m + # take into account that cdev structure is devfs-specific + # and should be replaced with device_t parameter + # representing the device. Will check, whether it's possible + # to provide an arbitrary interface. No dirty hack will do. + c. modified uio struct (add some *stack-aware* fields) + SOLUTION: add variables: stack_path, state... + FILE(S) AFFECTED: sys/uio.h + # [char* stack_path] holds the path the i/o request should + # pass in stack to be processed. During lifecycle i/o + # request's path may change. + # [int state] lets drivers to influence on i/o request + # lifecycle. + # ... ==== //depot/projects/soc2007/thioretic_gidl/kern/device_if.m#2 (text+ko) ==== @@ -62,6 +62,10 @@ { return EOPNOTSUPP; } + static void* null_info (device_t dev) + { + return EOPNOTSUPP; + } }; /** @@ -314,3 +318,29 @@ METHOD int quiesce { device_t dev; } DEFAULT null_quiesce; + +/** + * @brief This is called when the driver is asked to provide some + * the driver's specific info for the given device. + * + * The method is (? may be) called when a driver is probed against + * some device. The method is included in device interface since + * we shouldn't assert that all drivers in the device's drivers stack + * have provided a *driverops* interface. + * + * To include this method in a device driver, use a line like this + * in the driver's method list: + * + * @code + * KOBJMETHOD(device_info, foo_info) + * @endcode + * + * @param dev the device being requested info about + * + * @retval a pointer to data of a user-defined type. + * currently char* is more likely. + * + */ +METHOD void* info { + device_t dev; +} DEFAULT null_info; ==== //depot/projects/soc2007/thioretic_gidl/sys/uio.h#2 (text+ko) ==== @@ -68,6 +68,11 @@ enum uio_seg uio_segflg; enum uio_rw uio_rw; struct thread *uio_td; + char* stack_path; +#define INVALIDATE 1 +#define FULFILLED 2 +#define RETRY 4 + int state; }; /* From owner-p4-projects@FreeBSD.ORG Wed Jun 27 18:30:57 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F167E16A46B; Wed, 27 Jun 2007 18:30:56 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9199716A421 for ; Wed, 27 Jun 2007 18:30:56 +0000 (UTC) (envelope-from pjd@garage.freebsd.pl) Received: from mail.garage.freebsd.pl (arm132.internetdsl.tpnet.pl [83.17.198.132]) by mx1.freebsd.org (Postfix) with ESMTP id 28B9913C45E for ; Wed, 27 Jun 2007 18:30:53 +0000 (UTC) (envelope-from pjd@garage.freebsd.pl) Received: by mail.garage.freebsd.pl (Postfix, from userid 65534) id 3479E45CD9; Wed, 27 Jun 2007 20:30:51 +0200 (CEST) Received: from localhost (154.81.datacomsa.pl [195.34.81.154]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.garage.freebsd.pl (Postfix) with ESMTP id 887FE45696; Wed, 27 Jun 2007 20:30:42 +0200 (CEST) Date: Wed, 27 Jun 2007 20:30:39 +0200 From: Pawel Jakub Dawidek To: Roman Divacky Message-ID: <20070627183039.GC4821@garage.freebsd.pl> References: <200706211001.l5LA16H4021185@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="W5WqUoFLvi1M7tJE" Content-Disposition: inline In-Reply-To: <200706211001.l5LA16H4021185@repoman.freebsd.org> X-PGP-Key-URL: http://people.freebsd.org/~pjd/pjd.asc X-OS: FreeBSD 7.0-CURRENT i386 User-Agent: mutt-ng/devel-r804 (FreeBSD) X-Spam-Checker-Version: SpamAssassin 3.0.4 (2005-06-05) on mail.garage.freebsd.pl X-Spam-Level: X-Spam-Status: No, score=-2.6 required=3.0 tests=BAYES_00 autolearn=ham version=3.0.4 Cc: Perforce Change Reviews Subject: Re: PERFORCE change 122077 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Jun 2007 18:30:57 -0000 --W5WqUoFLvi1M7tJE Content-Type: text/plain; charset=iso-8859-2 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Jun 21, 2007 at 10:01:06AM +0000, Roman Divacky wrote: > http://perforce.freebsd.org/chv.cgi?CH=3D122077 >=20 > Change 122077 by rdivacky@rdivacky_witten on 2007/06/21 10:00:59 >=20 > Introduce kern_absolute_path which checks whether a given path is absolu= te or > not by checking first char for being '/'. > =09 > Use this function to implement BADF semantic of *at syscalls. [...] > +/* Check whether a path is an absolute path. */ > +static int kern_absolute_path(char *path, enum uio_seg pathseg) > +{ > + int error, len; > + char buf[PATH_MAX]; > + > + if (pathseg =3D=3D UIO_SYSSPACE) { > + return (path[0] =3D=3D '/'); =09 > + } else { > + error =3D copyinstr(path, buf, PATH_MAX, &len); > + if (error) > + return 1; /* we want to fail */ When you cannot copy the data do you really want to return TRUE? > + return (buf[0] =3D=3D '/');=09 > + } > +} --=20 Pawel Jakub Dawidek http://www.wheel.pl pjd@FreeBSD.org http://www.FreeBSD.org FreeBSD committer Am I Evil? Yes, I Am! --W5WqUoFLvi1M7tJE Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (FreeBSD) iD8DBQFGgqzPForvXbEpPzQRAhFvAJ4xFx5gYTm/dOCcV6Mhj6jTc/XpeACg2YMg Q5s4iVSBuRNsh1ZbAGUBkGk= =9fr8 -----END PGP SIGNATURE----- --W5WqUoFLvi1M7tJE-- From owner-p4-projects@FreeBSD.ORG Wed Jun 27 20:42:38 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F0F6F16A469; Wed, 27 Jun 2007 20:42:37 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9139516A400 for ; Wed, 27 Jun 2007 20:42:37 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 82DFD13C448 for ; Wed, 27 Jun 2007 20:42:37 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5RKgb9U016517 for ; Wed, 27 Jun 2007 20:42:37 GMT (envelope-from lulf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5RKgacc016514 for perforce@freebsd.org; Wed, 27 Jun 2007 20:42:36 GMT (envelope-from lulf@FreeBSD.org) Date: Wed, 27 Jun 2007 20:42:36 GMT Message-Id: <200706272042.l5RKgacc016514@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lulf@FreeBSD.org using -f From: Ulf Lilleengen To: Perforce Change Reviews Cc: Subject: PERFORCE change 122425 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Jun 2007 20:42:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=122425 Change 122425 by lulf@lulf_carrot on 2007/06/27 20:42:09 - Convert 'rename' command to the new event system. - Add new error codes for rename. - Change use of some error codes. - Add EVENT_RENAME_ events. Affected files ... .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum.c#22 edit .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum.h#17 edit .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_rename.c#2 edit .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_state.c#15 edit .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_subr.c#13 edit .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_var.h#18 edit Differences ... ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum.c#22 (text+ko) ==== @@ -522,6 +522,7 @@ struct gv_drive *d; struct bio *bp; int newstate, flags, err, rename; + char *newname; off_t offset; sc = arg; @@ -746,6 +747,58 @@ "error code %d\n", s->name, err); break; + case GV_EVENT_RENAME_VOL: + printf("VINUM: event 'rename'\n"); + v = ev->arg1; + newname = ev->arg2; + flags = ev->arg3; + err = gv_rename_vol(sc, v, newname, flags); + if (err) + printf("VINUM: error renaming %s to %s:" + " error code %d\n", v->name, + newname, err); + g_free(newname); + break; + + case GV_EVENT_RENAME_PLEX: + printf("VINUM: event 'rename'\n"); + p = ev->arg1; + newname = ev->arg2; + flags = ev->arg3; + err = gv_rename_plex(sc, p, newname, flags); + if (err) + printf("VINUM: error renaming %s to %s:" + " error code %d\n", p->name, + newname, err); + g_free(newname); + break; + + case GV_EVENT_RENAME_SD: + printf("VINUM: event 'rename'\n"); + s = ev->arg1; + newname = ev->arg2; + flags = ev->arg3; + err = gv_rename_sd(sc, s, newname, flags); + if (err) + printf("VINUM: error renaming %s to %s:" + " error code %d\n", s->name, + newname, err); + g_free(newname); + break; + + case GV_EVENT_RENAME_DRIVE: + printf("VINUM: event 'rename'\n"); + d = ev->arg1; + newname = ev->arg2; + flags = ev->arg3; + err = gv_rename_drive(sc, d, newname, flags); + if (err) + printf("VINUM: error renaming %s to %s:" + " error code %d\n", d->name, + newname, err); + g_free(newname); + break; + case GV_EVENT_THREAD_EXIT: printf("VINUM: event 'thread exit'\n"); g_free(ev); ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum.h#17 (text+ko) ==== @@ -49,6 +49,10 @@ /* geom_vinum_rename.c */ void gv_rename(struct g_geom *, struct gctl_req *); +int gv_rename_drive(struct gv_softc *, struct gv_drive *, char *, int); +int gv_rename_plex(struct gv_softc *, struct gv_plex *, char *, int); +int gv_rename_sd(struct gv_softc *, struct gv_sd *, char *, int); +int gv_rename_vol(struct gv_softc *, struct gv_volume *, char *, int); /* geom_vinum_rm.c */ void gv_remove(struct g_geom *, struct gctl_req *); ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_rename.c#2 (text+ko) ==== @@ -42,15 +42,6 @@ #include #include -static int gv_rename_drive(struct gv_softc *, struct gctl_req *, - struct gv_drive *, char *, int); -static int gv_rename_plex(struct gv_softc *, struct gctl_req *, - struct gv_plex *, char *, int); -static int gv_rename_sd(struct gv_softc *, struct gctl_req *, - struct gv_sd *, char *, int); -static int gv_rename_vol(struct gv_softc *, struct gctl_req *, - struct gv_volume *, char *, int); - void gv_rename(struct g_geom *gp, struct gctl_req *req) { @@ -59,8 +50,8 @@ struct gv_plex *p; struct gv_sd *s; struct gv_drive *d; - char *newname, *object; - int err, *flags, type; + char *newname, *object, *name; + int *flags, type; sc = gp->softc; @@ -86,9 +77,9 @@ gctl_error(req, "unknown volume '%s'", object); return; } - err = gv_rename_vol(sc, req, v, newname, *flags); - if (err) - return; + name = g_malloc(GV_MAXVOLNAME, M_WAITOK | M_ZERO); + strlcpy(name, newname, GV_MAXVOLNAME); + gv_post_event(sc, GV_EVENT_RENAME_VOL, v, name, *flags, 0); break; case GV_TYPE_PLEX: p = gv_find_plex(sc, object); @@ -96,9 +87,9 @@ gctl_error(req, "unknown plex '%s'", object); return; } - err = gv_rename_plex(sc, req, p, newname, *flags); - if (err) - return; + name = g_malloc(GV_MAXPLEXNAME, M_WAITOK | M_ZERO); + strlcpy(name, newname, GV_MAXPLEXNAME); + gv_post_event(sc, GV_EVENT_RENAME_PLEX, p, name, *flags, 0); break; case GV_TYPE_SD: s = gv_find_sd(sc, object); @@ -106,9 +97,9 @@ gctl_error(req, "unknown subdisk '%s'", object); return; } - err = gv_rename_sd(sc, req, s, newname, *flags); - if (err) - return; + name = g_malloc(GV_MAXSDNAME, M_WAITOK | M_ZERO); + strlcpy(name, newname, GV_MAXSDNAME); + gv_post_event(sc, GV_EVENT_RENAME_SD, s, name, *flags, 0); break; case GV_TYPE_DRIVE: d = gv_find_drive(sc, object); @@ -116,30 +107,28 @@ gctl_error(req, "unknown drive '%s'", object); return; } - err = gv_rename_drive(sc, req, d, newname, *flags); - if (err) - return; + name = g_malloc(GV_MAXDRIVENAME, M_WAITOK | M_ZERO); + strlcpy(name, newname, GV_MAXDRIVENAME); + gv_post_event(sc, GV_EVENT_RENAME_DRIVE, d, name, *flags, 0); break; default: gctl_error(req, "unknown object '%s'", object); return; } - - gv_save_config(sc); } -static int -gv_rename_drive(struct gv_softc *sc, struct gctl_req *req, struct gv_drive *d, - char *newname, int flags) +int +gv_rename_drive(struct gv_softc *sc, struct gv_drive *d, char *newname, + int flags) { struct gv_sd *s; g_topology_assert(); KASSERT(d != NULL, ("gv_rename_drive: NULL d")); - if (gv_object_type(sc, newname) != -1) { - gctl_error(req, "drive name '%s' already in use", newname); - return (-1); + if (gv_object_type(sc, newname) != GV_ERR_NOTFOUND) { + printf("VINUM: drive name '%s' already in use\n", newname); + return (GV_ERR_NAMETAKEN); } strncpy(d->name, newname, GV_MAXDRIVENAME); @@ -150,9 +139,8 @@ return (0); } -static int -gv_rename_plex(struct gv_softc *sc, struct gctl_req *req, struct gv_plex *p, - char *newname, int flags) +int +gv_rename_plex(struct gv_softc *sc, struct gv_plex *p, char *newname, int flags) { struct gv_sd *s; char *plexnum, *plexnump, *oldplex, *oldplexp; @@ -164,9 +152,9 @@ err = 0; - if (gv_object_type(sc, newname) != -1) { - gctl_error(req, "plex name '%s' already in use", newname); - return (-1); + if (gv_object_type(sc, newname) != GV_ERR_NOTFOUND) { + printf("VINUM: plex name '%s' already in use\n", newname); + return (GV_ERR_NAMETAKEN); } /* Needed for sanity checking. */ @@ -187,15 +175,15 @@ strsep(&oldplexp, "."); strsep(&plexnump, "."); if (plexnump == NULL || *plexnump == '\0') { - gctl_error(req, "proposed plex name '%s' is not a valid plex " - "name", newname); - err = -1; + printf("VINUM: proposed plex name '%s' is not a valid plex " + "name\n", newname); + err = GV_ERR_INVNAME; goto failure; } if (strcmp(oldplexp, plexnump)) { - gctl_error(req, "current and proposed plex numbers (%s, %s) " - "do not match", plexnump, oldplexp); - err = -1; + printf("VINUM: current and proposed plex numbers (%s, %s) " + "do not match\n", plexnump, oldplexp); + err = GV_ERR_INVNAME; goto failure; } @@ -218,7 +206,7 @@ strsep(&oldsdp, "."); strsep(&oldsdp, "."); snprintf(newsd, GV_MAXSDNAME, "%s.%s", p->name, oldsdp); - err = gv_rename_sd(sc, req, s, newsd, flags); + err = gv_rename_sd(sc, s, newsd, flags); g_free(newsd); g_free(oldsd); if (err) @@ -238,9 +226,8 @@ * since there are no structures below a subdisk. Similarly, we don't have to * clean up any references elsewhere to the subdisk's name. */ -static int -gv_rename_sd(struct gv_softc *sc, struct gctl_req *req, struct gv_sd *s, - char * newname, int flags) +int +gv_rename_sd(struct gv_softc *sc, struct gv_sd *s, char *newname, int flags) { char *new, *newp, *old, *oldp; int err; @@ -250,9 +237,9 @@ err = 0; - if (gv_object_type(sc, newname) != -1) { - gctl_error(req, "subdisk name %s already in use", newname); - return (-1); + if (gv_object_type(sc, newname) != GV_ERR_NOTFOUND) { + printf("VINUM: subdisk name %s already in use\n", newname); + return (GV_ERR_NAMETAKEN); } /* Needed for sanity checking. */ @@ -274,22 +261,22 @@ strsep(&oldp, "."); strsep(&newp, "."); if (newp == NULL || *newp == '\0') { - gctl_error(req, "proposed sd name '%s' is not a valid sd name", + printf("VINUM: proposed sd name '%s' is not a valid sd name\n", newname); - err = -1; + err = GV_ERR_INVNAME; goto fail; } strsep(&newp, "."); if (newp == NULL || *newp == '\0') { - gctl_error(req, "proposed sd name '%s' is not a valid sd name", + printf("VINUM: proposed sd name '%s' is not a valid sd name\n", newname); - err = -1; + err = GV_ERR_INVNAME; goto fail; } if (strcmp(newp, oldp)) { - gctl_error(req, "current and proposed sd numbers (%s, %s) do " - "not match", oldp, newp); - err = -1; + printf("VINUM: current and proposed sd numbers (%s, %s) do " + "not match\n", oldp, newp); + err = GV_ERR_INVNAME; goto fail; } @@ -302,9 +289,9 @@ return (err); } -static int -gv_rename_vol(struct gv_softc *sc, struct gctl_req *req, struct gv_volume *v, - char *newname, int flags) +int +gv_rename_vol(struct gv_softc *sc, struct gv_volume *v, char *newname, + int flags) { struct gv_plex *p; char *new, *old, *oldp; @@ -313,9 +300,9 @@ g_topology_assert(); KASSERT(v != NULL, ("gv_rename_vol: NULL v")); - if (gv_object_type(sc, newname) != -1) { - gctl_error(req, "volume name %s already in use", newname); - return (-1); + if (gv_object_type(sc, newname) != GV_ERR_NOTFOUND) { + printf("VINUM: volume name %s already in use", newname); + return (GV_ERR_NAMETAKEN); } /* Rename the volume. */ @@ -335,7 +322,7 @@ */ strsep(&oldp, "."); snprintf(new, GV_MAXPLEXNAME, "%s.%s", v->name, oldp); - err = gv_rename_plex(sc, req, p, new, flags); + err = gv_rename_plex(sc, p, new, flags); g_free(new); g_free(old); if (err) ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_state.c#15 (text+ko) ==== @@ -117,8 +117,6 @@ gctl_error(req, "unknown object '%s'", obj); break; } - - return; } /* Update drive state; return 0 if the state changes, otherwise error. */ ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_subr.c#13 (text+ko) ==== @@ -936,7 +936,7 @@ return (GV_TYPE_DRIVE); } - return (GV_ERR_INVTYPE); + return (GV_ERR_NOTFOUND); } void ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_var.h#18 (text+ko) ==== @@ -131,6 +131,7 @@ #define GV_ERR_NAMETAKEN (-10) /* Object name is taken. */ #define GV_ERR_NOSPACE (-11) /* No space left on drive/subdisk. */ #define GV_ERR_BADOFFSET (-12) /* Invalid offset specified. */ +#define GV_ERR_INVNAME (-13) /* Invalid object name. */ /* * hostname is 256 bytes long, but we don't need to shlep multiple copies in @@ -199,6 +200,10 @@ #define GV_EVENT_ATTACH_SD 23 #define GV_EVENT_DETACH_PLEX 24 #define GV_EVENT_DETACH_SD 25 +#define GV_EVENT_RENAME_VOL 26 +#define GV_EVENT_RENAME_PLEX 27 +#define GV_EVENT_RENAME_SD 28 +#define GV_EVENT_RENAME_DRIVE 29 struct gv_event { int type; From owner-p4-projects@FreeBSD.ORG Thu Jun 28 02:26:01 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 625C416A46C; Thu, 28 Jun 2007 02:26:01 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2BDD816A400 for ; Thu, 28 Jun 2007 02:26:01 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 1ADA113C44C for ; Thu, 28 Jun 2007 02:26:01 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5S2Q0LQ073387 for ; Thu, 28 Jun 2007 02:26:00 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5S2PwdN073378 for perforce@freebsd.org; Thu, 28 Jun 2007 02:25:58 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 28 Jun 2007 02:25:58 GMT Message-Id: <200706280225.l5S2PwdN073378@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 122435 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Jun 2007 02:26:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=122435 Change 122435 by kmacy@kmacy_vt-x:opentoe_init on 2007/06/28 02:25:31 IFC Affected files ... .. //depot/projects/opentoe/ObsoleteFiles.inc#9 integrate .. //depot/projects/opentoe/contrib/ipfilter/tools/ipfstat.c#3 integrate .. //depot/projects/opentoe/contrib/less/main.c#4 integrate .. //depot/projects/opentoe/contrib/less/screen.c#4 integrate .. //depot/projects/opentoe/etc/mtree/BSD.include.dist#5 integrate .. //depot/projects/opentoe/include/Makefile#3 integrate .. //depot/projects/opentoe/lib/libarchive/archive_read_open_fd.c#3 integrate .. //depot/projects/opentoe/lib/libarchive/archive_read_open_file.c#2 integrate .. //depot/projects/opentoe/lib/libarchive/archive_read_open_filename.c#3 integrate .. //depot/projects/opentoe/lib/libc/arm/sys/sbrk.S#2 integrate .. //depot/projects/opentoe/lib/libc/net/sctp_sys_calls.c#5 integrate .. //depot/projects/opentoe/rescue/rescue/Makefile#2 integrate .. //depot/projects/opentoe/sbin/Makefile#3 integrate .. //depot/projects/opentoe/sbin/mount/mount.8#2 integrate .. //depot/projects/opentoe/sbin/mount/mount.c#3 integrate .. //depot/projects/opentoe/sbin/mount_umapfs/Makefile#2 delete .. //depot/projects/opentoe/sbin/mount_umapfs/mount_umapfs.8#2 delete .. //depot/projects/opentoe/sbin/mount_umapfs/mount_umapfs.c#2 delete .. //depot/projects/opentoe/sbin/mount_umapfs/sample.group.mapfile#2 delete .. //depot/projects/opentoe/sbin/mount_umapfs/sample.user.mapfile#2 delete .. //depot/projects/opentoe/sbin/mount_umapfs/umap_manual#2 delete .. //depot/projects/opentoe/share/Makefile#2 integrate .. //depot/projects/opentoe/share/man/man4/bce.4#2 integrate .. //depot/projects/opentoe/share/man/man4/mac.4#2 integrate .. //depot/projects/opentoe/share/man/man4/pcm.4#3 integrate .. //depot/projects/opentoe/share/man/man4/tty.4#2 integrate .. //depot/projects/opentoe/share/man/man7/hier.7#6 integrate .. //depot/projects/opentoe/share/man/man9/priv.9#2 integrate .. //depot/projects/opentoe/share/man/man9/suser.9#2 integrate .. //depot/projects/opentoe/share/misc/committers-src.dot#6 integrate .. //depot/projects/opentoe/share/mk/bsd.own.mk#5 integrate .. //depot/projects/opentoe/share/mk/sys.mk#2 integrate .. //depot/projects/opentoe/sys/boot/forth/loader.conf#3 integrate .. //depot/projects/opentoe/sys/conf/NOTES#7 integrate .. //depot/projects/opentoe/sys/conf/files#10 integrate .. //depot/projects/opentoe/sys/conf/options#9 integrate .. //depot/projects/opentoe/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#6 integrate .. //depot/projects/opentoe/sys/dev/ata/ata-all.h#3 integrate .. //depot/projects/opentoe/sys/dev/ata/ata-chipset.c#4 integrate .. //depot/projects/opentoe/sys/dev/ata/ata-disk.c#4 integrate .. //depot/projects/opentoe/sys/dev/ata/ata-pci.h#2 integrate .. //depot/projects/opentoe/sys/dev/ata/ata-usb.c#2 integrate .. //depot/projects/opentoe/sys/dev/ath/if_ath.c#8 integrate .. //depot/projects/opentoe/sys/dev/isp/isp.c#4 integrate .. //depot/projects/opentoe/sys/dev/isp/isp_pci.c#6 integrate .. //depot/projects/opentoe/sys/dev/iwi/if_iwi.c#4 integrate .. //depot/projects/opentoe/sys/dev/rp/rp.c#2 integrate .. //depot/projects/opentoe/sys/dev/usb/if_aue.c#5 integrate .. //depot/projects/opentoe/sys/dev/usb/if_cdce.c#3 integrate .. //depot/projects/opentoe/sys/dev/usb/if_cue.c#4 integrate .. //depot/projects/opentoe/sys/dev/usb/if_kue.c#4 integrate .. //depot/projects/opentoe/sys/dev/usb/if_ural.c#9 integrate .. //depot/projects/opentoe/sys/dev/usb/ucom.c#3 integrate .. //depot/projects/opentoe/sys/dev/usb/ukbd.c#5 integrate .. //depot/projects/opentoe/sys/dev/usb/umodem.c#4 integrate .. //depot/projects/opentoe/sys/dev/usb/usbdevs#8 integrate .. //depot/projects/opentoe/sys/fs/tmpfs/tmpfs.h#2 integrate .. //depot/projects/opentoe/sys/fs/tmpfs/tmpfs_fifoops.h#2 integrate .. //depot/projects/opentoe/sys/fs/tmpfs/tmpfs_subr.c#2 integrate .. //depot/projects/opentoe/sys/fs/tmpfs/tmpfs_uma.c#2 integrate .. //depot/projects/opentoe/sys/fs/tmpfs/tmpfs_uma.h#2 integrate .. //depot/projects/opentoe/sys/fs/tmpfs/tmpfs_vfsops.c#2 integrate .. //depot/projects/opentoe/sys/fs/tmpfs/tmpfs_vnops.c#2 integrate .. //depot/projects/opentoe/sys/fs/umapfs/umap.h#2 delete .. //depot/projects/opentoe/sys/fs/umapfs/umap_subr.c#2 delete .. //depot/projects/opentoe/sys/fs/umapfs/umap_vfsops.c#2 delete .. //depot/projects/opentoe/sys/fs/umapfs/umap_vnops.c#3 delete .. //depot/projects/opentoe/sys/kern/Make.tags.inc#3 integrate .. //depot/projects/opentoe/sys/kern/Makefile#2 integrate .. //depot/projects/opentoe/sys/kern/kern_malloc.c#7 integrate .. //depot/projects/opentoe/sys/kern/kern_rwlock.c#5 integrate .. //depot/projects/opentoe/sys/kern/kern_timeout.c#3 integrate .. //depot/projects/opentoe/sys/modules/acpi/acpi_video/Makefile#2 integrate .. //depot/projects/opentoe/sys/modules/i2c/controllers/alpm/Makefile#2 integrate .. //depot/projects/opentoe/sys/modules/i2c/controllers/viapm/Makefile#2 integrate .. //depot/projects/opentoe/sys/modules/umapfs/Makefile#2 delete .. //depot/projects/opentoe/sys/net/if_gre.c#2 integrate .. //depot/projects/opentoe/sys/net80211/ieee80211_freebsd.h#3 integrate .. //depot/projects/opentoe/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#3 integrate .. //depot/projects/opentoe/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#3 integrate .. //depot/projects/opentoe/sys/netinet/sctputil.c#13 integrate .. //depot/projects/opentoe/sys/security/audit/audit.h#5 integrate .. //depot/projects/opentoe/sys/security/audit/audit_arg.c#5 integrate .. //depot/projects/opentoe/sys/security/audit/audit_bsm.c#5 integrate .. //depot/projects/opentoe/sys/security/audit/audit_bsm_token.c#4 integrate .. //depot/projects/opentoe/sys/security/audit/audit_syscalls.c#6 integrate .. //depot/projects/opentoe/sys/security/mac/mac_audit.c#2 integrate .. //depot/projects/opentoe/sys/security/mac/mac_framework.h#4 integrate .. //depot/projects/opentoe/sys/security/mac/mac_policy.h#4 integrate .. //depot/projects/opentoe/sys/security/mac_stub/mac_stub.c#4 integrate .. //depot/projects/opentoe/sys/security/mac_test/mac_test.c#4 integrate .. //depot/projects/opentoe/sys/sys/_rwlock.h#3 integrate .. //depot/projects/opentoe/sys/sys/rwlock.h#4 integrate .. //depot/projects/opentoe/sys/vm/swap_pager.c#6 integrate .. //depot/projects/opentoe/sys/vm/vm_pageout.c#5 integrate .. //depot/projects/opentoe/tools/regression/fsx/fsx.c#2 integrate .. //depot/projects/opentoe/tools/regression/lib/libc/nss/test-gethostby.c#2 integrate .. //depot/projects/opentoe/tools/regression/lib/libc/nss/test-gethostby.t#2 integrate .. //depot/projects/opentoe/tools/regression/tmpfs/Makefile#2 integrate .. //depot/projects/opentoe/tools/regression/tmpfs/t_id_gen#2 delete .. //depot/projects/opentoe/tools/tools/tinybsd/conf/bridge/tinybsd.basefiles#2 integrate .. //depot/projects/opentoe/tools/tools/tinybsd/conf/default/tinybsd.basefiles#2 integrate .. //depot/projects/opentoe/tools/tools/tinybsd/conf/firewall/tinybsd.basefiles#2 integrate .. //depot/projects/opentoe/tools/tools/tinybsd/conf/minimal/tinybsd.basefiles#2 integrate .. //depot/projects/opentoe/tools/tools/tinybsd/conf/vpn/tinybsd.basefiles#2 integrate .. //depot/projects/opentoe/tools/tools/tinybsd/conf/wireless/tinybsd.basefiles#2 integrate .. //depot/projects/opentoe/tools/tools/tinybsd/conf/wrap/tinybsd.basefiles#2 integrate .. //depot/projects/opentoe/usr.bin/calendar/calendars/calendar.freebsd#7 integrate .. //depot/projects/opentoe/usr.bin/truss/amd64-fbsd.c#3 integrate .. //depot/projects/opentoe/usr.bin/truss/i386-fbsd.c#3 integrate .. //depot/projects/opentoe/usr.bin/truss/i386-linux.c#3 integrate .. //depot/projects/opentoe/usr.bin/truss/ia64-fbsd.c#3 integrate .. //depot/projects/opentoe/usr.bin/truss/main.c#3 integrate .. //depot/projects/opentoe/usr.bin/truss/powerpc-fbsd.c#3 integrate .. //depot/projects/opentoe/usr.bin/truss/setup.c#3 integrate .. //depot/projects/opentoe/usr.bin/truss/sparc64-fbsd.c#3 integrate .. //depot/projects/opentoe/usr.sbin/sysinstall/dist.c#3 integrate .. //depot/projects/opentoe/usr.sbin/sysinstall/help/distributions.hlp#2 integrate .. //depot/projects/opentoe/usr.sbin/sysinstall/help/fixit.hlp#2 integrate .. //depot/projects/opentoe/usr.sbin/sysinstall/help/media.hlp#2 integrate .. //depot/projects/opentoe/usr.sbin/sysinstall/help/network_device.hlp#2 integrate .. //depot/projects/opentoe/usr.sbin/sysinstall/help/options.hlp#2 integrate .. //depot/projects/opentoe/usr.sbin/sysinstall/help/securelevel.hlp#2 integrate .. //depot/projects/opentoe/usr.sbin/sysinstall/help/shortcuts.hlp#2 integrate .. //depot/projects/opentoe/usr.sbin/sysinstall/install.c#2 integrate .. //depot/projects/opentoe/usr.sbin/sysinstall/sysinstall.8#2 integrate .. //depot/projects/opentoe/usr.sbin/sysinstall/sysinstall.h#2 integrate .. //depot/projects/opentoe/usr.sbin/sysinstall/system.c#2 integrate Differences ... ==== //depot/projects/opentoe/ObsoleteFiles.inc#9 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.96 2007/06/18 18:50:59 rafan Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.97 2007/06/25 05:06:52 rafan 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,12 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20070625: umapfs removal +OLD_FILES+=rescue/mount_umapfs +OLD_FILES+=sbin/mount_umapfs +OLD_FILES+=usr/include/fs/umapfs/umap.h +OLD_FILES+=usr/share/man/man8/mount_umapfs.8.gz +OLD_DIRS+=usr/include/fs/umapfs # 20070618: shared library version bump OLD_LIBS+=lib/libalias.so.5 OLD_LIBS+=lib/libbsnmp.so.3 ==== //depot/projects/opentoe/contrib/ipfilter/tools/ipfstat.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/ipfilter/tools/ipfstat.c,v 1.5 2007/06/04 02:54:34 darrenr Exp $ */ +/* $FreeBSD: src/contrib/ipfilter/tools/ipfstat.c,v 1.6 2007/06/24 16:39:12 darrenr Exp $ */ /* * Copyright (C) 2002-2006 by Darren Reed. @@ -1811,7 +1811,7 @@ *port = -1; } else if (!sscanf(comma + 1, "%d", port) || (*port < 0) || (*port > 65535)) { - fprintf(stderr, "Invalid port specfication in %s\n", + fprintf(stderr, "Invalid port specification in %s\n", argument); free(s); exit(-2); @@ -1823,6 +1823,7 @@ /* get ip address */ if (!strcasecmp(s, "any")) { ip->in4.s_addr = INADDR_ANY; + ok = 1; #ifdef USE_INET6 ip->in6 = in6addr_any; } else if (use_inet6 && inet_pton(AF_INET6, s, &ip->in6)) { ==== //depot/projects/opentoe/contrib/less/main.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/less/main.c,v 1.8 2007/06/21 10:39:24 delphij Exp $ */ +/* $FreeBSD: src/contrib/less/main.c,v 1.9 2007/06/23 15:28:00 delphij Exp $ */ /* * Copyright (C) 1984-2007 Mark Nudelman * @@ -59,6 +59,7 @@ extern int missing_cap; extern int know_dumb; extern int quit_if_one_screen; +extern int no_init; extern int pr_type; @@ -165,7 +166,7 @@ } if (less_is_more && get_quit_at_eof()) - quit_if_one_screen = TRUE; + no_init = quit_if_one_screen = TRUE; #if EDITOR editor = lgetenv("VISUAL"); ==== //depot/projects/opentoe/contrib/less/screen.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/less/screen.c,v 1.7 2007/06/21 10:44:50 delphij Exp $ */ +/* $FreeBSD: src/contrib/less/screen.c,v 1.8 2007/06/23 15:28:00 delphij Exp $ */ /* * Copyright (C) 1984-2007 Mark Nudelman * @@ -228,8 +228,6 @@ extern int no_back_scroll; extern int swindow; extern int no_init; -extern int quit_at_eof; -extern int less_is_more; extern int no_keypad; extern int sigs; extern int wscroll; @@ -1211,19 +1209,11 @@ if (sc_e_keypad == NULL) sc_e_keypad = ""; - /* - * This loses for terminals with termcap entries with ti/te strings - * that switch to/from an alternate screen, and we're in quit_at_eof - * (eg, more(1)). - */ - if (!quit_at_eof && !less_is_more) { - sc_init = ltgetstr("ti", &sp); - sc_deinit = ltgetstr("te", &sp); - } - + sc_init = ltgetstr("ti", &sp); if (sc_init == NULL) sc_init = ""; + sc_deinit= ltgetstr("te", &sp); if (sc_deinit == NULL) sc_deinit = ""; ==== //depot/projects/opentoe/etc/mtree/BSD.include.dist#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.114 2007/06/01 18:53:36 ru Exp $ +# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.115 2007/06/25 05:06:53 rafan Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -146,8 +146,6 @@ .. udf .. - umapfs - .. unionfs .. .. ==== //depot/projects/opentoe/include/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.270 2007/04/13 01:39:33 pjd Exp $ +# $FreeBSD: src/include/Makefile,v 1.271 2007/06/25 05:06:53 rafan Exp $ # # Doing a "make install" builds /usr/include. @@ -43,8 +43,7 @@ dev/ic dev/iicbus ${_dev_ieee488} dev/lmc dev/ofw \ dev/pbio ${_dev_powermac_nvram} dev/ppbus dev/smbus dev/speaker dev/usb dev/utopia dev/vkbd dev/wi \ fs/devfs fs/fdescfs fs/fifofs fs/msdosfs fs/ntfs fs/nullfs \ - ${_fs_nwfs} fs/portalfs fs/procfs fs/smbfs fs/udf fs/umapfs \ - fs/unionfs \ + ${_fs_nwfs} fs/portalfs fs/procfs fs/smbfs fs/udf fs/unionfs \ geom/cache geom/concat geom/eli geom/gate geom/journal geom/label \ geom/mirror geom/nop geom/raid3 geom/shsec geom/stripe \ netatm/ipatm netatm/sigpvc netatm/spans netatm/uni \ ==== //depot/projects/opentoe/lib/libarchive/archive_read_open_fd.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_open_fd.c,v 1.12 2007/06/18 00:36:54 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_open_fd.c,v 1.13 2007/06/26 03:06:48 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include @@ -78,7 +78,8 @@ return (ARCHIVE_FATAL); } mine->fd = fd; - mine->can_skip = 1; + /* lseek() hardly ever works, so disable it by default. See below. */ + mine->can_skip = 0; return (archive_read_open2(a, mine, file_open, file_read, file_skip, file_close)); } @@ -93,8 +94,18 @@ return (ARCHIVE_FATAL); } - if (S_ISREG(st.st_mode)) + if (S_ISREG(st.st_mode)) { archive_read_extract_set_skip_file(a, st.st_dev, st.st_ino); + /* + * Enabling skip here is a performance optimization for + * anything that supports lseek(). On FreeBSD, only + * regular files and raw disk devices support lseek() and + * there's no portable way to determine if a device is + * a raw disk device, so we only enable this optimization + * for regular files. + */ + mine->can_skip = 1; + } return (ARCHIVE_OK); } ==== //depot/projects/opentoe/lib/libarchive/archive_read_open_file.c#2 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_open_file.c,v 1.19 2007/01/09 08:05:55 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_open_file.c,v 1.20 2007/06/26 03:06:48 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include @@ -51,6 +51,7 @@ FILE *f; size_t block_size; void *buffer; + char can_skip; }; static int file_close(struct archive *, void *); @@ -80,6 +81,8 @@ return (ARCHIVE_FATAL); } mine->f = f; + /* Suppress skip by default. See below. */ + mine->can_skip = 0; return (archive_read_open2(a, mine, file_open, file_read, file_skip, file_close)); } @@ -95,8 +98,11 @@ * it's not a file. (FILE * objects can wrap many kinds * of I/O streams.) */ - if (fstat(fileno(mine->f), &st) == 0 && S_ISREG(st.st_mode)) + if (fstat(fileno(mine->f), &st) == 0 && S_ISREG(st.st_mode)) { archive_read_extract_set_skip_file(a, st.st_dev, st.st_ino); + /* Enable the seek optimization for regular files. */ + mine->can_skip = 1; + } return (ARCHIVE_OK); } @@ -125,21 +131,25 @@ { struct read_FILE_data *mine = (struct read_FILE_data *)client_data; + (void)a; /* UNUSED */ + /* - * Note: the 'fd' and 'filename' versions round the request - * down to a multiple of the block size to ensure proper - * operation on block-oriented media such as tapes. But stdio - * doesn't work with such media (it doesn't ensure blocking), - * so we don't need to bother. + * If we can't skip, return 0 as the amount we did step and + * the caller will work around by reading and discarding. */ + if (!mine->can_skip) + return (0); + if (request == 0) + return (0); + #if HAVE_FSEEKO if (fseeko(mine->f, request, SEEK_CUR) != 0) #else if (fseek(mine->f, request, SEEK_CUR) != 0) #endif { - archive_set_error(a, errno, "Error skipping forward"); - return (ARCHIVE_FATAL); + mine->can_skip = 0; + return (0); } return (request); } ==== //depot/projects/opentoe/lib/libarchive/archive_read_open_filename.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_open_filename.c,v 1.19 2007/06/18 00:36:54 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_open_filename.c,v 1.20 2007/06/26 03:06:48 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include @@ -96,7 +96,8 @@ mine->block_size = block_size; mine->buffer = NULL; mine->fd = -1; - mine->can_skip = 1; + /* lseek() almost never works; disable it by default. See below. */ + mine->can_skip = 0; return (archive_read_open2(a, mine, file_open, file_read, file_skip, file_close)); } @@ -123,8 +124,19 @@ if (fstat(mine->fd, &st) == 0) { /* If we're reading a file from disk, ensure that we don't overwrite it with an extracted file. */ - if (S_ISREG(st.st_mode)) + if (S_ISREG(st.st_mode)) { archive_read_extract_set_skip_file(a, st.st_dev, st.st_ino); + /* + * Enabling skip here is a performance + * optimization for anything that supports + * lseek(). On FreeBSD, only regular files + * and raw disk devices support lseek() and + * there's no portable way to determine if a + * device is a raw disk device, so we only + * enable this optimization for regular files. + */ + mine->can_skip = 1; + } /* Remember mode so close can decide whether to flush. */ mine->st_mode = st.st_mode; } else { ==== //depot/projects/opentoe/lib/libc/arm/sys/sbrk.S#2 (text+ko) ==== @@ -32,10 +32,10 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/arm/sys/sbrk.S,v 1.2 2004/11/09 16:49:14 cognet Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/arm/sys/sbrk.S,v 1.3 2007/06/27 02:45:37 kan Exp $"); #include "SYS.h" - .globl _C_LABEL(end) + .globl _C_LABEL(_end) #ifdef WEAK_ALIAS WEAK_ALIAS(sbrk, _sbrk) @@ -46,7 +46,7 @@ .globl CURBRK .type CURBRK,#object CURBRK: - .word _C_LABEL(end) + .word _C_LABEL(_end) /* * Change the data segment size ==== //depot/projects/opentoe/lib/libc/net/sctp_sys_calls.c#5 (text+ko) ==== @@ -29,7 +29,7 @@ * SUCH DAMAGE. */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/sctp_sys_calls.c,v 1.9 2007/06/22 13:59:54 rrs Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/sctp_sys_calls.c,v 1.11 2007/06/26 02:07:47 mjacob Exp $"); #include #include #include @@ -185,10 +185,18 @@ /* validate all the addresses and get the size */ for (i = 0; i < addrcnt; i++) { if (at->sa_family == AF_INET) { + if (at->sa_len != sizeof(struct sockaddr_in)) { + errno = EINVAL; + return (-1); + } memcpy(cpto, at, at->sa_len); cpto = ((caddr_t)cpto + at->sa_len); len += at->sa_len; } else if (at->sa_family == AF_INET6) { + if (at->sa_len != sizeof(struct sockaddr_in6)) { + errno = EINVAL; + return (-1); + } if (IN6_IS_ADDR_V4MAPPED(&((struct sockaddr_in6 *)at)->sin6_addr)) { len += sizeof(struct sockaddr_in); in6_sin6_2_sin((struct sockaddr_in *)cpto, (struct sockaddr_in6 *)at); @@ -205,7 +213,8 @@ } if (len > (sizeof(buf) - sizeof(int))) { /* Never enough memory */ - return (E2BIG); + errno = E2BIG; + return (-1); } at = (struct sockaddr *)((caddr_t)at + at->sa_len); cnt++; @@ -231,7 +240,7 @@ { struct sctp_getaddresses *gaddrs; struct sockaddr *sa; - int i, sz, fam, argsz; + int i, sz, argsz; /* validate the flags */ if ((flags != SCTP_BINDX_ADD_ADDR) && @@ -251,23 +260,30 @@ errno = ENOMEM; return (-1); } - gaddrs->sget_assoc_id = 0; sa = addrs; for (i = 0; i < addrcnt; i++) { sz = sa->sa_len; - fam = sa->sa_family; - if ((fam != AF_INET) && (fam != AF_INET6)) { + if (sa->sa_family == AF_INET) { + if (sa->sa_len != sizeof(struct sockaddr_in)) + goto out_error; + } else if (sa->sa_family == AF_INET6) { + if (sa->sa_len != sizeof(struct sockaddr_in6)) + goto out_error; + } else { + /* invalid address family specified */ + out_error: free(gaddrs); errno = EINVAL; return (-1); } + memset(gaddrs, 0, argsz); + gaddrs->sget_assoc_id = 0; memcpy(gaddrs->addr, sa, sz); - if (setsockopt(sd, IPPROTO_SCTP, flags, - gaddrs, (socklen_t) argsz) != 0) { + if (setsockopt(sd, IPPROTO_SCTP, flags, gaddrs, + (socklen_t) argsz) != 0) { free(gaddrs); return (-1); } - memset(gaddrs, 0, argsz); sa = (struct sockaddr *)((caddr_t)sa + sz); } free(gaddrs); @@ -315,7 +331,6 @@ errno = ENOMEM; return (-1); } - memset(addrs, 0, siz); addrs->sget_assoc_id = id; /* Now lets get the array of addresses */ if (getsockopt(sd, IPPROTO_SCTP, SCTP_GET_PEER_ADDRESSES, @@ -380,7 +395,6 @@ errno = ENOMEM; return (-1); } - memset(addrs, 0, siz); addrs->sget_assoc_id = id; /* Now lets get the array of addresses */ if (getsockopt(sd, IPPROTO_SCTP, SCTP_GET_LOCAL_ADDRESSES, addrs, ==== //depot/projects/opentoe/rescue/rescue/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -#$FreeBSD: src/rescue/rescue/Makefile,v 1.54 2007/01/26 10:19:07 delphij Exp $ +#$FreeBSD: src/rescue/rescue/Makefile,v 1.55 2007/06/25 05:06:53 rafan Exp $ # @(#)Makefile 8.1 (Berkeley) 6/2/93 NO_MAN= @@ -113,7 +113,7 @@ kldconfig kldload kldstat kldunload ldconfig \ md5 mdconfig mdmfs mknod mount mount_cd9660 \ mount_msdosfs mount_nfs mount_ntfs mount_nullfs \ - mount_udf mount_umapfs mount_unionfs newfs \ + mount_udf mount_unionfs newfs \ newfs_msdos nos-tun ping reboot \ restore rcorder route routed rtquery rtsol savecore \ slattach spppcontrol startslip swapon sysctl tunefs umount ==== //depot/projects/opentoe/sbin/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.5 (Berkeley) 3/31/94 -# $FreeBSD: src/sbin/Makefile,v 1.166 2007/06/12 21:31:39 phk Exp $ +# $FreeBSD: src/sbin/Makefile,v 1.167 2007/06/25 05:06:53 rafan Exp $ .include @@ -59,7 +59,6 @@ mount_ntfs \ mount_nullfs \ mount_udf \ - mount_umapfs \ mount_unionfs \ natd \ newfs \ ==== //depot/projects/opentoe/sbin/mount/mount.8#2 (text+ko) ==== @@ -26,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)mount.8 8.8 (Berkeley) 6/16/94 -.\" $FreeBSD: src/sbin/mount/mount.8,v 1.81 2006/09/18 11:55:10 ru Exp $ +.\" $FreeBSD: src/sbin/mount/mount.8,v 1.82 2007/06/25 05:06:54 rafan Exp $ .\" .Dd July 12, 2006 .Dt MOUNT 8 @@ -420,7 +420,6 @@ .Cm portalfs , .Cm smbfs , .Cm udf , -.Cm umapfs , and .Cm unionfs , .Nm @@ -513,7 +512,6 @@ .Xr mount_smbfs 8 , .Xr mount_std 8 , .Xr mount_udf 8 , -.Xr mount_umapfs 8 , .Xr mount_unionfs 8 , .Xr umount 8 .Sh CAVEATS ==== //depot/projects/opentoe/sbin/mount/mount.c#3 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)mount.c 8.25 (Berkeley) 5/8/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/mount/mount.c,v 1.95 2007/04/13 21:30:47 phk Exp $"; + "$FreeBSD: src/sbin/mount/mount.c,v 1.96 2007/06/25 05:06:54 rafan Exp $"; #endif /* not lint */ #include @@ -135,8 +135,7 @@ unsigned int i; const char *fs[] = { "cd9660", "mfs", "msdosfs", "nfs", "nfs4", "ntfs", - "nwfs", "nullfs", "portalfs", "smbfs", "udf", "umapfs", - "unionfs", + "nwfs", "nullfs", "portalfs", "smbfs", "udf", "unionfs", NULL }; ==== //depot/projects/opentoe/share/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/5/93 -# $FreeBSD: src/share/Makefile,v 1.36 2006/03/17 18:54:32 ru Exp $ +# $FreeBSD: src/share/Makefile,v 1.37 2007/06/26 19:40:03 remko Exp $ .include @@ -25,7 +25,7 @@ tabset \ termcap \ ${_timedef} \ - zoneinfo + ${_zoneinfo} .if ${MK_LOCALES} != "no" _colldef = colldef @@ -68,4 +68,8 @@ _doc= doc .endif +.if ${MK_ZONEINFO} != "no" +_zoneinfo= zoneinfo +.endif + .include ==== //depot/projects/opentoe/share/man/man4/bce.4#2 (text) ==== @@ -26,9 +26,9 @@ .\" 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/bce.4,v 1.7 2007/02/09 18:26:13 brueffer Exp $ +.\" $FreeBSD: src/share/man/man4/bce.4,v 1.8 2007/06/24 18:36:07 brueffer Exp $ .\" -.Dd February 9, 2007 +.Dd June 24, 2007 .Dt BCE 4 .Os .Sh NAME @@ -140,6 +140,17 @@ .It HP NC370i Multifunction Gigabit Server Adapter .El +.Sh SYSCTL VARIABLES +The following variables are available as both +.Xr sysctl 8 +variables and +.Xr loader 8 +tunables: +.Bl -tag -width indent +.It Va hw.bce.msi_enable +Whether or not MSI support is enabled in the driver. +The default value is 1. +.El .Sh DIAGNOSTICS .Bl -diag .It "bce%d: PCI memory allocation failed!" ==== //depot/projects/opentoe/share/man/man4/mac.4#2 (text+ko) ==== @@ -28,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/mac.4,v 1.12 2004/07/03 18:29:20 ru Exp $ +.\" $FreeBSD: src/share/man/man4/mac.4,v 1.13 2007/06/27 09:32:50 kevlo Exp $ .\" .Dd January 8, 2003 .Os @@ -109,10 +109,6 @@ .Pa /dev ) corresponding to the file system on which to enable multilabel support. .Ss Policy Enforcement -MAC can be configured to enforce only specific portions of -policies -(see -.Sx "Runtime Configuration" ) . Policy enforcement is divided into the following areas of the system: .Bl -ohang .It Sy "File System" @@ -187,40 +183,6 @@ is documented in the .Xr mac 3 man page. -.Ss Runtime Configuration -The following -.Xr sysctl 8 -MIBs are available for fine-tuning the enforcement of MAC policies. -Unless specifically noted, all MIBs default to 1 -(that is, all areas are enforced by default): -.Bl -tag -width ".Va security.mac.enforce_network" -.It Va security.mac.enforce_fs -Enforce MAC policies for file system accesses. -.It Va security.mac.enforce_kld -Enforce MAC policies on -.Xr kld 4 . -.It Va security.mac.enforce_network -Enforce MAC policies on network interfaces. -.It Va security.mac.enforce_pipe -Enforce MAC policies on pipes. -.It Va security.mac.enforce_process -Enforce MAC policies between system processes -(e.g.\& -.Xr ps 1 , -.Xr ktrace 2 ) . -.It Va security.mac.enforce_socket -Enforce MAC policies on sockets. -.It Va security.mac.enforce_system -Enforce MAC policies on system-related items -(e.g.\& -.Xr kenv 1 , -.Xr acct 2 , -.Xr reboot 2 ) . -.It Va security.mac.enforce_vm -Enforce MAC policies on -.Xr mmap 2 -and -.Xr mprotect 2 . .\" *** XXX *** .\" Support for this feature is poor and should not be encouraged. .\" ==== //depot/projects/opentoe/share/man/man4/pcm.4#3 (text+ko) ==== @@ -23,9 +23,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/pcm.4,v 1.51 2007/05/31 20:26:39 joel Exp $ +.\" $FreeBSD: src/share/man/man4/pcm.4,v 1.52 2007/06/23 14:34:30 joel Exp $ .\" -.Dd May 31, 2007 +.Dd June 23, 2007 .Dt SOUND 4 .Os .Sh NAME @@ -191,6 +191,11 @@ available transparently to the application software. When disabled or not available, the application will only be able to select formats the device natively supports. +.It Va hw.snd.compat_linux_mmap +Enable to allow PROT_EXEC page mappings. +All Linux applications using sound and +.Xr mmap 2 +require this. .It Va hw.snd.feeder_rate_round Sample rate rounding threshold, to avoid large prime division at the cost of accuracy. @@ -245,6 +250,9 @@ .Pa /dev/dsp to .Pa /dev/dsp Ns Va ${hw.snd.default_unit} . +.It Va hw.snd.default_auto +Enable to automatically assign default sound unit to the most recent +attached device. .It Va dev.pcm.%d.[play|rec].vchans The current number of .Tn VCHANs ==== //depot/projects/opentoe/share/man/man4/tty.4#2 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)tty.4 8.3 (Berkeley) 4/19/94 -.\" $FreeBSD: src/share/man/man4/tty.4,v 1.22 2005/02/13 22:25:17 ru Exp $ +.\" $FreeBSD: src/share/man/man4/tty.4,v 1.23 2007/06/27 15:14:06 remko Exp $ .\" -.Dd August 14, 1992 +.Dd Jun 27, 2007 .Dt TTY 4 .Os .Sh NAME @@ -280,7 +280,7 @@ a process on an .Fn open call: there is a specific ioctl called -.Dv TIOSCTTY +.Dv TIOCSCTTY to make a terminal the controlling terminal. In addition, a program can ==== //depot/projects/opentoe/share/man/man7/hier.7#6 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)hier.7 8.1 (Berkeley) 6/5/93 -.\" $FreeBSD: src/share/man/man7/hier.7,v 1.127 2007/06/10 08:51:03 brueffer Exp $ +.\" $FreeBSD: src/share/man/man7/hier.7,v 1.128 2007/06/25 05:06:55 rafan Exp $ .\" .Dd June 10, 2007 .Dt HIER 7 @@ -268,8 +268,6 @@ SMB/CIFS file system .It Pa udf/ UDF file system -.It Pa umapfs/ -alternate uid/gid mappings file system .It Pa unionfs union file system .El ==== //depot/projects/opentoe/share/man/man9/priv.9#2 (text+ko) ==== @@ -26,7 +26,7 @@ .\" NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS .\" SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/priv.9,v 1.5 2007/03/14 20:09:23 brueffer Exp $ +.\" $FreeBSD: src/share/man/man9/priv.9,v 1.6 2007/06/26 23:12:05 rwatson Exp $ .\" .Dd August 30, 2006 .Dt PRIV 9 @@ -57,9 +57,9 @@ The caller identifies the desired privilege via the .Fa priv argument. -Additional access control context may also be passed using the -.Fa flags -argument. +The optional flags argument, +.Fa flags , +is currently unused. .Ss Privilege Policies Privileges are typically granted based on one of two base system policies: the superuser policy, which grants privilege based on the effective (or ==== //depot/projects/opentoe/share/man/man9/suser.9#2 (text+ko) ==== @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/suser.9,v 1.32 2007/01/09 04:17:20 imp Exp $ +.\" $FreeBSD: src/share/man/man9/suser.9,v 1.33 2007/06/26 23:12:05 rwatson Exp $ .\" .Dd November 6, 2006 .Dt SUSER 9 @@ -68,37 +68,17 @@ powers should be extended to imprisoned roots, or when the credential to be checked is the real user rather than the effective user. .Pp -By default, a process does not command superuser powers if it has -been imprisoned by the -.Xr jail 2 -system call. -There are cases however where this is appropriate, and this can -be done by passing -.Dv SUSER_ALLOWJAIL -in the -.Fa flag -argument to the -.Fn suser_cred -function. -It is important to review carefully in each case that -this does not weaken the prison. -Generally, only where the action is protected by -.Xr chroot 2 -implicit in the -.Xr jail 2 -call should such powers be granted. +Whether or not a privilege is permitted in a +.Xr jail 8 +depends on logic in +.Fn prison_priv_check . +.Pp +In general, privileges are assigned based on the effective user ID; in some +cases, the real user ID may be used. .Pp -By default, the credential checked is the effective user. -There are cases -where it is instead necessary to check the real user (for example, when -determining if resource limits should be applied), and this can be done -by passing the -.Dv SUSER_RUID -flag in the -.Fa flag -argument to the -.Fn suser_cred -function. +The +.Fa flags +field is currently unused. .Pp The .Fn suser ==== //depot/projects/opentoe/share/misc/committers-src.dot#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/misc/committers-src.dot,v 1.62 2007/05/04 14:51:39 fjoe Exp $ +# $FreeBSD: src/share/misc/committers-src.dot,v 1.63 2007/06/25 14:28:11 scf Exp $ # This file is meant to list all FreeBSD src committers and describe the # mentor-mentee relationships between them. @@ -141,6 +141,7 @@ rwatson [label="Robert N. M. Watson\nrwatson@FreeBSD.org\n1999/12/16"] sam [label="Sam Leffler\nsam@FreeBSD.org\n2002/07/02"] sanpei [label="MIHIRA Sanpei Yoshiro\nsanpei@FreeBSD.org\n2000/06/19"] +scf [label="Sean C. Farley\nscf@FreeBSD.org\n2007/06/24"] schweikh [label="Jens Schweikhardt\nschweikh@FreeBSD.org\n2001/04/06"] sepotvin [label="Stephane E. Potvin\nsepotvin@FreeBSD.org\n2007/02/15"] shiba [label="Takeshi Shibagaki\nshiba@FreeBSD.org\n2000/06/19"] @@ -355,6 +356,8 @@ ume -> suz ume -> tshiozak +wes -> scf + wollman -> gad } ==== //depot/projects/opentoe/share/mk/bsd.own.mk#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/mk/bsd.own.mk,v 1.64 2007/06/13 02:08:03 sepotvin Exp $ +# $FreeBSD: src/share/mk/bsd.own.mk,v 1.65 2007/06/26 19:40:03 remko Exp $ # # The include file set common variables for owner, # group, mode, and directories. Defaults are in brackets. @@ -358,6 +358,7 @@ TOOLCHAIN \ USB \ WPA_SUPPLICANT_EAPOL \ + ZONEINFO \ ZFS .if defined(WITH_${var}) && defined(WITHOUT_${var}) .error WITH_${var} and WITHOUT_${var} can't both be set. ==== //depot/projects/opentoe/share/mk/sys.mk#2 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jun 28 06:24:08 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 805EF16A46B; Thu, 28 Jun 2007 06:24:08 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 47C9916A400 for ; Thu, 28 Jun 2007 06:24:08 +0000 (UTC) (envelope-from kevlo@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 3881013C480 for ; Thu, 28 Jun 2007 06:24:08 +0000 (UTC) (envelope-from kevlo@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5S6O8OK005153 for ; Thu, 28 Jun 2007 06:24:08 GMT (envelope-from kevlo@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5S6O7wi005149 for perforce@freebsd.org; Thu, 28 Jun 2007 06:24:07 GMT (envelope-from kevlo@freebsd.org) Date: Thu, 28 Jun 2007 06:24:07 GMT Message-Id: <200706280624.l5S6O7wi005149@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kevlo@freebsd.org using -f From: Kevin Lo To: Perforce Change Reviews Cc: Subject: PERFORCE change 122451 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Jun 2007 06:24:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=122451 Change 122451 by kevlo@kevlo_rtsl on 2007/06/28 06:24:00 radiotap is wrong. Don't use a 64-byte header on each packet. Affected files ... .. //depot/projects/wifi/sys/dev/ipw/if_ipw.c#15 edit .. //depot/projects/wifi/sys/dev/ral/rt2560.c#22 edit .. //depot/projects/wifi/sys/dev/ral/rt2661.c#14 edit Differences ... ==== //depot/projects/wifi/sys/dev/ipw/if_ipw.c#15 (text+ko) ==== @@ -312,13 +312,14 @@ ieee80211_media_init(ic, ipw_media_change, ipw_media_status); bpfattach2(ifp, DLT_IEEE802_11_RADIO, - sizeof (struct ieee80211_frame) + 64, &sc->sc_drvbpf); + sizeof (struct ieee80211_frame) + sizeof (sc->sc_txtap), + &sc->sc_drvbpf); - sc->sc_rxtap_len = sizeof sc->sc_rxtapu; + sc->sc_rxtap_len = sizeof sc->sc_rxtap; sc->sc_rxtap.wr_ihdr.it_len = htole16(sc->sc_rxtap_len); sc->sc_rxtap.wr_ihdr.it_present = htole32(IPW_RX_RADIOTAP_PRESENT); - sc->sc_txtap_len = sizeof sc->sc_txtapu; + sc->sc_txtap_len = sizeof sc->sc_txtap; sc->sc_txtap.wt_ihdr.it_len = htole16(sc->sc_txtap_len); sc->sc_txtap.wt_ihdr.it_present = htole32(IPW_TX_RADIOTAP_PRESENT); ==== //depot/projects/wifi/sys/dev/ral/rt2560.c#22 (text) ==== @@ -304,13 +304,14 @@ ieee80211_media_init(ic, rt2560_media_change, ieee80211_media_status); bpfattach2(ifp, DLT_IEEE802_11_RADIO, - sizeof (struct ieee80211_frame) + 64, &sc->sc_drvbpf); + sizeof (struct ieee80211_frame) + sizeof (sc->sc_txtap), + &sc->sc_drvbpf); - sc->sc_rxtap_len = sizeof sc->sc_rxtapu; + sc->sc_rxtap_len = sizeof sc->sc_rxtap; sc->sc_rxtap.wr_ihdr.it_len = htole16(sc->sc_rxtap_len); sc->sc_rxtap.wr_ihdr.it_present = htole32(RT2560_RX_RADIOTAP_PRESENT); - sc->sc_txtap_len = sizeof sc->sc_txtapu; + sc->sc_txtap_len = sizeof sc->sc_txtap; sc->sc_txtap.wt_ihdr.it_len = htole16(sc->sc_txtap_len); sc->sc_txtap.wt_ihdr.it_present = htole32(RT2560_TX_RADIOTAP_PRESENT); ==== //depot/projects/wifi/sys/dev/ral/rt2661.c#14 (text) ==== @@ -332,13 +332,14 @@ ieee80211_media_init(ic, rt2661_media_change, ieee80211_media_status); bpfattach2(ifp, DLT_IEEE802_11_RADIO, - sizeof (struct ieee80211_frame) + 64, &sc->sc_drvbpf); + sizeof (struct ieee80211_frame) + sizeof (sc->sc_txtap), + &sc->sc_drvbpf); - sc->sc_rxtap_len = sizeof sc->sc_rxtapu; + sc->sc_rxtap_len = sizeof sc->sc_rxtap; sc->sc_rxtap.wr_ihdr.it_len = htole16(sc->sc_rxtap_len); sc->sc_rxtap.wr_ihdr.it_present = htole32(RT2661_RX_RADIOTAP_PRESENT); - sc->sc_txtap_len = sizeof sc->sc_txtapu; + sc->sc_txtap_len = sizeof sc->sc_txtap; sc->sc_txtap.wt_ihdr.it_len = htole16(sc->sc_txtap_len); sc->sc_txtap.wt_ihdr.it_present = htole32(RT2661_TX_RADIOTAP_PRESENT); From owner-p4-projects@FreeBSD.ORG Thu Jun 28 07:24:26 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CC32A16A46B; Thu, 28 Jun 2007 07:24:25 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7C74916A41F for ; Thu, 28 Jun 2007 07:24:25 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6DD2E13C44C for ; Thu, 28 Jun 2007 07:24:25 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5S7OPKO010470 for ; Thu, 28 Jun 2007 07:24:25 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5S7OPgZ010467 for perforce@freebsd.org; Thu, 28 Jun 2007 07:24:25 GMT (envelope-from gabor@freebsd.org) Date: Thu, 28 Jun 2007 07:24:25 GMT Message-Id: <200706280724.l5S7OPgZ010467@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 122454 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Jun 2007 07:24:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=122454 Change 122454 by gabor@gabor_server on 2007/06/28 07:23:28 - Use realpath(1) when checking if devfs is mounted Affected files ... .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.destdir.mk#13 edit Differences ... ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.destdir.mk#13 (text+ko) ==== @@ -50,7 +50,7 @@ ${MOUNT_NULLFS} ${PORTSDIR} ${DESTDIR}${PORTSDIR_TMP_REL}; \ found=0; \ for _entry in `${MOUNT} | ${GREP} devfs | ${AWK} {'print $$3'}`; do \ - if [ $${_entry} = ${DESTDIR}/dev ]; then \ + if [ `${REALPATH} $${_entry}` = `${REALPATH} ${DESTDIR}/dev` ]; then \ found=1; \ fi; \ done; \ From owner-p4-projects@FreeBSD.ORG Thu Jun 28 07:25:27 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7D50D16A46E; Thu, 28 Jun 2007 07:25:27 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 46E3C16A46C for ; Thu, 28 Jun 2007 07:25:27 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 37F6613C447 for ; Thu, 28 Jun 2007 07:25:27 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5S7PRxY010551 for ; Thu, 28 Jun 2007 07:25:27 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5S7PQ3m010548 for perforce@freebsd.org; Thu, 28 Jun 2007 07:25:26 GMT (envelope-from gabor@freebsd.org) Date: Thu, 28 Jun 2007 07:25:26 GMT Message-Id: <200706280725.l5S7PQ3m010548@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 122455 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Jun 2007 07:25:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=122455 Change 122455 by gabor@gabor_server on 2007/06/28 07:24:28 - Remove post-post-chroot target. We will discuss later if so many special targets are necessary or not. Affected files ... .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.destdir.mk#14 edit Differences ... ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.destdir.mk#14 (text+ko) ==== @@ -30,7 +30,7 @@ .endfor .for _target in ${.TARGETS} -${_target}: pre-chroot do-chroot post-post-chroot +${_target}: pre-chroot do-chroot @${TRUE} .endfor @@ -64,9 +64,4 @@ ${RMDIR} ${DESTDIR}${PORTSDIR_TMP_REL} .endif -.if !target(post-post-chroot) -post-post-chroot: - @${TRUE} -.endif - .endif From owner-p4-projects@FreeBSD.ORG Thu Jun 28 07:32:38 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1232E16A468; Thu, 28 Jun 2007 07:32:38 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C21EA16A41F for ; Thu, 28 Jun 2007 07:32:37 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id B322613C448 for ; Thu, 28 Jun 2007 07:32:37 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5S7Wb3T011158 for ; Thu, 28 Jun 2007 07:32:37 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5S7Wb6I011155 for perforce@freebsd.org; Thu, 28 Jun 2007 07:32:37 GMT (envelope-from gabor@freebsd.org) Date: Thu, 28 Jun 2007 07:32:37 GMT Message-Id: <200706280732.l5S7Wb6I011155@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 122458 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Jun 2007 07:32:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=122458 Change 122458 by gabor@gabor_server on 2007/06/28 07:31:53 - Add some comments about the behaviour Affected files ... .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.destdir.mk#15 edit Differences ... ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.destdir.mk#15 (text+ko) ==== @@ -29,6 +29,28 @@ DESTDIR_ENV+= ${_var}="${${_var}}" .endfor +# +# The target order is always: pre-chroot do-chroot post-chroot +# +# pre-chroot +# - You can use this for special preparation work, that +# want to do before chrooting into the destination +# environment and doing the real build. At default +# this target is empty. +# +# do-chroot +# - This is the main target for doing the chrooted +# operations. It mounts the ports tree and devfs into +# the destination environment and starts make(1) +# by calling chroot(1). +# +# post-chroot +# - This target runs chrooted just after chroot(1) was +# called. You can use this for special preparation +# work for the chrooted build if necessary. At +# default, this target is empty. +# + .for _target in ${.TARGETS} ${_target}: pre-chroot do-chroot @${TRUE} From owner-p4-projects@FreeBSD.ORG Thu Jun 28 07:35:42 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A735B16A421; Thu, 28 Jun 2007 07:35:42 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5C95816A46E for ; Thu, 28 Jun 2007 07:35:42 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 4D40013C455 for ; Thu, 28 Jun 2007 07:35:42 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5S7ZgHu011356 for ; Thu, 28 Jun 2007 07:35:42 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5S7ZgCf011353 for perforce@freebsd.org; Thu, 28 Jun 2007 07:35:42 GMT (envelope-from gabor@freebsd.org) Date: Thu, 28 Jun 2007 07:35:42 GMT Message-Id: <200706280735.l5S7ZgCf011353@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 122459 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Jun 2007 07:35:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=122459 Change 122459 by gabor@gabor_server on 2007/06/28 07:34:54 - Move the comments upwards a bit like the docs in bsd.port.mk. It is easier to read and looks better int his way. Affected files ... .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.destdir.mk#16 edit Differences ... ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.destdir.mk#16 (text+ko) ==== @@ -11,24 +11,6 @@ DESTDIR_Include_MAINTAINER= portmgr@FreeBSD.org -.if !defined(_DESTDIRMKINCLUDED) - -_DESTDIRMKINCLUDED= yes - -# Place variable names into DESTDIR_ENV_LIST, which you want to override in -# the DESTDIR environment from outside. E.g.: -# -# make DESTDIR=/foo/bar PREFIX=/opt DESTDIR_ENV_LIST=PREFIX -# - -DESTDIR_ENV_LIST?= - -DESTDIR_ENV= DESTDIR= CHROOTED=YES PORTSDIR=${PORTSDIR_TMP_REL} - -.for _var in ${DESTDIR_ENV_LIST:NDESTDIR} -DESTDIR_ENV+= ${_var}="${${_var}}" -.endfor - # # The target order is always: pre-chroot do-chroot post-chroot # @@ -51,6 +33,24 @@ # default, this target is empty. # +.if !defined(_DESTDIRMKINCLUDED) + +_DESTDIRMKINCLUDED= yes + +# Place variable names into DESTDIR_ENV_LIST, which you want to override in +# the DESTDIR environment from outside. E.g.: +# +# make DESTDIR=/foo/bar PREFIX=/opt DESTDIR_ENV_LIST=PREFIX +# + +DESTDIR_ENV_LIST?= + +DESTDIR_ENV= DESTDIR= CHROOTED=YES PORTSDIR=${PORTSDIR_TMP_REL} + +.for _var in ${DESTDIR_ENV_LIST:NDESTDIR} +DESTDIR_ENV+= ${_var}="${${_var}}" +.endfor + .for _target in ${.TARGETS} ${_target}: pre-chroot do-chroot @${TRUE} From owner-p4-projects@FreeBSD.ORG Thu Jun 28 07:38:46 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BB2E316A468; Thu, 28 Jun 2007 07:38:46 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8ADDE16A41F for ; Thu, 28 Jun 2007 07:38:46 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6368B13C458 for ; Thu, 28 Jun 2007 07:38:46 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5S7ck6u011522 for ; Thu, 28 Jun 2007 07:38:46 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5S7ckl3011519 for perforce@freebsd.org; Thu, 28 Jun 2007 07:38:46 GMT (envelope-from gabor@freebsd.org) Date: Thu, 28 Jun 2007 07:38:46 GMT Message-Id: <200706280738.l5S7ckl3011519@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 122460 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Jun 2007 07:38:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=122460 Change 122460 by gabor@gabor_server on 2007/06/28 07:37:55 - Do not allow overriding CHROOTED and PORTSDIR when chrooted Affected files ... .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.destdir.mk#17 edit Differences ... ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.destdir.mk#17 (text+ko) ==== @@ -47,7 +47,7 @@ DESTDIR_ENV= DESTDIR= CHROOTED=YES PORTSDIR=${PORTSDIR_TMP_REL} -.for _var in ${DESTDIR_ENV_LIST:NDESTDIR} +.for _var in ${DESTDIR_ENV_LIST:NDESTDIR:NCHROOTED:NPORTSDIR} DESTDIR_ENV+= ${_var}="${${_var}}" .endfor From owner-p4-projects@FreeBSD.ORG Thu Jun 28 08:36:00 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0660216A46D; Thu, 28 Jun 2007 08:36:00 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id CD86416A46B for ; Thu, 28 Jun 2007 08:35:59 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id BCE4213C45E for ; Thu, 28 Jun 2007 08:35:59 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5S8ZxZ2016904 for ; Thu, 28 Jun 2007 08:35:59 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5S8ZxW4016901 for perforce@freebsd.org; Thu, 28 Jun 2007 08:35:59 GMT (envelope-from rdivacky@FreeBSD.org) Date: Thu, 28 Jun 2007 08:35:59 GMT Message-Id: <200706280835.l5S8ZxW4016901@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 122463 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Jun 2007 08:36:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=122463 Change 122463 by rdivacky@rdivacky_witten on 2007/06/28 08:35:20 Constify arguments to various syscalls as linux/posix does. I need to change the code a little (type-casting to (const char *) and __DECONST in one place). Affected files ... .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_proto.h#8 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_syscall.h#8 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_sysent.c#8 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/syscalls.master#8 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_file.c#14 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_util.c#3 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_util.h#4 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/linux/linux_proto.h#8 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/linux/linux_syscall.h#8 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/linux/linux_sysent.c#8 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/i386/linux/syscalls.master#8 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/init_sysent.c#6 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/syscalls.c#6 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/syscalls.master#6 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/systrace_args.c#6 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_lookup.c#8 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#33 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/syscall.h#6 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/syscall.mk#6 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/syscallsubr.h#14 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/sysproto.h#6 edit Differences ... ==== //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_proto.h#8 (text+ko) ==== @@ -875,24 +875,24 @@ }; struct linux_openat_args { char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)]; - char filename_l_[PADL_(char *)]; char * filename; char filename_r_[PADR_(char *)]; + char filename_l_[PADL_(const char *)]; const char * filename; char filename_r_[PADR_(const char *)]; char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)]; char mode_l_[PADL_(l_int)]; l_int mode; char mode_r_[PADR_(l_int)]; }; struct linux_mkdirat_args { char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)]; - char pathname_l_[PADL_(char *)]; char * pathname; char pathname_r_[PADR_(char *)]; + char pathname_l_[PADL_(const char *)]; const char * pathname; char pathname_r_[PADR_(const char *)]; char mode_l_[PADL_(l_int)]; l_int mode; char mode_r_[PADR_(l_int)]; }; struct linux_mknodat_args { char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)]; - char filename_l_[PADL_(char *)]; char * filename; char filename_r_[PADR_(char *)]; + char filename_l_[PADL_(const char *)]; const char * filename; char filename_r_[PADR_(const char *)]; char mode_l_[PADL_(l_int)]; l_int mode; char mode_r_[PADR_(l_int)]; char dev_l_[PADL_(l_uint)]; l_uint dev; char dev_r_[PADR_(l_uint)]; }; struct linux_fchownat_args { char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)]; - char filename_l_[PADL_(char *)]; char * filename; char filename_r_[PADR_(char *)]; + char filename_l_[PADL_(const char *)]; const char * filename; char filename_r_[PADR_(const char *)]; char uid_l_[PADL_(l_uid16_t)]; l_uid16_t uid; char uid_r_[PADR_(l_uid16_t)]; char gid_l_[PADL_(l_gid16_t)]; l_gid16_t gid; char gid_r_[PADR_(l_gid16_t)]; char flag_l_[PADL_(l_int)]; l_int flag; char flag_r_[PADR_(l_int)]; @@ -910,41 +910,41 @@ }; struct linux_unlinkat_args { char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)]; - char pathname_l_[PADL_(char *)]; char * pathname; char pathname_r_[PADR_(char *)]; + char pathname_l_[PADL_(const char *)]; const char * pathname; char pathname_r_[PADR_(const char *)]; char flag_l_[PADL_(l_int)]; l_int flag; char flag_r_[PADR_(l_int)]; }; struct linux_renameat_args { char olddfd_l_[PADL_(l_int)]; l_int olddfd; char olddfd_r_[PADR_(l_int)]; - char oldname_l_[PADL_(char *)]; char * oldname; char oldname_r_[PADR_(char *)]; + char oldname_l_[PADL_(const char *)]; const char * oldname; char oldname_r_[PADR_(const char *)]; char newdfd_l_[PADL_(l_int)]; l_int newdfd; char newdfd_r_[PADR_(l_int)]; - char newname_l_[PADL_(char *)]; char * newname; char newname_r_[PADR_(char *)]; + char newname_l_[PADL_(const char *)]; const char * newname; char newname_r_[PADR_(const char *)]; }; struct linux_linkat_args { char olddfd_l_[PADL_(l_int)]; l_int olddfd; char olddfd_r_[PADR_(l_int)]; - char oldname_l_[PADL_(char *)]; char * oldname; char oldname_r_[PADR_(char *)]; + char oldname_l_[PADL_(const char *)]; const char * oldname; char oldname_r_[PADR_(const char *)]; char newdfd_l_[PADL_(l_int)]; l_int newdfd; char newdfd_r_[PADR_(l_int)]; - char newname_l_[PADL_(char *)]; char * newname; char newname_r_[PADR_(char *)]; + char newname_l_[PADL_(const char *)]; const char * newname; char newname_r_[PADR_(const char *)]; char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)]; }; struct linux_symlinkat_args { - char oldname_l_[PADL_(char *)]; char * oldname; char oldname_r_[PADR_(char *)]; + char oldname_l_[PADL_(const char *)]; const char * oldname; char oldname_r_[PADR_(const char *)]; char newdfd_l_[PADL_(l_int)]; l_int newdfd; char newdfd_r_[PADR_(l_int)]; - char newname_l_[PADL_(char *)]; char * newname; char newname_r_[PADR_(char *)]; + char newname_l_[PADL_(const char *)]; const char * newname; char newname_r_[PADR_(const char *)]; }; struct linux_readlinkat_args { char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)]; - char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; + char path_l_[PADL_(const char *)]; const char * path; char path_r_[PADR_(const char *)]; char buf_l_[PADL_(char *)]; char * buf; char buf_r_[PADR_(char *)]; char bufsiz_l_[PADL_(l_int)]; l_int bufsiz; char bufsiz_r_[PADR_(l_int)]; }; struct linux_fchmodat_args { char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)]; - char filename_l_[PADL_(char *)]; char * filename; char filename_r_[PADR_(char *)]; + char filename_l_[PADL_(const char *)]; const char * filename; char filename_r_[PADR_(const char *)]; char mode_l_[PADL_(l_mode_t)]; l_mode_t mode; char mode_r_[PADR_(l_mode_t)]; }; struct linux_faccessat_args { char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)]; - char filename_l_[PADL_(char *)]; char * filename; char filename_r_[PADR_(char *)]; + char filename_l_[PADL_(const char *)]; const char * filename; char filename_r_[PADR_(const char *)]; char mode_l_[PADL_(l_int)]; l_int mode; char mode_r_[PADR_(l_int)]; }; struct linux_pselect6_args { ==== //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_syscall.h#8 (text+ko) ==== ==== //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/linux32_sysent.c#8 (text+ko) ==== ==== //depot/projects/soc2007/rdivacky/linux_at/sys/amd64/linux32/syscalls.master#8 (text+ko) ==== @@ -463,26 +463,31 @@ 292 AUE_NULL STD { int linux_inotify_add_watch(void); } 293 AUE_NULL STD { int linux_inotify_rm_watch(void); } 294 AUE_NULL STD { int linux_migrate_pages(void); } -295 AUE_OPEN_RWTC STD { int linux_openat(l_int dfd, char *filename, \ +295 AUE_OPEN_RWTC STD { int linux_openat(l_int dfd, const char *filename, \ l_int flags, l_int mode); } -296 AUE_NULL STD { int linux_mkdirat(l_int dfd, char *pathname, l_int mode); } -297 AUE_NULL STD { int linux_mknodat(l_int dfd, char *filename, l_int mode, l_uint dev); } -298 AUE_NULL STD { int linux_fchownat(l_int dfd, char *filename, \ +296 AUE_NULL STD { int linux_mkdirat(l_int dfd, const char *pathname, \ + l_int mode); } +297 AUE_NULL STD { int linux_mknodat(l_int dfd, const char *filename, \ + l_int mode, l_uint dev); } +298 AUE_NULL STD { int linux_fchownat(l_int dfd, const char *filename, \ l_uid16_t uid, l_gid16_t gid, l_int flag); } -299 AUE_NULL STD { int linux_futimesat(l_int dfd, char *filename, struct l_timeval *utimes); } +299 AUE_NULL STD { int linux_futimesat(l_int dfd, char *filename, \ + struct l_timeval *utimes); } 300 AUE_NULL STD { int linux_fstatat64(l_int dfd, char *pathname, \ struct l_stat64 *statbuf, l_int flag); } -301 AUE_NULL STD { int linux_unlinkat(l_int dfd, char *pathname, l_int flag); } -302 AUE_NULL STD { int linux_renameat(l_int olddfd, char *oldname, l_int newdfd, \ - char *newname); } -303 AUE_NULL STD { int linux_linkat(l_int olddfd, char *oldname, \ - l_int newdfd, char *newname, l_int flags); } -304 AUE_NULL STD { int linux_symlinkat(char *oldname, l_int newdfd, char *newname); } -305 AUE_NULL STD { int linux_readlinkat(l_int dfd, char *path, \ +301 AUE_NULL STD { int linux_unlinkat(l_int dfd, const char *pathname, \ + l_int flag); } +302 AUE_NULL STD { int linux_renameat(l_int olddfd, const char *oldname, \ + l_int newdfd, const char *newname); } +303 AUE_NULL STD { int linux_linkat(l_int olddfd, const char *oldname, \ + l_int newdfd, const char *newname, l_int flags); } +304 AUE_NULL STD { int linux_symlinkat(const char *oldname, l_int newdfd, \ + const char *newname); } +305 AUE_NULL STD { int linux_readlinkat(l_int dfd, const char *path, \ char *buf, l_int bufsiz); } -306 AUE_NULL STD { int linux_fchmodat(l_int dfd, char *filename, \ +306 AUE_NULL STD { int linux_fchmodat(l_int dfd, const char *filename, \ l_mode_t mode); } -307 AUE_NULL STD { int linux_faccessat(l_int dfd, char *filename, l_int mode); } +307 AUE_NULL STD { int linux_faccessat(l_int dfd, const char *filename, l_int mode); } 308 AUE_NULL STD { int linux_pselect6(void); } 309 AUE_NULL STD { int linux_ppoll(void); } 310 AUE_NULL STD { int linux_unshare(void); } ==== //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_file.c#14 (text+ko) ==== ==== //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_util.c#3 (text+ko) ==== @@ -68,7 +68,7 @@ int linux_emul_convpath(td, path, pathseg, pbuf, cflag, dfd) struct thread *td; - char *path; + const char *path; enum uio_seg pathseg; char **pbuf; int cflag; ==== //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_util.h#4 (text+ko) ==== @@ -51,7 +51,7 @@ extern const char linux_emul_path[]; -int linux_emul_convpath(struct thread *, char *, enum uio_seg, char **, int, int); +int linux_emul_convpath(struct thread *, const char *, enum uio_seg, char **, int, int); #define LCONVPATH_AT(td, upath, pathp, i, dfd) \ do { \ ==== //depot/projects/soc2007/rdivacky/linux_at/sys/i386/linux/linux_proto.h#8 (text+ko) ==== @@ -894,24 +894,24 @@ }; struct linux_openat_args { char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)]; - char filename_l_[PADL_(char *)]; char * filename; char filename_r_[PADR_(char *)]; + char filename_l_[PADL_(const char *)]; const char * filename; char filename_r_[PADR_(const char *)]; char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)]; char mode_l_[PADL_(l_int)]; l_int mode; char mode_r_[PADR_(l_int)]; }; struct linux_mkdirat_args { char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)]; - char pathname_l_[PADL_(char *)]; char * pathname; char pathname_r_[PADR_(char *)]; + char pathname_l_[PADL_(const char *)]; const char * pathname; char pathname_r_[PADR_(const char *)]; char mode_l_[PADL_(l_int)]; l_int mode; char mode_r_[PADR_(l_int)]; }; struct linux_mknodat_args { char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)]; - char filename_l_[PADL_(char *)]; char * filename; char filename_r_[PADR_(char *)]; + char filename_l_[PADL_(const char *)]; const char * filename; char filename_r_[PADR_(const char *)]; char mode_l_[PADL_(l_int)]; l_int mode; char mode_r_[PADR_(l_int)]; char dev_l_[PADL_(l_uint)]; l_uint dev; char dev_r_[PADR_(l_uint)]; }; struct linux_fchownat_args { char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)]; - char filename_l_[PADL_(char *)]; char * filename; char filename_r_[PADR_(char *)]; + char filename_l_[PADL_(const char *)]; const char * filename; char filename_r_[PADR_(const char *)]; char uid_l_[PADL_(l_uid16_t)]; l_uid16_t uid; char uid_r_[PADR_(l_uid16_t)]; char gid_l_[PADL_(l_gid16_t)]; l_gid16_t gid; char gid_r_[PADR_(l_gid16_t)]; char flag_l_[PADL_(l_int)]; l_int flag; char flag_r_[PADR_(l_int)]; @@ -929,41 +929,41 @@ }; struct linux_unlinkat_args { char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)]; - char pathname_l_[PADL_(char *)]; char * pathname; char pathname_r_[PADR_(char *)]; + char pathname_l_[PADL_(const char *)]; const char * pathname; char pathname_r_[PADR_(const char *)]; char flag_l_[PADL_(l_int)]; l_int flag; char flag_r_[PADR_(l_int)]; }; struct linux_renameat_args { char olddfd_l_[PADL_(l_int)]; l_int olddfd; char olddfd_r_[PADR_(l_int)]; - char oldname_l_[PADL_(char *)]; char * oldname; char oldname_r_[PADR_(char *)]; + char oldname_l_[PADL_(const char *)]; const char * oldname; char oldname_r_[PADR_(const char *)]; char newdfd_l_[PADL_(l_int)]; l_int newdfd; char newdfd_r_[PADR_(l_int)]; - char newname_l_[PADL_(char *)]; char * newname; char newname_r_[PADR_(char *)]; + char newname_l_[PADL_(const char *)]; const char * newname; char newname_r_[PADR_(const char *)]; }; struct linux_linkat_args { char olddfd_l_[PADL_(l_int)]; l_int olddfd; char olddfd_r_[PADR_(l_int)]; - char oldname_l_[PADL_(char *)]; char * oldname; char oldname_r_[PADR_(char *)]; + char oldname_l_[PADL_(const char *)]; const char * oldname; char oldname_r_[PADR_(const char *)]; char newdfd_l_[PADL_(l_int)]; l_int newdfd; char newdfd_r_[PADR_(l_int)]; - char newname_l_[PADL_(char *)]; char * newname; char newname_r_[PADR_(char *)]; + char newname_l_[PADL_(const char *)]; const char * newname; char newname_r_[PADR_(const char *)]; char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)]; }; struct linux_symlinkat_args { - char oldname_l_[PADL_(char *)]; char * oldname; char oldname_r_[PADR_(char *)]; + char oldname_l_[PADL_(const char *)]; const char * oldname; char oldname_r_[PADR_(const char *)]; char newdfd_l_[PADL_(l_int)]; l_int newdfd; char newdfd_r_[PADR_(l_int)]; - char newname_l_[PADL_(char *)]; char * newname; char newname_r_[PADR_(char *)]; + char newname_l_[PADL_(const char *)]; const char * newname; char newname_r_[PADR_(const char *)]; }; struct linux_readlinkat_args { char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)]; - char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; + char path_l_[PADL_(const char *)]; const char * path; char path_r_[PADR_(const char *)]; char buf_l_[PADL_(char *)]; char * buf; char buf_r_[PADR_(char *)]; char bufsiz_l_[PADL_(l_int)]; l_int bufsiz; char bufsiz_r_[PADR_(l_int)]; }; struct linux_fchmodat_args { char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)]; - char filename_l_[PADL_(char *)]; char * filename; char filename_r_[PADR_(char *)]; + char filename_l_[PADL_(const char *)]; const char * filename; char filename_r_[PADR_(const char *)]; char mode_l_[PADL_(l_mode_t)]; l_mode_t mode; char mode_r_[PADR_(l_mode_t)]; }; struct linux_faccessat_args { char dfd_l_[PADL_(l_int)]; l_int dfd; char dfd_r_[PADR_(l_int)]; - char filename_l_[PADL_(char *)]; char * filename; char filename_r_[PADR_(char *)]; + char filename_l_[PADL_(const char *)]; const char * filename; char filename_r_[PADR_(const char *)]; char mode_l_[PADL_(l_int)]; l_int mode; char mode_r_[PADR_(l_int)]; }; struct linux_pselect6_args { ==== //depot/projects/soc2007/rdivacky/linux_at/sys/i386/linux/linux_syscall.h#8 (text+ko) ==== ==== //depot/projects/soc2007/rdivacky/linux_at/sys/i386/linux/linux_sysent.c#8 (text+ko) ==== ==== //depot/projects/soc2007/rdivacky/linux_at/sys/i386/linux/syscalls.master#8 (text+ko) ==== @@ -473,26 +473,31 @@ 292 AUE_NULL STD { int linux_inotify_add_watch(void); } 293 AUE_NULL STD { int linux_inotify_rm_watch(void); } 294 AUE_NULL STD { int linux_migrate_pages(void); } -295 AUE_OPEN_RWTC STD { int linux_openat(l_int dfd, char *filename, \ +295 AUE_OPEN_RWTC STD { int linux_openat(l_int dfd, const char *filename, \ l_int flags, l_int mode); } -296 AUE_NULL STD { int linux_mkdirat(l_int dfd, char *pathname, l_int mode); } -297 AUE_NULL STD { int linux_mknodat(l_int dfd, char *filename, l_int mode, l_uint dev); } -298 AUE_NULL STD { int linux_fchownat(l_int dfd, char *filename, \ +296 AUE_NULL STD { int linux_mkdirat(l_int dfd, const char *pathname, \ + l_int mode); } +297 AUE_NULL STD { int linux_mknodat(l_int dfd, const char *filename, \ + l_int mode, l_uint dev); } +298 AUE_NULL STD { int linux_fchownat(l_int dfd, const char *filename, \ l_uid16_t uid, l_gid16_t gid, l_int flag); } -299 AUE_NULL STD { int linux_futimesat(l_int dfd, char *filename, struct l_timeval *utimes); } +299 AUE_NULL STD { int linux_futimesat(l_int dfd, char *filename, \ + struct l_timeval *utimes); } 300 AUE_NULL STD { int linux_fstatat64(l_int dfd, char *pathname, \ struct l_stat64 *statbuf, l_int flag); } -301 AUE_NULL STD { int linux_unlinkat(l_int dfd, char *pathname, l_int flag); } -302 AUE_NULL STD { int linux_renameat(l_int olddfd, char *oldname, l_int newdfd, \ - char *newname); } -303 AUE_NULL STD { int linux_linkat(l_int olddfd, char *oldname, \ - l_int newdfd, char *newname, l_int flags); } -304 AUE_NULL STD { int linux_symlinkat(char *oldname, l_int newdfd, char *newname); } -305 AUE_NULL STD { int linux_readlinkat(l_int dfd, char *path, \ +301 AUE_NULL STD { int linux_unlinkat(l_int dfd, const char *pathname, \ + l_int flag); } +302 AUE_NULL STD { int linux_renameat(l_int olddfd, const char *oldname, \ + l_int newdfd, const char *newname); } +303 AUE_NULL STD { int linux_linkat(l_int olddfd, const char *oldname, \ + l_int newdfd, const char *newname, l_int flags); } +304 AUE_NULL STD { int linux_symlinkat(const char *oldname, l_int newdfd, \ + const char *newname); } +305 AUE_NULL STD { int linux_readlinkat(l_int dfd, const char *path, \ char *buf, l_int bufsiz); } -306 AUE_NULL STD { int linux_fchmodat(l_int dfd, char *filename, \ +306 AUE_NULL STD { int linux_fchmodat(l_int dfd, const char *filename, \ l_mode_t mode); } -307 AUE_NULL STD { int linux_faccessat(l_int dfd, char *filename, l_int mode); } +307 AUE_NULL STD { int linux_faccessat(l_int dfd, const char *filename, l_int mode); } 308 AUE_NULL STD { int linux_pselect6(void); } 309 AUE_NULL STD { int linux_ppoll(void); } 310 AUE_NULL STD { int linux_unshare(void); } ==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/init_sysent.c#6 (text+ko) ==== ==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/syscalls.c#6 (text+ko) ==== ==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/syscalls.master#6 (text+ko) ==== @@ -835,21 +835,21 @@ 474 AUE_NULL STD { int sctp_generic_recvmsg(int sd, struct iovec *iov, int iovlen, \ struct sockaddr * from, __socklen_t *fromlenaddr, \ struct sctp_sndrcvinfo *sinfo, int *msg_flags); } -475 AUE_ACCESS STD { int faccessat(int dirfd, char *path, int mode, int flag); } -476 AUE_CHMOD STD { int fchmodat(int dirfd, char *path, mode_t mode, int flag); } -477 AUE_CHOWN STD { int fchownat(int dirfd, char *path, uid_t uid, gid_t gid, int flag); } +475 AUE_ACCESS STD { int faccessat(int dirfd, const char *path, int mode, int flag); } +476 AUE_CHMOD STD { int fchmodat(int dirfd, const char *path, mode_t mode, int flag); } +477 AUE_CHOWN STD { int fchownat(int dirfd, const char *path, uid_t uid, gid_t gid, int flag); } 478 AUE_EXECVE STD { int fexecve(int fd, char **argv, char **envv); } -479 AUE_STAT STD { int fstatat(int fd, char *path, struct stat *buf, int flag); } -480 AUE_UTIMES STD { int futimesat(int fd, char *path, struct timeval *times); } -481 AUE_LINK STD { int linkat(int fd1, char *path1, int fd2, char *path2, int flag); } -482 AUE_MKDIR STD { int mkdirat(int fd, char *path, mode_t mode); } -483 AUE_MKFIFO STD { int mkfifoat(int fd, char *path, mode_t mode); } -484 AUE_MKNOD STD { int mknodat(int fd, char *path, mode_t mode, dev_t dev); } +479 AUE_STAT STD { int fstatat(int fd, const char *path, struct stat *buf, int flag); } +480 AUE_UTIMES STD { int futimesat(int fd, const char *path, const struct timeval *times); } +481 AUE_LINK STD { int linkat(int fd1, const char *path1, int fd2, const char *path2, int flag); } +482 AUE_MKDIR STD { int mkdirat(int fd, const char *path, mode_t mode); } +483 AUE_MKFIFO STD { int mkfifoat(int fd, const char *path, mode_t mode); } +484 AUE_MKNOD STD { int mknodat(int fd, const char *path, mode_t mode, dev_t dev); } ; XXX: see the comment for open -485 AUE_OPEN_RWTC STD { int openat(int fd, char *path, int flag, mode_t mode); } -486 AUE_READLINK STD { ssize_t readlinkat(int fd, char *path, char *buf, size_t bufsize); } -487 AUE_RENAME STD { int renameat(int oldfd, char *old, int newfd, char *new); } -488 AUE_SYMLINK STD { int symlinkat(char *path1, int fd, char *path2); } -489 AUE_UNLINK STD { int unlinkat(int fd, char *path, int flag); } +485 AUE_OPEN_RWTC STD { int openat(int fd, const char *path, int flag, mode_t mode); } +486 AUE_READLINK STD { ssize_t readlinkat(int fd, const char *path, char *buf, size_t bufsize); } +487 AUE_RENAME STD { int renameat(int oldfd, const char *old, int newfd, const char *new); } +488 AUE_SYMLINK STD { int symlinkat(const char *path1, int fd, const char *path2); } +489 AUE_UNLINK STD { int unlinkat(int fd, const char *path, int flag); } ; Please copy any additions and changes to the following compatability tables: ; sys/compat/freebsd32/syscalls.master ==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/systrace_args.c#6 (text+ko) ==== @@ -2809,7 +2809,7 @@ case 475: { struct faccessat_args *p = params; iarg[0] = p->dirfd; /* int */ - uarg[1] = (intptr_t) p->path; /* char * */ + uarg[1] = (intptr_t) p->path; /* const char * */ iarg[2] = p->mode; /* int */ iarg[3] = p->flag; /* int */ *n_args = 4; @@ -2819,7 +2819,7 @@ case 476: { struct fchmodat_args *p = params; iarg[0] = p->dirfd; /* int */ - uarg[1] = (intptr_t) p->path; /* char * */ + uarg[1] = (intptr_t) p->path; /* const char * */ iarg[2] = p->mode; /* mode_t */ iarg[3] = p->flag; /* int */ *n_args = 4; @@ -2829,7 +2829,7 @@ case 477: { struct fchownat_args *p = params; iarg[0] = p->dirfd; /* int */ - uarg[1] = (intptr_t) p->path; /* char * */ + uarg[1] = (intptr_t) p->path; /* const char * */ uarg[2] = p->uid; /* uid_t */ iarg[3] = p->gid; /* gid_t */ iarg[4] = p->flag; /* int */ @@ -2849,7 +2849,7 @@ case 479: { struct fstatat_args *p = params; iarg[0] = p->fd; /* int */ - uarg[1] = (intptr_t) p->path; /* char * */ + uarg[1] = (intptr_t) p->path; /* const char * */ uarg[2] = (intptr_t) p->buf; /* struct stat * */ iarg[3] = p->flag; /* int */ *n_args = 4; @@ -2859,8 +2859,8 @@ case 480: { struct futimesat_args *p = params; iarg[0] = p->fd; /* int */ - uarg[1] = (intptr_t) p->path; /* char * */ - uarg[2] = (intptr_t) p->times; /* struct timeval * */ + uarg[1] = (intptr_t) p->path; /* const char * */ + uarg[2] = (intptr_t) p->times; /* const struct timeval * */ *n_args = 3; break; } @@ -2868,9 +2868,9 @@ case 481: { struct linkat_args *p = params; iarg[0] = p->fd1; /* int */ - uarg[1] = (intptr_t) p->path1; /* char * */ + uarg[1] = (intptr_t) p->path1; /* const char * */ iarg[2] = p->fd2; /* int */ - uarg[3] = (intptr_t) p->path2; /* char * */ + uarg[3] = (intptr_t) p->path2; /* const char * */ iarg[4] = p->flag; /* int */ *n_args = 5; break; @@ -2879,7 +2879,7 @@ case 482: { struct mkdirat_args *p = params; iarg[0] = p->fd; /* int */ - uarg[1] = (intptr_t) p->path; /* char * */ + uarg[1] = (intptr_t) p->path; /* const char * */ iarg[2] = p->mode; /* mode_t */ *n_args = 3; break; @@ -2888,7 +2888,7 @@ case 483: { struct mkfifoat_args *p = params; iarg[0] = p->fd; /* int */ - uarg[1] = (intptr_t) p->path; /* char * */ + uarg[1] = (intptr_t) p->path; /* const char * */ iarg[2] = p->mode; /* mode_t */ *n_args = 3; break; @@ -2897,7 +2897,7 @@ case 484: { struct mknodat_args *p = params; iarg[0] = p->fd; /* int */ - uarg[1] = (intptr_t) p->path; /* char * */ + uarg[1] = (intptr_t) p->path; /* const char * */ iarg[2] = p->mode; /* mode_t */ iarg[3] = p->dev; /* dev_t */ *n_args = 4; @@ -2907,7 +2907,7 @@ case 485: { struct openat_args *p = params; iarg[0] = p->fd; /* int */ - uarg[1] = (intptr_t) p->path; /* char * */ + uarg[1] = (intptr_t) p->path; /* const char * */ iarg[2] = p->flag; /* int */ iarg[3] = p->mode; /* mode_t */ *n_args = 4; @@ -2917,7 +2917,7 @@ case 486: { struct readlinkat_args *p = params; iarg[0] = p->fd; /* int */ - uarg[1] = (intptr_t) p->path; /* char * */ + uarg[1] = (intptr_t) p->path; /* const char * */ uarg[2] = (intptr_t) p->buf; /* char * */ uarg[3] = p->bufsize; /* size_t */ *n_args = 4; @@ -2927,18 +2927,18 @@ case 487: { struct renameat_args *p = params; iarg[0] = p->oldfd; /* int */ - uarg[1] = (intptr_t) p->old; /* char * */ + uarg[1] = (intptr_t) p->old; /* const char * */ iarg[2] = p->newfd; /* int */ - uarg[3] = (intptr_t) p->new; /* char * */ + uarg[3] = (intptr_t) p->new; /* const char * */ *n_args = 4; break; } /* symlinkat */ case 488: { struct symlinkat_args *p = params; - uarg[0] = (intptr_t) p->path1; /* char * */ + uarg[0] = (intptr_t) p->path1; /* const char * */ iarg[1] = p->fd; /* int */ - uarg[2] = (intptr_t) p->path2; /* char * */ + uarg[2] = (intptr_t) p->path2; /* const char * */ *n_args = 3; break; } @@ -2946,7 +2946,7 @@ case 489: { struct unlinkat_args *p = params; iarg[0] = p->fd; /* int */ - uarg[1] = (intptr_t) p->path; /* char * */ + uarg[1] = (intptr_t) p->path; /* const char * */ iarg[2] = p->flag; /* int */ *n_args = 3; break; ==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_lookup.c#8 (text+ko) ==== @@ -1008,7 +1008,7 @@ * the M_TEMP bucket if one is returned. */ int -kern_alternate_path(struct thread *td, const char *prefix, char *path, +kern_alternate_path(struct thread *td, const char *prefix, const char *path, enum uio_seg pathseg, char **pathbuf, int create, int dirfd) { struct nameidata nd, ndroot; ==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#33 (text+ko) ==== @@ -88,7 +88,7 @@ static int kern_get_at(struct thread *td, int dirfd, struct vnode **dir_vn); static int vn_access(struct vnode *vp, int user_flags, struct ucred *cred, struct thread *td); -static int kern_absolute_path(char *path, enum uio_seg pathseg); +static int kern_absolute_path(const char *path, enum uio_seg pathseg); /* * The module initialization routine for POSIX asynchronous I/O will @@ -974,7 +974,7 @@ kern_open(struct thread *td, char *path, enum uio_seg pathseg, int flags, int mode) { - return kern_openat(td, path, pathseg, flags, mode, AT_FDCWD); + return kern_openat(td, (const char *)path, pathseg, flags, mode, AT_FDCWD); } static int @@ -1001,7 +1001,7 @@ } /* Check whether a path is an absolute path. */ -static int kern_absolute_path(char *path, enum uio_seg pathseg) +static int kern_absolute_path(const char *path, enum uio_seg pathseg) { int error; char buf[1]; @@ -1017,7 +1017,7 @@ } int -kern_openat(struct thread *td, char *path, enum uio_seg pathseg, int flags, +kern_openat(struct thread *td, const char *path, enum uio_seg pathseg, int flags, int mode, int dirfd) { struct nameidata nd; @@ -1233,11 +1233,11 @@ kern_mknod(struct thread *td, char *path, enum uio_seg pathseg, int mode, int dev) { - return kern_mknodat(td, path, pathseg, mode, dev, AT_FDCWD); + return kern_mknodat(td, (const char *)path, pathseg, mode, dev, AT_FDCWD); } int -kern_mknodat(struct thread *td, char *path, enum uio_seg pathseg, int mode, +kern_mknodat(struct thread *td, const char *path, enum uio_seg pathseg, int mode, int dev, int dirfd) { struct vnode *vp, *dir_vn = NULL; @@ -1393,11 +1393,11 @@ int kern_mkfifo(struct thread *td, char *path, enum uio_seg pathseg, int mode) { - return kern_mkfifoat(td, path, pathseg, mode, AT_FDCWD); + return kern_mkfifoat(td, (const char *)path, pathseg, mode, AT_FDCWD); } int -kern_mkfifoat(struct thread *td, char *path, enum uio_seg pathseg, int mode, +kern_mkfifoat(struct thread *td, const char *path, enum uio_seg pathseg, int mode, int dirfd) { struct mount *mp; @@ -1561,12 +1561,13 @@ int kern_link(struct thread *td, char *path, char *link, enum uio_seg segflg) { - return kern_linkat(td, path, link, segflg, AT_FDCWD, AT_FDCWD, FOLLOW); + return kern_linkat(td, (const char *)path, (const char *)link, + segflg, AT_FDCWD, AT_FDCWD, FOLLOW); } int -kern_linkat(struct thread *td, char *path, char *link, enum uio_seg segflg, - int olddirfd, int newdirfd, int follow) +kern_linkat(struct thread *td, const char *path, const char *link, + enum uio_seg segflg, int olddirfd, int newdirfd, int follow) { struct nameidata ndp, ndl; int error; @@ -1683,12 +1684,13 @@ int kern_symlink(struct thread *td, char *path, char *link, enum uio_seg segflg) { - return kern_symlinkat(td, path, link, segflg, AT_FDCWD); + return kern_symlinkat(td, (const char *)path, (const char *)link, + segflg, AT_FDCWD); } int -kern_symlinkat(struct thread *td, char *path, char *link, enum uio_seg segflg, - int dirfd) +kern_symlinkat(struct thread *td, const char *path, const char *link, + enum uio_seg segflg, int dirfd) { struct mount *mp; struct vattr vattr; @@ -1699,7 +1701,7 @@ struct vnode *dir_vn = NULL; if (segflg == UIO_SYSSPACE) { - syspath = path; + syspath = __DECONST(char *, path); } else { syspath = uma_zalloc(namei_zone, M_WAITOK); if ((error = copyinstr(path, syspath, MAXPATHLEN, NULL)) != 0) @@ -1862,11 +1864,11 @@ int kern_unlink(struct thread *td, char *path, enum uio_seg pathseg) { - return kern_unlinkat(td, path, pathseg, AT_FDCWD); + return kern_unlinkat(td, (const char *)path, pathseg, AT_FDCWD); } int -kern_unlinkat(struct thread *td, char *path, enum uio_seg pathseg, int dirfd) +kern_unlinkat(struct thread *td, const char *path, enum uio_seg pathseg, int dirfd) { struct mount *mp; struct vnode *vp, *dir_vn = NULL; @@ -2138,11 +2140,12 @@ int kern_access(struct thread *td, char *path, enum uio_seg pathseg, int flags) { - return kern_accessat(td, path, pathseg, flags, AT_FDCWD); + return kern_accessat(td, (const char *)path, pathseg, flags, AT_FDCWD); } int -kern_accessat(struct thread *td, char *path, enum uio_seg pathseg, int flags, int dirfd) +kern_accessat(struct thread *td, const char *path, enum uio_seg pathseg, + int flags, int dirfd) { int error; struct nameidata nd; @@ -2370,11 +2373,11 @@ int kern_stat(struct thread *td, char *path, enum uio_seg pathseg, struct stat *sbp) { - return kern_statat(td, path, pathseg, sbp, AT_FDCWD); + return kern_statat(td, (const char *)path, pathseg, sbp, AT_FDCWD); } int -kern_statat(struct thread *td, char *path, enum uio_seg pathseg, +kern_statat(struct thread *td, const char *path, enum uio_seg pathseg, struct stat *sbp, int dirfd) { struct nameidata nd; @@ -2439,11 +2442,11 @@ int kern_lstat(struct thread *td, char *path, enum uio_seg pathseg, struct stat *sbp) { - return kern_lstatat(td, path, pathseg, sbp, AT_FDCWD); + return kern_lstatat(td, (const char *)path, pathseg, sbp, AT_FDCWD); } int -kern_lstatat(struct thread *td, char *path, enum uio_seg pathseg, +kern_lstatat(struct thread *td, const char *path, enum uio_seg pathseg, struct stat *sbp, int dirfd) { struct nameidata nd; @@ -2645,12 +2648,13 @@ kern_readlink(struct thread *td, char *path, enum uio_seg pathseg, char *buf, enum uio_seg bufseg, int count) { - return kern_readlinkat(td, path, pathseg, buf, bufseg, count, AT_FDCWD); + return kern_readlinkat(td, (const char *)path, pathseg, buf, bufseg, + count, AT_FDCWD); } int -kern_readlinkat(struct thread *td, char *path, enum uio_seg pathseg, char *buf, - enum uio_seg bufseg, int count, int dirfd) +kern_readlinkat(struct thread *td, const char *path, enum uio_seg pathseg, + char *buf, enum uio_seg bufseg, int count, int dirfd) { struct nameidata nd; struct vnode *dir_vn; @@ -2918,11 +2922,11 @@ int kern_chmod(struct thread *td, char *path, enum uio_seg pathseg, int mode) { - return kern_chmodat(td, path, pathseg, mode, AT_FDCWD); + return kern_chmodat(td, (const char *)path, pathseg, mode, AT_FDCWD); } int -kern_chmodat(struct thread *td, char *path, enum uio_seg pathseg, +kern_chmodat(struct thread *td, const char *path, enum uio_seg pathseg, mode_t mode, int dirfd) { struct nameidata nd; @@ -2971,7 +2975,7 @@ int -kern_lchmodat(struct thread *td, char *path, enum uio_seg pathseg, +kern_lchmodat(struct thread *td, const char *path, enum uio_seg pathseg, mode_t mode, int dirfd) { int error; @@ -3108,11 +3112,11 @@ kern_chown(struct thread *td, char *path, enum uio_seg pathseg, int uid, int gid) { - return kern_chownat(td, path, pathseg, uid, gid, AT_FDCWD); + return kern_chownat(td, (const char *)path, pathseg, uid, gid, AT_FDCWD); } int -kern_chownat(struct thread *td, char *path, enum uio_seg pathseg, int uid, +kern_chownat(struct thread *td, const char *path, enum uio_seg pathseg, int uid, int gid, int dirfd) { struct nameidata nd; @@ -3166,11 +3170,11 @@ kern_lchown(struct thread *td, char *path, enum uio_seg pathseg, int uid, int gid) { - return kern_lchownat(td, path, pathseg, uid, gid, AT_FDCWD); + return kern_lchownat(td, (const char *)path, pathseg, uid, gid, AT_FDCWD); } int -kern_lchownat(struct thread *td, char *path, enum uio_seg pathseg, int uid, +kern_lchownat(struct thread *td, const char *path, enum uio_seg pathseg, int uid, int gid, int dirfd) { struct nameidata nd; @@ -3348,12 +3352,13 @@ kern_utimes(struct thread *td, char *path, enum uio_seg pathseg, struct timeval *tptr, enum uio_seg tptrseg) { - return kern_utimesat(td, path, pathseg, tptr, tptrseg, AT_FDCWD); + return kern_utimesat(td, (const char *)path, pathseg, + (const struct timeval *)tptr, tptrseg, AT_FDCWD); } int -kern_utimesat(struct thread *td, char *path, enum uio_seg pathseg, - struct timeval *tptr, enum uio_seg tptrseg, int dirfd) +kern_utimesat(struct thread *td, const char *path, enum uio_seg pathseg, + const struct timeval *tptr, enum uio_seg tptrseg, int dirfd) { struct nameidata nd; struct vnode *dir_vn; @@ -3744,12 +3749,13 @@ int kern_rename(struct thread *td, char *from, char *to, enum uio_seg pathseg) { - return kern_renameat(td, from, to, pathseg, AT_FDCWD, AT_FDCWD); + return kern_renameat(td, (const char *)from, (const char *)to, pathseg, + AT_FDCWD, AT_FDCWD); } int -kern_renameat(struct thread *td, char *from, char *to, enum uio_seg pathseg, - int fdirfd, int tdirfd) +kern_renameat(struct thread *td, const char *from, const char *to, + enum uio_seg pathseg, int fdirfd, int tdirfd) { struct nameidata fromnd, tond; struct vnode *fdir_vn, *tdir_vn; @@ -3915,11 +3921,12 @@ int kern_mkdir(struct thread *td, char *path, enum uio_seg segflg, int mode) { - return kern_mkdirat(td, path, segflg, mode, AT_FDCWD); + return kern_mkdirat(td, (const char *)path, segflg, mode, AT_FDCWD); } int -kern_mkdirat(struct thread *td, char *path, enum uio_seg segflg, int mode, int dirfd) +kern_mkdirat(struct thread *td, const char *path, enum uio_seg segflg, + int mode, int dirfd) { struct mount *mp; struct vnode *vp, *dir_vn = NULL; @@ -4023,11 +4030,11 @@ int kern_rmdir(struct thread *td, char *path, enum uio_seg pathseg) { - return kern_rmdirat(td, path, pathseg, AT_FDCWD); + return kern_rmdirat(td, (const char *)path, pathseg, AT_FDCWD); } int -kern_rmdirat(struct thread *td, char *path, enum uio_seg pathseg, int dirfd) +kern_rmdirat(struct thread *td, const char *path, enum uio_seg pathseg, int dirfd) { struct mount *mp; struct vnode *vp, *dir_vn = NULL; ==== //depot/projects/soc2007/rdivacky/linux_at/sys/sys/syscall.h#6 (text+ko) ==== ==== //depot/projects/soc2007/rdivacky/linux_at/sys/sys/syscall.mk#6 (text+ko) ==== ==== //depot/projects/soc2007/rdivacky/linux_at/sys/sys/syscallsubr.h#14 (text+ko) ==== @@ -56,24 +56,24 @@ socklen_t *namelen, struct file **fp); int kern_access(struct thread *td, char *path, enum uio_seg pathseg, int flags); -int kern_accessat(struct thread *td, char *path, enum uio_seg pathseg, +int kern_accessat(struct thread *td, const char *path, enum uio_seg pathseg, int flags, int dirfd); int kern_adjtime(struct thread *td, struct timeval *delta, struct timeval *olddelta); -int kern_alternate_path(struct thread *td, const char *prefix, char *path, +int kern_alternate_path(struct thread *td, const char *prefix, const char *path, enum uio_seg pathseg, char **pathbuf, int create, int dirfd); int kern_bind(struct thread *td, int fd, struct sockaddr *sa); int kern_chdir(struct thread *td, char *path, enum uio_seg pathseg); int kern_chmod(struct thread *td, char *path, enum uio_seg pathseg, int mode); -int kern_chmodat(struct thread *td, char *path, enum uio_seg pathseg, +int kern_chmodat(struct thread *td, const char *path, enum uio_seg pathseg, mode_t mode, int dirfd); int kern_chown(struct thread *td, char *path, enum uio_seg pathseg, int uid, int gid); -int kern_lchmodat(struct thread *td, char *path, enum uio_seg pathseg, +int kern_chownat(struct thread *td, const char *path, enum uio_seg pathseg, int uid, + int gid, int dirfd); +int kern_lchmodat(struct thread *td, const char *path, enum uio_seg pathseg, mode_t mode, int dirfd); -int kern_chownat(struct thread *td, char *path, enum uio_seg pathseg, int uid, - int gid, int dirfd); int kern_clock_getres(struct thread *td, clockid_t clock_id, struct timespec *ts); int kern_clock_gettime(struct thread *td, clockid_t clock_id, @@ -110,29 +110,29 @@ int kern_kldunload(struct thread *td, int fileid, int flags); int kern_lchown(struct thread *td, char *path, enum uio_seg pathseg, int uid, int gid); -int kern_lchownat(struct thread *td, char *path, enum uio_seg pathseg, +int kern_lchownat(struct thread *td, const char *path, enum uio_seg pathseg, int uid, int gid, int dirfd); int kern_link(struct thread *td, char *path, char *link, enum uio_seg segflg); -int kern_linkat(struct thread *td, char *path, char *link, +int kern_linkat(struct thread *td, const char *path, const char *link, enum uio_seg segflg, int olddfd, int newdfd, int follow); int kern_lstat(struct thread *td, char *path, enum uio_seg pathseg, struct stat *sbp); -int kern_lstatat(struct thread *td, char *path, enum uio_seg pathseg, +int kern_lstatat(struct thread *td, const char *path, enum uio_seg pathseg, struct stat *sbp, int dfd); int kern_lutimes(struct thread *td, char *path, enum uio_seg pathseg, struct timeval *tptr, enum uio_seg tptrseg); int kern_mkdir(struct thread *td, char *path, enum uio_seg segflg, int mode); -int kern_mkdirat(struct thread *td, char *path, enum uio_seg segflg, +int kern_mkdirat(struct thread *td, const char *path, enum uio_seg segflg, int mode, int dirfd); int kern_mkfifo(struct thread *td, char *path, enum uio_seg pathseg, int mode); -int kern_mkfifoat(struct thread *td, char *path, enum uio_seg pathseg, +int kern_mkfifoat(struct thread *td, const char *path, enum uio_seg pathseg, int mode, int dirfd); int kern_mknod(struct thread *td, char *path, enum uio_seg pathseg, int mode, int dev); -int kern_mknodat(struct thread *td, char *path, enum uio_seg pathseg, +int kern_mknodat(struct thread *td, const char *path, enum uio_seg pathseg, int mode, int dev, int dirfd); int kern_msgctl(struct thread *, int, int, struct msqid_ds *); int kern_msgsnd(struct thread *, int, const void *, size_t, int, long); @@ -141,7 +141,7 @@ struct timespec *rmt); int kern_open(struct thread *td, char *path, enum uio_seg pathseg, int flags, int mode); -int kern_openat(struct thread *td, char *path, enum uio_seg pathseg, +int kern_openat(struct thread *td, const char *path, enum uio_seg pathseg, int flags, int mode, int dirfd); int kern_pathconf(struct thread *td, char *path, enum uio_seg pathseg, int name); @@ -151,17 +151,17 @@ int kern_pwritev(struct thread *td, int fd, struct uio *auio, off_t offset); int kern_readlink(struct thread *td, char *path, enum uio_seg pathseg, char *buf, enum uio_seg bufseg, int count); -int kern_readlinkat(struct thread *td, char *path, enum uio_seg pathseg, +int kern_readlinkat(struct thread *td, const char *path, enum uio_seg pathseg, char *buf, enum uio_seg bufseg, int count, int dirfd); int kern_readv(struct thread *td, int fd, struct uio *auio); int kern_recvit(struct thread *td, int s, struct msghdr *mp, enum uio_seg fromseg, struct mbuf **controlp); int kern_rename(struct thread *td, char *from, char *to, enum uio_seg pathseg); -int kern_renameat(struct thread *td, char *from, char *to, +int kern_renameat(struct thread *td, const char *from, const char *to, enum uio_seg pathseg, int fdirfd, int tdirfd); int kern_rmdir(struct thread *td, char *path, enum uio_seg pathseg); -int kern_rmdirat(struct thread *td, char *path, enum uio_seg pathseg, int dirfd); +int kern_rmdirat(struct thread *td, const char *path, enum uio_seg pathseg, int dirfd); int kern_sched_rr_get_interval(struct thread *td, pid_t pid, struct timespec *ts); int kern_semctl(struct thread *td, int semid, int semnum, int cmd, @@ -192,24 +192,24 @@ int kern_sigsuspend(struct thread *td, sigset_t mask); int kern_stat(struct thread *td, char *path, enum uio_seg pathseg, struct stat *sbp); -int kern_statat(struct thread *td, char *path, enum uio_seg pathseg, +int kern_statat(struct thread *td, const char *path, enum uio_seg pathseg, struct stat *sbp, int dfd); int kern_statfs(struct thread *td, char *path, enum uio_seg pathseg, struct statfs *buf); int kern_symlink(struct thread *td, char *path, char *link, enum uio_seg segflg); -int kern_symlinkat(struct thread *td, char *path, char *link, +int kern_symlinkat(struct thread *td, const char *path, const char *link, enum uio_seg segflg, int dirfd); int kern_thr_new(struct thread *td, struct thr_param *param); int kern_thr_suspend(struct thread *td, struct timespec *tsp); int kern_truncate(struct thread *td, char *path, enum uio_seg pathseg, off_t length); int kern_unlink(struct thread *td, char *path, enum uio_seg pathseg); -int kern_unlinkat(struct thread *td, char *path, enum uio_seg pathseg, int dirfd); +int kern_unlinkat(struct thread *td, const char *path, enum uio_seg pathseg, int dirfd); int kern_utimes(struct thread *td, char *path, enum uio_seg pathseg, struct timeval *tptr, enum uio_seg tptrseg); -int kern_utimesat(struct thread *td, char *path, enum uio_seg pathseg, - struct timeval *tptr, enum uio_seg tptrseg, int dirfd); +int kern_utimesat(struct thread *td, const char *path, enum uio_seg pathseg, + const struct timeval *tptr, enum uio_seg tptrseg, int dirfd); int kern_wait(struct thread *td, pid_t pid, int *status, int options, struct rusage *rup); int kern_writev(struct thread *td, int fd, struct uio *auio); ==== //depot/projects/soc2007/rdivacky/linux_at/sys/sys/sysproto.h#6 (text+ko) ==== @@ -1484,19 +1484,19 @@ }; struct faccessat_args { char dirfd_l_[PADL_(int)]; int dirfd; char dirfd_r_[PADR_(int)]; - char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; + char path_l_[PADL_(const char *)]; const char * path; char path_r_[PADR_(const char *)]; char mode_l_[PADL_(int)]; int mode; char mode_r_[PADR_(int)]; char flag_l_[PADL_(int)]; int flag; char flag_r_[PADR_(int)]; }; struct fchmodat_args { char dirfd_l_[PADL_(int)]; int dirfd; char dirfd_r_[PADR_(int)]; - char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; + char path_l_[PADL_(const char *)]; const char * path; char path_r_[PADR_(const char *)]; char mode_l_[PADL_(mode_t)]; mode_t mode; char mode_r_[PADR_(mode_t)]; char flag_l_[PADL_(int)]; int flag; char flag_r_[PADR_(int)]; }; struct fchownat_args { char dirfd_l_[PADL_(int)]; int dirfd; char dirfd_r_[PADR_(int)]; - char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; + char path_l_[PADL_(const char *)]; const char * path; char path_r_[PADR_(const char *)]; char uid_l_[PADL_(uid_t)]; uid_t uid; char uid_r_[PADR_(uid_t)]; char gid_l_[PADL_(gid_t)]; gid_t gid; char gid_r_[PADR_(gid_t)]; char flag_l_[PADL_(int)]; int flag; char flag_r_[PADR_(int)]; @@ -1508,64 +1508,64 @@ }; struct fstatat_args { char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)]; - char path_l_[PADL_(char *)]; char * path; char path_r_[PADR_(char *)]; + char path_l_[PADL_(const char *)]; const char * path; char path_r_[PADR_(const char *)]; char buf_l_[PADL_(struct stat *)]; struct stat * buf; char buf_r_[PADR_(struct stat *)]; char flag_l_[PADL_(int)]; int flag; char flag_r_[PADR_(int)]; }; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jun 28 09:07:40 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5BD4316A475; Thu, 28 Jun 2007 09:07:40 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3935716A41F for ; Thu, 28 Jun 2007 09:07:40 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 1103413C4AD for ; Thu, 28 Jun 2007 09:07:40 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5S97duw028772 for ; Thu, 28 Jun 2007 09:07:39 GMT (envelope-from zhouzhouyi@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5S97ddk028768 for perforce@freebsd.org; Thu, 28 Jun 2007 09:07:39 GMT (envelope-from zhouzhouyi@FreeBSD.org) Date: Thu, 28 Jun 2007 09:07:39 GMT Message-Id: <200706280907.l5S97ddk028768@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zhouzhouyi@FreeBSD.org using -f From: Zhouyi ZHOU To: Perforce Change Reviews Cc: Subject: PERFORCE change 122465 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Jun 2007 09:07:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=122465 Change 122465 by zhouzhouyi@zhouzhouyi_mactest on 2007/06/28 09:07:38 Modify mactest.c so that matching rule can be more freely specified, for example "mls/low(low-high),biba/high(low-high)" can match "biba/high(low-high),mls/low(low-high)" Affected files ... .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/mactest.c#4 edit Differences ... ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/mactest.c#4 (text+ko) ==== @@ -517,38 +517,86 @@ return (i); } -static volatile int waitforsig = 1; + -static void sig_usr(int signo){ - waitforsig = 0; -} +/* compare modes_or_flags from mactest.conf and from /var/log/mactest, should be exact match + * and order appears in the sequence is irrelevance */ +static int modes_or_flags_compare(struct modes_or_flags * mf_conf, struct modes_or_flags *mf_log) +{ + struct modes_or_flags * tmp, *tmp1; -int modes_or_flags_compare(struct modes_or_flags * mf1, struct modes_or_flags *mf2){ - while (mf1) { - if (!mf2) + tmp = mf_conf; + while (tmp) { + tmp1 = mf_log; + if (!tmp1) + return 1; + while(tmp1) { + if (!strcmp(tmp->modflagname, tmp1->modflagname)) + break; + tmp1 = tmp1->next; + } + if (!tmp1) + return 1; + tmp = tmp->next; + } + + tmp = mf_log; + while (tmp) { + tmp1 = mf_conf; + if (!tmp1) + return 1; + while(tmp1) { + if (!strcmp(tmp->modflagname, tmp1->modflagname)) + break; + tmp1 = tmp1->next; + } + if (!tmp1) return 1; - if (strcmp(mf1->modflagname, mf2->modflagname)) + tmp = tmp->next; + } + + return 0; +} + +/* compare labelstrings from mactest.conf and from /var/log/mactest, should be exact match + * and order of the modules appears in a label is irrelevance */ +static label_compare(char *conf, char *log) +{ + + char *element_data, *element_data1, *element_data2, *tmp, *conf1, *tmp2; + if (!strcmp(conf, "*")) + return 0; + tmp2 = conf1 = strdup(conf); + while ((element_data = strsep(&conf1, ",")) != NULL) { + tmp = element_data1 = strdup(log); + while ((element_data2 = strsep(&element_data1, ",")) != NULL){ + if (!strcmp(element_data2, element_data)) + break; + } + if (element_data2 == NULL){ + free(tmp); + free(tmp2); return 1; - mf1 = mf1->next; - mf2 = mf2->next; + }else + free(tmp); } - if (mf2) - return 1; + free(tmp2); return 0; } +static int labelstrings_compare(struct labelstrings *ls_conf, struct labelstrings *ls_log) +{ -int labelstrings_compare(struct labelstrings *ls1, struct labelstrings *ls2){ - while (ls1) { - if (!ls2) + while (ls_conf) { + if (!ls_log) return 1; - if (strcmp(ls1->labelstring, ls2->labelstring)) + if (label_compare(ls_conf->labelstring, ls_log->labelstring)) return 1; - ls1 = ls1->next; - ls2 = ls2->next; + ls_conf = ls_conf->next; + ls_log = ls_log->next; } - if (ls2) + if (ls_log) return 1; return 0; } From owner-p4-projects@FreeBSD.ORG Thu Jun 28 10:40:37 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8508216A475; Thu, 28 Jun 2007 10:40:37 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5584116A474 for ; Thu, 28 Jun 2007 10:40:37 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 43EB813C483 for ; Thu, 28 Jun 2007 10:40:37 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5SAebHs036696 for ; Thu, 28 Jun 2007 10:40:37 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5SAeaCi036693 for perforce@freebsd.org; Thu, 28 Jun 2007 10:40:36 GMT (envelope-from rdivacky@FreeBSD.org) Date: Thu, 28 Jun 2007 10:40:36 GMT Message-Id: <200706281040.l5SAeaCi036693@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 122468 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Jun 2007 10:40:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=122468 Change 122468 by rdivacky@rdivacky_witten on 2007/06/28 10:40:19 Change names/positions of params to match the POSIX. Suggested by: rwatson Affected files ... .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_file.c#15 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_misc.c#5 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_stats.c#9 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/init_sysent.c#7 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/syscalls.c#7 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/syscalls.master#7 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/systrace_args.c#7 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#34 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/syscall.h#7 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/syscall.mk#7 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/syscallsubr.h#15 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/sys/sysproto.h#7 edit Differences ... ==== //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_file.c#15 (text+ko) ==== @@ -89,7 +89,7 @@ static int -linux_common_open(struct thread *td, char *path, int l_flags, int mode, int dirfd) +linux_common_open(struct thread *td, int dirfd, char *path, int l_flags, int mode) { struct proc *p = td->td_proc; struct file *fp; @@ -132,7 +132,7 @@ /* XXX LINUX_O_NOATIME: unable to be easily implemented. */ if (dirfd != -1) - error = kern_openat(td, path, UIO_SYSSPACE, bsd_flags, mode, dirfd); + error = kern_openat(td, dirfd, path, UIO_SYSSPACE, bsd_flags, mode); else error = kern_open(td, path, UIO_SYSSPACE, bsd_flags, mode); if (!error) { @@ -202,7 +202,7 @@ path, args->flags, args->mode); #endif - return linux_common_open(td, path, args->flags, args->mode, dfd); + return linux_common_open(td, dfd, path, args->flags, args->mode); } int @@ -221,7 +221,7 @@ path, args->flags, args->mode); #endif - return linux_common_open(td, path, args->flags, args->mode, -1); + return linux_common_open(td, -1, path, args->flags, args->mode); } int @@ -592,7 +592,7 @@ printf(ARGS(access, "%s, %d"), path, args->mode); #endif - error = kern_accessat(td, path, UIO_SYSSPACE, args->mode, dfd); + error = kern_accessat(td, dfd, path, UIO_SYSSPACE, args->mode); LFREEPATH(path); return (error); @@ -645,12 +645,12 @@ #endif if (args->flag & LINUX_AT_REMOVEDIR) - error = kern_rmdirat(td, path, UIO_SYSSPACE, dfd); + error = kern_rmdirat(td, dfd, path, UIO_SYSSPACE); else - error = kern_unlinkat(td, path, UIO_SYSSPACE, dfd); + error = kern_unlinkat(td, dfd, path, UIO_SYSSPACE); if (error == EPERM) /* Introduce POSIX noncompliant behaviour of Linux */ - if (kern_statat(td, path, UIO_SYSSPACE, &st, dfd) == 0) + if (kern_statat(td, dfd, path, UIO_SYSSPACE, &st) == 0) if (S_ISDIR(st.st_mode)) error = EISDIR; LFREEPATH(path); @@ -708,7 +708,7 @@ printf(ARGS(fchmodat, "%s, %d"), path, args->mode); #endif - error = kern_chmodat(td, path, UIO_SYSSPACE, args->mode, dfd); + error = kern_chmodat(td, dfd, path, UIO_SYSSPACE, args->mode); LFREEPATH(path); return (error); } @@ -747,7 +747,7 @@ if (ldebug(mkdirat)) printf(ARGS(mkdirat, "%s, %d"), path, args->mode); #endif - error = kern_mkdirat(td, path, UIO_SYSSPACE, args->mode, dfd); + error = kern_mkdirat(td, dfd, path, UIO_SYSSPACE, args->mode); LFREEPATH(path); return (error); } @@ -821,7 +821,7 @@ if (ldebug(renameat)) printf(ARGS(renameat, "%s, %s"), from, to); #endif - error = kern_renameat(td, from, to, UIO_SYSSPACE, olddfd, newdfd); + error = kern_renameat(td, olddfd, newdfd, from, to, UIO_SYSSPACE); LFREEPATH(from); LFREEPATH(to); return (error); @@ -875,7 +875,7 @@ printf(ARGS(symlinkat, "%s, %s"), path, to); #endif - error = kern_symlinkat(td, path, to, UIO_SYSSPACE, dfd); + error = kern_symlinkat(td, dfd, path, to, UIO_SYSSPACE); LFREEPATH(path); LFREEPATH(to); return (error); @@ -919,8 +919,8 @@ args->bufsiz); #endif - error = kern_readlinkat(td, name, UIO_SYSSPACE, args->buf, UIO_USERSPACE, - args->bufsiz, dfd); + error = kern_readlinkat(td, dfd, name, UIO_SYSSPACE, args->buf, + UIO_USERSPACE, args->bufsiz); LFREEPATH(name); return (error); } @@ -1018,7 +1018,7 @@ args->newdfd, to, args->flags); #endif - error = kern_linkat(td, path, to, UIO_SYSSPACE, olddfd, newdfd, FOLLOW); + error = kern_linkat(td, olddfd, newdfd, path, to, UIO_SYSSPACE, FOLLOW); LFREEPATH(path); LFREEPATH(to); return (error); @@ -1511,9 +1511,9 @@ #endif if (args->flag & LINUX_AT_SYMLINK_NOFOLLOW) - error = kern_lchownat(td, path, UIO_SYSSPACE, args->uid, args->gid, dfd); + error = kern_lchownat(td, dfd, path, UIO_SYSSPACE, args->uid, args->gid); else - error = kern_chownat(td, path, UIO_SYSSPACE, args->uid, args->gid, dfd); + error = kern_chownat(td, dfd, path, UIO_SYSSPACE, args->uid, args->gid); LFREEPATH(path); return (error); } ==== //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_misc.c#5 (text+ko) ==== @@ -854,7 +854,7 @@ tvp = tv; } - error = kern_utimesat(td, fname, UIO_SYSSPACE, tvp, UIO_SYSSPACE, dfd); + error = kern_utimesat(td, dfd, fname, UIO_SYSSPACE, tvp, UIO_SYSSPACE); LFREEPATH(fname); return (error); } ==== //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_stats.c#9 (text+ko) ==== @@ -144,7 +144,7 @@ if (!S_ISCHR(buf->st_mode) && !S_ISBLK(buf->st_mode)) return; temp = td->td_retval[0]; - if (kern_openat(td, path, UIO_SYSSPACE, O_RDONLY, 0, dfd) != 0) + if (kern_openat(td, dfd, path, UIO_SYSSPACE, O_RDONLY, 0) != 0) return; fd = td->td_retval[0]; td->td_retval[0] = temp; @@ -621,9 +621,9 @@ #endif if (args->flag & LINUX_AT_SYMLINK_NOFOLLOW) - error = kern_lstatat(td, path, UIO_SYSSPACE, &buf, dfd); + error = kern_lstatat(td, dfd, path, UIO_SYSSPACE, &buf); else - error = kern_statat(td, path, UIO_SYSSPACE, &buf, dfd); + error = kern_statat(td, dfd, path, UIO_SYSSPACE, &buf); translate_path_major_minor_at(td, args->pathname, &buf, dfd); if (!error) ==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/init_sysent.c#7 (text+ko) ==== ==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/syscalls.c#7 (text+ko) ==== ==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/syscalls.master#7 (text+ko) ==== @@ -835,9 +835,9 @@ 474 AUE_NULL STD { int sctp_generic_recvmsg(int sd, struct iovec *iov, int iovlen, \ struct sockaddr * from, __socklen_t *fromlenaddr, \ struct sctp_sndrcvinfo *sinfo, int *msg_flags); } -475 AUE_ACCESS STD { int faccessat(int dirfd, const char *path, int mode, int flag); } -476 AUE_CHMOD STD { int fchmodat(int dirfd, const char *path, mode_t mode, int flag); } -477 AUE_CHOWN STD { int fchownat(int dirfd, const char *path, uid_t uid, gid_t gid, int flag); } +475 AUE_ACCESS STD { int faccessat(int fd, const char *path, int mode, int flag); } +476 AUE_CHMOD STD { int fchmodat(int fd, const char *path, mode_t mode, int flag); } +477 AUE_CHOWN STD { int fchownat(int fd, const char *path, uid_t uid, gid_t gid, int flag); } 478 AUE_EXECVE STD { int fexecve(int fd, char **argv, char **envv); } 479 AUE_STAT STD { int fstatat(int fd, const char *path, struct stat *buf, int flag); } 480 AUE_UTIMES STD { int futimesat(int fd, const char *path, const struct timeval *times); } ==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/systrace_args.c#7 (text+ko) ==== @@ -2808,7 +2808,7 @@ /* faccessat */ case 475: { struct faccessat_args *p = params; - iarg[0] = p->dirfd; /* int */ + iarg[0] = p->fd; /* int */ uarg[1] = (intptr_t) p->path; /* const char * */ iarg[2] = p->mode; /* int */ iarg[3] = p->flag; /* int */ @@ -2818,7 +2818,7 @@ /* fchmodat */ case 476: { struct fchmodat_args *p = params; - iarg[0] = p->dirfd; /* int */ + iarg[0] = p->fd; /* int */ uarg[1] = (intptr_t) p->path; /* const char * */ iarg[2] = p->mode; /* mode_t */ iarg[3] = p->flag; /* int */ @@ -2828,7 +2828,7 @@ /* fchownat */ case 477: { struct fchownat_args *p = params; - iarg[0] = p->dirfd; /* int */ + iarg[0] = p->fd; /* int */ uarg[1] = (intptr_t) p->path; /* const char * */ uarg[2] = p->uid; /* uid_t */ iarg[3] = p->gid; /* gid_t */ ==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#34 (text+ko) ==== @@ -966,15 +966,15 @@ int openat(struct thread *td, struct openat_args *args) { - return kern_openat(td, args->path, UIO_USERSPACE, args->flag, - args->mode, args->fd); + return kern_openat(td, args->fd, args->path, UIO_USERSPACE, + args->flag, args->mode); } int kern_open(struct thread *td, char *path, enum uio_seg pathseg, int flags, int mode) { - return kern_openat(td, (const char *)path, pathseg, flags, mode, AT_FDCWD); + return kern_openat(td, AT_FDCWD, (const char *)path, pathseg, flags, mode); } static int @@ -1017,8 +1017,8 @@ } int -kern_openat(struct thread *td, const char *path, enum uio_seg pathseg, int flags, - int mode, int dirfd) +kern_openat(struct thread *td, int fd, const char *path, enum uio_seg pathseg, + int flags, int mode) { struct nameidata nd; struct vnode *dir_vn; @@ -1038,7 +1038,7 @@ AUDIT_ARG(mode, mode); /* XXX: audit dirfd */ - error = kern_get_at(td, dirfd, &dir_vn); + error = kern_get_at(td, fd, &dir_vn); if (error && !kern_absolute_path(path, pathseg)) return (error); @@ -1225,20 +1225,20 @@ int mknodat(struct thread *td, struct mknodat_args *args) { - return kern_mknodat(td, args->path, UIO_USERSPACE, args->mode, - args->dev, args->fd); + return kern_mknodat(td, args->fd, args->path, UIO_USERSPACE, args->mode, + args->dev); } int kern_mknod(struct thread *td, char *path, enum uio_seg pathseg, int mode, int dev) { - return kern_mknodat(td, (const char *)path, pathseg, mode, dev, AT_FDCWD); + return kern_mknodat(td, AT_FDCWD, (const char *)path, pathseg, mode, dev); } int -kern_mknodat(struct thread *td, const char *path, enum uio_seg pathseg, int mode, - int dev, int dirfd) +kern_mknodat(struct thread *td, int fd, const char *path, enum uio_seg pathseg, + int mode, int dev) { struct vnode *vp, *dir_vn = NULL; struct mount *mp; @@ -1270,7 +1270,7 @@ restart: if (dir_vn) vrele(dir_vn); - error = kern_get_at(td, dirfd, &dir_vn); + error = kern_get_at(td, fd, &dir_vn); if (error && !kern_absolute_path(path, pathseg)) return (error); bwillwrite(); @@ -1387,18 +1387,18 @@ int mkfifoat(struct thread *td, struct mkfifoat_args *args) { - return kern_mkfifoat(td, args->path, UIO_USERSPACE, args->mode, args->fd); + return kern_mkfifoat(td, args->fd, args->path, UIO_USERSPACE, args->mode); } int kern_mkfifo(struct thread *td, char *path, enum uio_seg pathseg, int mode) { - return kern_mkfifoat(td, (const char *)path, pathseg, mode, AT_FDCWD); + return kern_mkfifoat(td, AT_FDCWD, (const char *)path, pathseg, mode); } int -kern_mkfifoat(struct thread *td, const char *path, enum uio_seg pathseg, int mode, - int dirfd) +kern_mkfifoat(struct thread *td, int fd, const char *path, enum uio_seg pathseg, + int mode) { struct mount *mp; struct vattr vattr; @@ -1411,7 +1411,7 @@ restart: if (dir_vn) vrele(dir_vn); - error = kern_get_at(td, dirfd, &dir_vn); + error = kern_get_at(td, fd, &dir_vn); if (error && !kern_absolute_path(path, pathseg)) return (error); bwillwrite(); @@ -1512,11 +1512,11 @@ return (EINVAL); if (args->flag & AT_SYMLINK_FOLLOW) - return kern_linkat(td, args->path1, args->path2, - UIO_USERSPACE, args->fd1, args->fd2, FOLLOW); + return kern_linkat(td, args->fd1, args->fd2, args->path1, + args->path2, UIO_USERSPACE, FOLLOW); else - return kern_linkat(td, args->path1, args->path2, - UIO_USERSPACE, args->fd1, args->fd2, 0); + return kern_linkat(td, args->fd1, args->fd2, args->path1, + args->path2, UIO_USERSPACE, 0); } static int hardlink_check_uid = 0; @@ -1561,13 +1561,13 @@ int kern_link(struct thread *td, char *path, char *link, enum uio_seg segflg) { - return kern_linkat(td, (const char *)path, (const char *)link, - segflg, AT_FDCWD, AT_FDCWD, FOLLOW); + return kern_linkat(td, AT_FDCWD, AT_FDCWD, (const char *)path, + (const char *)link, segflg, FOLLOW); } int -kern_linkat(struct thread *td, const char *path, const char *link, - enum uio_seg segflg, int olddirfd, int newdirfd, int follow) +kern_linkat(struct thread *td, int fd1, int fd2, const char *path1, const char *path2, + enum uio_seg segflg, int follow) { struct nameidata ndp, ndl; int error; @@ -1577,19 +1577,19 @@ int vfslocked; int lvfslocked; - error = kern_get_at(td, olddirfd, &pdir_vn); - if (error && !kern_absolute_path(path, segflg)) + error = kern_get_at(td, fd1, &pdir_vn); + if (error && !kern_absolute_path(path1, segflg)) return (error); NDINIT_AT(&ndp, LOOKUP, ((error) ? ATBADF : 0) | follow | MPSAFE | - AUDITVNODE1, segflg, path, td, pdir_vn); + AUDITVNODE1, segflg, path1, td, pdir_vn); - error = kern_get_at(td, newdirfd, &ldir_vn); - if (error && !kern_absolute_path(link, segflg)) + error = kern_get_at(td, fd2, &ldir_vn); + if (error && !kern_absolute_path(path2, segflg)) return (error); NDINIT_AT(&ndl, CREATE, ((error) ? ATBADF : 0) | LOCKPARENT | - SAVENAME | MPSAFE | AUDITVNODE1, segflg, link, td, ldir_vn); + SAVENAME | MPSAFE | AUDITVNODE1, segflg, path2, td, ldir_vn); bwillwrite(); if ((error = namei(&ndp)) != 0) @@ -1678,19 +1678,19 @@ int symlinkat(struct thread *td, struct symlinkat_args *args) { - return kern_symlinkat(td, args->path1, args->path2, UIO_USERSPACE, args->fd); + return kern_symlinkat(td, args->path1, args->fd, args->path2, UIO_USERSPACE); } int kern_symlink(struct thread *td, char *path, char *link, enum uio_seg segflg) { - return kern_symlinkat(td, (const char *)path, (const char *)link, - segflg, AT_FDCWD); + return kern_symlinkat(td, (const char *)path, AT_FDCWD, (const char *)link, + segflg); } int -kern_symlinkat(struct thread *td, const char *path, const char *link, - enum uio_seg segflg, int dirfd) +kern_symlinkat(struct thread *td, const char *path1, int fd, const char *path2, + enum uio_seg segflg) { struct mount *mp; struct vattr vattr; @@ -1701,22 +1701,22 @@ struct vnode *dir_vn = NULL; if (segflg == UIO_SYSSPACE) { - syspath = __DECONST(char *, path); + syspath = __DECONST(char *, path1); } else { syspath = uma_zalloc(namei_zone, M_WAITOK); - if ((error = copyinstr(path, syspath, MAXPATHLEN, NULL)) != 0) + if ((error = copyinstr(path1, syspath, MAXPATHLEN, NULL)) != 0) goto out; } AUDIT_ARG(text, syspath); restart: if (dir_vn) vrele(dir_vn); - error = kern_get_at(td, dirfd, &dir_vn); - if (error && !kern_absolute_path(link, segflg)) + error = kern_get_at(td, fd, &dir_vn); + if (error && !kern_absolute_path(path2, segflg)) return (error); bwillwrite(); NDINIT_AT(&nd, CREATE, ((error) ? ATBADF : 0) | LOCKPARENT | - SAVENAME | MPSAFE | AUDITVNODE1, segflg, link, td, dir_vn); + SAVENAME | MPSAFE | AUDITVNODE1, segflg, path2, td, dir_vn); if ((error = namei(&nd)) != 0) goto out; vfslocked = NDHASGIANT(&nd); @@ -1856,19 +1856,19 @@ return (EINVAL); if (args->flag & AT_REMOVEDIR) - return kern_rmdirat(td, args->path, UIO_USERSPACE, args->fd); + return kern_rmdirat(td, args->fd, args->path, UIO_USERSPACE); else - return kern_unlinkat(td, args->path, UIO_USERSPACE, args->fd); + return kern_unlinkat(td, args->fd, args->path, UIO_USERSPACE); } int kern_unlink(struct thread *td, char *path, enum uio_seg pathseg) { - return kern_unlinkat(td, (const char *)path, pathseg, AT_FDCWD); + return kern_unlinkat(td, AT_FDCWD, (const char *)path, pathseg); } int -kern_unlinkat(struct thread *td, const char *path, enum uio_seg pathseg, int dirfd) +kern_unlinkat(struct thread *td, int fd, const char *path, enum uio_seg pathseg) { struct mount *mp; struct vnode *vp, *dir_vn = NULL; @@ -1879,7 +1879,7 @@ restart: if (dir_vn) vrele(dir_vn); - error = kern_get_at(td, dirfd, &dir_vn); + error = kern_get_at(td, fd, &dir_vn); if (error && !kern_absolute_path(path, pathseg)) return (error); bwillwrite(); @@ -2134,18 +2134,18 @@ if (args->flag & ~AT_EACCESS) return (EINVAL); /* XXX: what about mode? */ - return kern_accessat(td, args->path, UIO_USERSPACE, args->flag, args->dirfd); + return kern_accessat(td, args->fd, args->path, UIO_USERSPACE, args->flag); } int kern_access(struct thread *td, char *path, enum uio_seg pathseg, int flags) { - return kern_accessat(td, (const char *)path, pathseg, flags, AT_FDCWD); + return kern_accessat(td, AT_FDCWD, (const char *)path, pathseg, flags); } int -kern_accessat(struct thread *td, const char *path, enum uio_seg pathseg, - int flags, int dirfd) +kern_accessat(struct thread *td, int fd, const char *path, enum uio_seg pathseg, + int flags) { int error; struct nameidata nd; @@ -2154,7 +2154,7 @@ struct vnode *vp; int vfslocked; - error = kern_get_at(td, dirfd, &dir_vn); + error = kern_get_at(td, fd, &dir_vn); if (error && !kern_absolute_path(path, pathseg)) return (error); @@ -2365,27 +2365,27 @@ return (EINVAL); if (args->flag & AT_SYMLINK_NOFOLLOW) - return kern_lstatat(td, args->path, UIO_USERSPACE, args->buf, args->fd); + return kern_lstatat(td, args->fd, args->path, UIO_USERSPACE, args->buf); else - return kern_statat(td, args->path, UIO_USERSPACE, args->buf, args->fd); + return kern_statat(td, args->fd, args->path, UIO_USERSPACE, args->buf); } int kern_stat(struct thread *td, char *path, enum uio_seg pathseg, struct stat *sbp) { - return kern_statat(td, (const char *)path, pathseg, sbp, AT_FDCWD); + return kern_statat(td, AT_FDCWD, (const char *)path, pathseg, sbp); } int -kern_statat(struct thread *td, const char *path, enum uio_seg pathseg, - struct stat *sbp, int dirfd) +kern_statat(struct thread *td, int fd, const char *path, enum uio_seg pathseg, + struct stat *sbp) { struct nameidata nd; struct vnode *dir_vn; struct stat sb; int error, vfslocked; - error = kern_get_at(td, dirfd, &dir_vn); + error = kern_get_at(td, fd, &dir_vn); if (error && !kern_absolute_path(path, pathseg)) return (error); @@ -2442,12 +2442,12 @@ int kern_lstat(struct thread *td, char *path, enum uio_seg pathseg, struct stat *sbp) { - return kern_lstatat(td, (const char *)path, pathseg, sbp, AT_FDCWD); + return kern_lstatat(td, AT_FDCWD, (const char *)path, pathseg, sbp); } int -kern_lstatat(struct thread *td, const char *path, enum uio_seg pathseg, - struct stat *sbp, int dirfd) +kern_lstatat(struct thread *td, int fd, const char *path, enum uio_seg pathseg, + struct stat *sbp) { struct nameidata nd; struct vnode *dir_vn; @@ -2455,7 +2455,7 @@ struct stat sb; int error, vfslocked; - error = kern_get_at(td, dirfd, &dir_vn); + error = kern_get_at(td, fd, &dir_vn); if (error && !kern_absolute_path(path, pathseg)) return (error); @@ -2640,21 +2640,21 @@ ssize_t readlinkat(struct thread *td, struct readlinkat_args *args) { - return kern_readlinkat(td, args->path, UIO_USERSPACE, - args->buf, UIO_USERSPACE, args->bufsize, args->fd); + return kern_readlinkat(td, args->fd, args->path, UIO_USERSPACE, + args->buf, UIO_USERSPACE, args->bufsize); } int kern_readlink(struct thread *td, char *path, enum uio_seg pathseg, char *buf, enum uio_seg bufseg, int count) { - return kern_readlinkat(td, (const char *)path, pathseg, buf, bufseg, - count, AT_FDCWD); + return kern_readlinkat(td, AT_FDCWD, (const char *)path, pathseg, buf, + bufseg, count); } int -kern_readlinkat(struct thread *td, const char *path, enum uio_seg pathseg, - char *buf, enum uio_seg bufseg, int count, int dirfd) +kern_readlinkat(struct thread *td, int fd, const char *path, enum uio_seg pathseg, + char *buf, enum uio_seg bufseg, int count) { struct nameidata nd; struct vnode *dir_vn; @@ -2663,7 +2663,7 @@ struct uio auio; int error, vfslocked; - error = kern_get_at(td, dirfd, &dir_vn); + error = kern_get_at(td, fd, &dir_vn); if (error && !kern_absolute_path(path, pathseg)) return (error); @@ -2912,28 +2912,28 @@ return (EINVAL); if (args->flag & AT_SYMLINK_NOFOLLOW) - return kern_lchmodat(td, args->path, UIO_USERSPACE, - args->mode, args->dirfd); + return kern_lchmodat(td, args->fd, args->path, UIO_USERSPACE, + args->mode); else - return kern_chmodat(td, args->path, UIO_USERSPACE, - args->mode, args->dirfd); + return kern_chmodat(td, args->fd, args->path, UIO_USERSPACE, + args->mode); } int kern_chmod(struct thread *td, char *path, enum uio_seg pathseg, int mode) { - return kern_chmodat(td, (const char *)path, pathseg, mode, AT_FDCWD); + return kern_chmodat(td, AT_FDCWD, (const char *)path, pathseg, mode); } int -kern_chmodat(struct thread *td, const char *path, enum uio_seg pathseg, - mode_t mode, int dirfd) +kern_chmodat(struct thread *td, int fd, const char *path, enum uio_seg pathseg, + mode_t mode) { struct nameidata nd; struct vnode *dir_vn; int error, vfslocked; - error = kern_get_at(td, dirfd, &dir_vn); + error = kern_get_at(td, fd, &dir_vn); if (error && !kern_absolute_path(path, pathseg)) return (error); @@ -2970,20 +2970,20 @@ int mode; } */ *uap; { - return kern_lchmodat(td, uap->path, UIO_USERSPACE, uap->mode, AT_FDCWD); + return kern_lchmodat(td, AT_FDCWD, uap->path, UIO_USERSPACE, uap->mode); } int -kern_lchmodat(struct thread *td, const char *path, enum uio_seg pathseg, - mode_t mode, int dirfd) +kern_lchmodat(struct thread *td, int fd, const char *path, enum uio_seg pathseg, + mode_t mode) { int error; struct nameidata nd; int vfslocked; struct vnode *dir_vn; - error = kern_get_at(td, dirfd, &dir_vn); + error = kern_get_at(td, fd, &dir_vn); if (error && !kern_absolute_path(path, pathseg)) return (error); @@ -3101,29 +3101,29 @@ return (EINVAL); if (args->flag & AT_SYMLINK_NOFOLLOW) - return kern_lchownat(td, args->path, UIO_USERSPACE, args->uid, - args->gid, args->dirfd); + return kern_lchownat(td, args->fd, args->path, UIO_USERSPACE, + args->uid, args->gid); else - return kern_chownat(td, args->path, UIO_USERSPACE, args->uid, - args->gid, args->dirfd); + return kern_chownat(td, args->fd, args->path, UIO_USERSPACE, + args->uid, args->gid); } int kern_chown(struct thread *td, char *path, enum uio_seg pathseg, int uid, int gid) { - return kern_chownat(td, (const char *)path, pathseg, uid, gid, AT_FDCWD); + return kern_chownat(td, AT_FDCWD, (const char *)path, pathseg, uid, gid); } int -kern_chownat(struct thread *td, const char *path, enum uio_seg pathseg, int uid, - int gid, int dirfd) +kern_chownat(struct thread *td, int fd, const char *path, enum uio_seg pathseg, + int uid, int gid) { struct nameidata nd; struct vnode *dir_vn; int error, vfslocked; - error = kern_get_at(td, dirfd, &dir_vn); + error = kern_get_at(td, fd, &dir_vn); if (error && !kern_absolute_path(path, pathseg)) return (error); @@ -3170,18 +3170,18 @@ kern_lchown(struct thread *td, char *path, enum uio_seg pathseg, int uid, int gid) { - return kern_lchownat(td, (const char *)path, pathseg, uid, gid, AT_FDCWD); + return kern_lchownat(td, AT_FDCWD, (const char *)path, pathseg, uid, gid); } int -kern_lchownat(struct thread *td, const char *path, enum uio_seg pathseg, int uid, - int gid, int dirfd) +kern_lchownat(struct thread *td, int fd, const char *path, enum uio_seg pathseg, + int uid, int gid) { struct nameidata nd; struct vnode *dir_vn; int error, vfslocked; - error = kern_get_at(td, dirfd, &dir_vn); + error = kern_get_at(td, fd, &dir_vn); if (error && !kern_absolute_path(path, pathseg)) return (error); @@ -3345,27 +3345,28 @@ int futimesat(struct thread *td, struct futimesat_args *args) { - return kern_utimesat(td, args->path, UIO_USERSPACE, args->times, UIO_USERSPACE, args->fd); + return kern_utimesat(td, args->fd, args->path, UIO_USERSPACE, + args->times, UIO_USERSPACE); } int kern_utimes(struct thread *td, char *path, enum uio_seg pathseg, struct timeval *tptr, enum uio_seg tptrseg) { - return kern_utimesat(td, (const char *)path, pathseg, - (const struct timeval *)tptr, tptrseg, AT_FDCWD); + return kern_utimesat(td, AT_FDCWD, (const char *)path, pathseg, + (const struct timeval *)tptr, tptrseg); } int -kern_utimesat(struct thread *td, const char *path, enum uio_seg pathseg, - const struct timeval *tptr, enum uio_seg tptrseg, int dirfd) +kern_utimesat(struct thread *td, int fd, const char *path, enum uio_seg pathseg, + const struct timeval *tptr, enum uio_seg tptrseg) { struct nameidata nd; struct vnode *dir_vn; struct timespec ts[2]; int error, vfslocked; - error = kern_get_at(td, dirfd, &dir_vn); + error = kern_get_at(td, fd, &dir_vn); if (error && !kern_absolute_path(path, pathseg)) return (error); @@ -3742,20 +3743,20 @@ int renameat(struct thread *td, struct renameat_args *args) { - return kern_renameat(td, args->old, args->new, UIO_USERSPACE, - args->oldfd, args->newfd); + return kern_renameat(td, args->oldfd, args->old, args->newfd, args->new, + UIO_USERSPACE); } int kern_rename(struct thread *td, char *from, char *to, enum uio_seg pathseg) { - return kern_renameat(td, (const char *)from, (const char *)to, pathseg, - AT_FDCWD, AT_FDCWD); + return kern_renameat(td, AT_FDCWD, (const char *)from, AT_FDCWD, + (const char *)to, pathseg); } int -kern_renameat(struct thread *td, const char *from, const char *to, - enum uio_seg pathseg, int fdirfd, int tdirfd) +kern_renameat(struct thread *td, int oldfd, const char *old, int newfd, + const char *new, enum uio_seg pathseg) { struct nameidata fromnd, tond; struct vnode *fdir_vn, *tdir_vn; @@ -3765,23 +3766,23 @@ int fvfslocked; int error; - error = kern_get_at(td, fdirfd, &fdir_vn); - if (error && !kern_absolute_path(from, pathseg)) + error = kern_get_at(td, oldfd, &fdir_vn); + if (error && !kern_absolute_path(old, pathseg)) return (error); - error = kern_get_at(td, tdirfd, &tdir_vn); - if (error && !kern_absolute_path(to, pathseg)) + error = kern_get_at(td, newfd, &tdir_vn); + if (error && !kern_absolute_path(new, pathseg)) return (error); #ifdef MAC NDINIT_AT(&fromnd, DELETE, ((error) ? ATBADF : 0) | LOCKPARENT | - LOCKLEAF | SAVESTART | MPSAFE | AUDITVNODE1, pathseg, from, td, fdir_vn); + LOCKLEAF | SAVESTART | MPSAFE | AUDITVNODE1, pathseg, old, td, fdir_vn); #else NDINIT_AT(&fromnd, DELETE, ((error) ? ATBADF : 0) | WANTPARENT | - SAVESTART | MPSAFE | AUDITVNODE1, pathseg, from, td, fdir_vn); + SAVESTART | MPSAFE | AUDITVNODE1, pathseg, old, td, fdir_vn); #endif NDINIT_AT(&tond, RENAME, ((error) ? ATBADF : 0) | LOCKPARENT | LOCKLEAF | NOCACHE | SAVESTART | MPSAFE | AUDITVNODE2, - pathseg, to, td, tdir_vn); + pathseg, new, td, tdir_vn); bwillwrite(); if ((error = namei(&fromnd)) != 0) @@ -3915,18 +3916,18 @@ int mkdirat(struct thread *td, struct mkdirat_args *args) { - return kern_mkdirat(td, args->path, UIO_USERSPACE, args->mode, args->fd); + return kern_mkdirat(td, args->fd, args->path, UIO_USERSPACE, args->mode); } int kern_mkdir(struct thread *td, char *path, enum uio_seg segflg, int mode) { - return kern_mkdirat(td, (const char *)path, segflg, mode, AT_FDCWD); + return kern_mkdirat(td, AT_FDCWD, (const char *)path, segflg, mode); } int -kern_mkdirat(struct thread *td, const char *path, enum uio_seg segflg, - int mode, int dirfd) +kern_mkdirat(struct thread *td, int fd, const char *path, enum uio_seg segflg, + int mode) { struct mount *mp; struct vnode *vp, *dir_vn = NULL; @@ -3939,7 +3940,7 @@ restart: if (dir_vn) vrele(dir_vn); - error = kern_get_at(td, dirfd, &dir_vn); + error = kern_get_at(td, fd, &dir_vn); if (error && !kern_absolute_path(path, segflg)) return (error); bwillwrite(); @@ -4030,11 +4031,11 @@ int kern_rmdir(struct thread *td, char *path, enum uio_seg pathseg) { - return kern_rmdirat(td, (const char *)path, pathseg, AT_FDCWD); + return kern_rmdirat(td, AT_FDCWD, (const char *)path, pathseg); } int -kern_rmdirat(struct thread *td, const char *path, enum uio_seg pathseg, int dirfd) +kern_rmdirat(struct thread *td, int fd, const char *path, enum uio_seg pathseg) { struct mount *mp; struct vnode *vp, *dir_vn = NULL; @@ -4043,7 +4044,7 @@ int vfslocked; restart: - error = kern_get_at(td, dirfd, &dir_vn); + error = kern_get_at(td, fd, &dir_vn); if (error && !kern_absolute_path(path, pathseg)) return (error); bwillwrite(); ==== //depot/projects/soc2007/rdivacky/linux_at/sys/sys/syscall.h#7 (text+ko) ==== ==== //depot/projects/soc2007/rdivacky/linux_at/sys/sys/syscall.mk#7 (text+ko) ==== ==== //depot/projects/soc2007/rdivacky/linux_at/sys/sys/syscallsubr.h#15 (text+ko) ==== @@ -56,8 +56,8 @@ socklen_t *namelen, struct file **fp); int kern_access(struct thread *td, char *path, enum uio_seg pathseg, int flags); -int kern_accessat(struct thread *td, const char *path, enum uio_seg pathseg, - int flags, int dirfd); +int kern_accessat(struct thread *td, int fd, const char *path, + enum uio_seg pathseg, int flags); int kern_adjtime(struct thread *td, struct timeval *delta, struct timeval *olddelta); int kern_alternate_path(struct thread *td, const char *prefix, const char *path, @@ -66,14 +66,14 @@ int kern_chdir(struct thread *td, char *path, enum uio_seg pathseg); int kern_chmod(struct thread *td, char *path, enum uio_seg pathseg, int mode); -int kern_chmodat(struct thread *td, const char *path, enum uio_seg pathseg, - mode_t mode, int dirfd); +int kern_chmodat(struct thread *td, int fd, const char *path, + enum uio_seg pathseg, mode_t mode); int kern_chown(struct thread *td, char *path, enum uio_seg pathseg, int uid, int gid); -int kern_chownat(struct thread *td, const char *path, enum uio_seg pathseg, int uid, - int gid, int dirfd); -int kern_lchmodat(struct thread *td, const char *path, enum uio_seg pathseg, - mode_t mode, int dirfd); +int kern_chownat(struct thread *td, int fd, const char *path, + enum uio_seg pathseg, int uid, int gid); +int kern_lchmodat(struct thread *td, int fd, const char *path, + enum uio_seg pathseg, mode_t mode); int kern_clock_getres(struct thread *td, clockid_t clock_id, struct timespec *ts); int kern_clock_gettime(struct thread *td, clockid_t clock_id, @@ -110,30 +110,30 @@ int kern_kldunload(struct thread *td, int fileid, int flags); int kern_lchown(struct thread *td, char *path, enum uio_seg pathseg, int uid, int gid); -int kern_lchownat(struct thread *td, const char *path, enum uio_seg pathseg, - int uid, int gid, int dirfd); +int kern_lchownat(struct thread *td, int fd, const char *path, + enum uio_seg pathseg, int uid, int gid); int kern_link(struct thread *td, char *path, char *link, enum uio_seg segflg); -int kern_linkat(struct thread *td, const char *path, const char *link, - enum uio_seg segflg, int olddfd, int newdfd, int follow); +int kern_linkat(struct thread *td, int fd1, int fd2, const char *path1, + const char *path2, enum uio_seg segflg, int follow); int kern_lstat(struct thread *td, char *path, enum uio_seg pathseg, struct stat *sbp); -int kern_lstatat(struct thread *td, const char *path, enum uio_seg pathseg, - struct stat *sbp, int dfd); +int kern_lstatat(struct thread *td, int fd, const char *path, + enum uio_seg pathseg, struct stat *sbp); int kern_lutimes(struct thread *td, char *path, enum uio_seg pathseg, struct timeval *tptr, enum uio_seg tptrseg); int kern_mkdir(struct thread *td, char *path, enum uio_seg segflg, int mode); -int kern_mkdirat(struct thread *td, const char *path, enum uio_seg segflg, - int mode, int dirfd); +int kern_mkdirat(struct thread *td, int fd, const char *path, + enum uio_seg segflg, int mode); int kern_mkfifo(struct thread *td, char *path, enum uio_seg pathseg, int mode); -int kern_mkfifoat(struct thread *td, const char *path, enum uio_seg pathseg, - int mode, int dirfd); +int kern_mkfifoat(struct thread *td, int fd, const char *path, + enum uio_seg pathseg, int mode); int kern_mknod(struct thread *td, char *path, enum uio_seg pathseg, int mode, int dev); -int kern_mknodat(struct thread *td, const char *path, enum uio_seg pathseg, - int mode, int dev, int dirfd); +int kern_mknodat(struct thread *td, int fd, const char *path, + enum uio_seg pathseg, int mode, int dev); int kern_msgctl(struct thread *, int, int, struct msqid_ds *); int kern_msgsnd(struct thread *, int, const void *, size_t, int, long); int kern_msgrcv(struct thread *, int, void *, size_t, long, int, long *); @@ -141,8 +141,8 @@ struct timespec *rmt); int kern_open(struct thread *td, char *path, enum uio_seg pathseg, int flags, int mode); -int kern_openat(struct thread *td, const char *path, enum uio_seg pathseg, - int flags, int mode, int dirfd); +int kern_openat(struct thread *td, int fd, const char *path, + enum uio_seg pathseg, int flags, int mode); int kern_pathconf(struct thread *td, char *path, enum uio_seg pathseg, int name); int kern_preadv(struct thread *td, int fd, struct uio *auio, off_t offset); @@ -151,17 +151,17 @@ int kern_pwritev(struct thread *td, int fd, struct uio *auio, off_t offset); int kern_readlink(struct thread *td, char *path, enum uio_seg pathseg, char *buf, enum uio_seg bufseg, int count); -int kern_readlinkat(struct thread *td, const char *path, enum uio_seg pathseg, - char *buf, enum uio_seg bufseg, int count, int dirfd); +int kern_readlinkat(struct thread *td, int fd, const char *path, + enum uio_seg pathseg, char *buf, enum uio_seg bufseg, int count); int kern_readv(struct thread *td, int fd, struct uio *auio); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jun 28 10:48:50 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D0ECA16A468; Thu, 28 Jun 2007 10:48:49 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7942316A41F for ; Thu, 28 Jun 2007 10:48:49 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 69EE113C484 for ; Thu, 28 Jun 2007 10:48:49 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5SAmn3e037250 for ; Thu, 28 Jun 2007 10:48:49 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5SAmnUc037247 for perforce@freebsd.org; Thu, 28 Jun 2007 10:48:49 GMT (envelope-from rdivacky@FreeBSD.org) Date: Thu, 28 Jun 2007 10:48:49 GMT Message-Id: <200706281048.l5SAmnUc037247@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 122469 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Jun 2007 10:48:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=122469 Change 122469 by rdivacky@rdivacky_witten on 2007/06/28 10:48:34 Use the linux inconsistency only when unlinking a file. Pointed out by: rwatson Affected files ... .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_file.c#16 edit Differences ... ==== //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_file.c#16 (text+ko) ==== @@ -648,7 +648,7 @@ error = kern_rmdirat(td, dfd, path, UIO_SYSSPACE); else error = kern_unlinkat(td, dfd, path, UIO_SYSSPACE); - if (error == EPERM) + if (error == EPERM && !(args->flag & LINUX_AT_REMOVEDIR)) /* Introduce POSIX noncompliant behaviour of Linux */ if (kern_statat(td, dfd, path, UIO_SYSSPACE, &st) == 0) if (S_ISDIR(st.st_mode)) From owner-p4-projects@FreeBSD.ORG Thu Jun 28 10:50:53 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B595F16A4F2; Thu, 28 Jun 2007 10:50:52 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8279F16A4D7 for ; Thu, 28 Jun 2007 10:50:52 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 72CC913C480 for ; Thu, 28 Jun 2007 10:50:52 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5SAoqlv037411 for ; Thu, 28 Jun 2007 10:50:52 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5SAoqbN037408 for perforce@freebsd.org; Thu, 28 Jun 2007 10:50:52 GMT (envelope-from rdivacky@FreeBSD.org) Date: Thu, 28 Jun 2007 10:50:52 GMT Message-Id: <200706281050.l5SAoqbN037408@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 122470 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Jun 2007 10:50:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=122470 Change 122470 by rdivacky@rdivacky_witten on 2007/06/28 10:50:48 Fix fallouts from parameter placement consistency ;( Affected files ... .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_file.c#17 edit .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_misc.c#6 edit Differences ... ==== //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_file.c#17 (text+ko) ==== @@ -821,7 +821,7 @@ if (ldebug(renameat)) printf(ARGS(renameat, "%s, %s"), from, to); #endif - error = kern_renameat(td, olddfd, newdfd, from, to, UIO_SYSSPACE); + error = kern_renameat(td, olddfd, from, newdfd, to, UIO_SYSSPACE); LFREEPATH(from); LFREEPATH(to); return (error); @@ -875,7 +875,7 @@ printf(ARGS(symlinkat, "%s, %s"), path, to); #endif - error = kern_symlinkat(td, dfd, path, to, UIO_SYSSPACE); + error = kern_symlinkat(td, path, dfd, to, UIO_SYSSPACE); LFREEPATH(path); LFREEPATH(to); return (error); ==== //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_misc.c#6 (text+ko) ==== @@ -1016,13 +1016,13 @@ switch (args->mode & S_IFMT) { case S_IFIFO: case S_IFSOCK: - error = kern_mkfifoat(td, path, UIO_SYSSPACE, args->mode, dfd); + error = kern_mkfifoat(td, dfd, path, UIO_SYSSPACE, args->mode); break; case S_IFCHR: case S_IFBLK: - error = kern_mknodat(td, path, UIO_SYSSPACE, args->mode, - args->dev, dfd); + error = kern_mknodat(td, dfd, path, UIO_SYSSPACE, args->mode, + args->dev); break; case S_IFDIR: @@ -1033,8 +1033,8 @@ args->mode |= S_IFREG; /* FALLTHROUGH */ case S_IFREG: - error = kern_openat(td, path, UIO_SYSSPACE, - O_WRONLY | O_CREAT | O_TRUNC, args->mode, dfd); + error = kern_openat(td, dfd, path, UIO_SYSSPACE, + O_WRONLY | O_CREAT | O_TRUNC, args->mode); break; default: From owner-p4-projects@FreeBSD.ORG Thu Jun 28 10:52:56 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DD21616A4C5; Thu, 28 Jun 2007 10:52:55 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B02D216A4AB for ; Thu, 28 Jun 2007 10:52:55 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 8795B13C45A for ; Thu, 28 Jun 2007 10:52:55 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5SAqtIQ037677 for ; Thu, 28 Jun 2007 10:52:55 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5SAqtGF037674 for perforce@freebsd.org; Thu, 28 Jun 2007 10:52:55 GMT (envelope-from rdivacky@FreeBSD.org) Date: Thu, 28 Jun 2007 10:52:55 GMT Message-Id: <200706281052.l5SAqtGF037674@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 122471 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Jun 2007 10:52:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=122471 Change 122471 by rdivacky@rdivacky_witten on 2007/06/28 10:52:08 Style. Noticed by: rwatson Affected files ... .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_misc.c#7 edit Differences ... ==== //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_misc.c#7 (text+ko) ==== @@ -842,7 +842,7 @@ printf(ARGS(futimesat, "%s, *"), fname); #endif - if (args->utimes!= NULL) { + if (args->utimes != NULL) { if ((error = copyin(args->utimes, ltv, sizeof ltv))) { LFREEPATH(fname); return (error); From owner-p4-projects@FreeBSD.ORG Thu Jun 28 10:57:01 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8888116A46C; Thu, 28 Jun 2007 10:57:01 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 27E8E16A468 for ; Thu, 28 Jun 2007 10:57:01 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 185DC13C4BC for ; Thu, 28 Jun 2007 10:57:01 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5SAv0YB037893 for ; Thu, 28 Jun 2007 10:57:00 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5SAv0Sj037888 for perforce@freebsd.org; Thu, 28 Jun 2007 10:57:00 GMT (envelope-from rdivacky@FreeBSD.org) Date: Thu, 28 Jun 2007 10:57:00 GMT Message-Id: <200706281057.l5SAv0Sj037888@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 122472 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Jun 2007 10:57:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=122472 Change 122472 by rdivacky@rdivacky_witten on 2007/06/28 10:56:15 Close an fd leak. Pointed out by: rwatson Affected files ... .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_misc.c#8 edit Differences ... ==== //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_misc.c#8 (text+ko) ==== @@ -985,6 +985,8 @@ case S_IFREG: error = kern_open(td, path, UIO_SYSSPACE, O_WRONLY | O_CREAT | O_TRUNC, args->mode); + if (error == 0) + kern_close(td, td->td_retval[0]); break; default: @@ -1035,6 +1037,8 @@ case S_IFREG: error = kern_openat(td, dfd, path, UIO_SYSSPACE, O_WRONLY | O_CREAT | O_TRUNC, args->mode); + if (error == 0) + kern_close(td, td->td_retval[0]); break; default: From owner-p4-projects@FreeBSD.ORG Thu Jun 28 10:58:03 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 712EA16A46B; Thu, 28 Jun 2007 10:58:03 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3218916A400 for ; Thu, 28 Jun 2007 10:58:03 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 22D7613C4B9 for ; Thu, 28 Jun 2007 10:58:03 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5SAw3Og037983 for ; Thu, 28 Jun 2007 10:58:03 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5SAw2eZ037980 for perforce@freebsd.org; Thu, 28 Jun 2007 10:58:02 GMT (envelope-from rdivacky@FreeBSD.org) Date: Thu, 28 Jun 2007 10:58:02 GMT Message-Id: <200706281058.l5SAw2eZ037980@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 122473 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Jun 2007 10:58:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=122473 Change 122473 by rdivacky@rdivacky_witten on 2007/06/28 10:57:48 Style. Suggested by: rwatson Affected files ... .. //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_stats.c#10 edit Differences ... ==== //depot/projects/soc2007/rdivacky/linux_at/sys/compat/linux/linux_stats.c#10 (text+ko) ==== @@ -134,7 +134,8 @@ } static void -translate_path_major_minor_at(struct thread *td, char *path, struct stat *buf, int dfd) +translate_path_major_minor_at(struct thread *td, char *path, struct stat *buf, + int dfd) { struct proc *p = td->td_proc; struct filedesc *fdp = p->p_fd; From owner-p4-projects@FreeBSD.ORG Thu Jun 28 11:06:14 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6614916A468; Thu, 28 Jun 2007 11:06:14 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2D17C16A400 for ; Thu, 28 Jun 2007 11:06:14 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 1CC3A13C45D for ; Thu, 28 Jun 2007 11:06:14 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5SB6E26039791 for ; Thu, 28 Jun 2007 11:06:14 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5SB6E3A039788 for perforce@freebsd.org; Thu, 28 Jun 2007 11:06:14 GMT (envelope-from rdivacky@FreeBSD.org) Date: Thu, 28 Jun 2007 11:06:14 GMT Message-Id: <200706281106.l5SB6E3A039788@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 122474 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Jun 2007 11:06:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=122474 Change 122474 by rdivacky@rdivacky_witten on 2007/06/28 11:05:43 dir_vn -> dvp Suggested by: rwatson Affected files ... .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#35 edit Differences ... ==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#35 (text+ko) ==== @@ -85,7 +85,7 @@ static int setfflags(struct thread *td, struct vnode *, int); static int setutimes(struct thread *td, struct vnode *, const struct timespec *, int, int); -static int kern_get_at(struct thread *td, int dirfd, struct vnode **dir_vn); +static int kern_get_at(struct thread *td, int dirfd, struct vnode **dvpp); static int vn_access(struct vnode *vp, int user_flags, struct ucred *cred, struct thread *td); static int kern_absolute_path(const char *path, enum uio_seg pathseg); @@ -978,21 +978,21 @@ } static int -kern_get_at(struct thread *td, int dirfd, struct vnode **dir_vn) +kern_get_at(struct thread *td, int dirfd, struct vnode **dvpp) { int error; if (dirfd == AT_FDCWD) - *dir_vn = NULL; + *dvpp = NULL; else { - error = fgetvp(td, dirfd, dir_vn); + error = fgetvp(td, dirfd, dvpp); if (error) { - *dir_vn = NULL; + *dvpp = NULL; return (error); } - if ((*dir_vn)->v_type != VDIR) { - vrele(*dir_vn); - *dir_vn = NULL; + if ((*dvpp)->v_type != VDIR) { + vrele(*dvpp); + *dvpp = NULL; return (ENOTDIR); } } @@ -1021,7 +1021,7 @@ int flags, int mode) { struct nameidata nd; - struct vnode *dir_vn; + struct vnode *dvp; struct proc *p = td->td_proc; struct filedesc *fdp = p->p_fd; struct file *fp; @@ -1038,12 +1038,12 @@ AUDIT_ARG(mode, mode); /* XXX: audit dirfd */ - error = kern_get_at(td, fd, &dir_vn); + error = kern_get_at(td, fd, &dvp); if (error && !kern_absolute_path(path, pathseg)) return (error); NDINIT_AT(&nd, LOOKUP, ((error) ? ATBADF : 0) | FOLLOW | AUDITVNODE1 | - MPSAFE, pathseg, path, td, dir_vn); + MPSAFE, pathseg, path, td, dvp); if ((flags & O_ACCMODE) == O_ACCMODE) { error = EINVAL; @@ -1156,15 +1156,15 @@ td->td_retval[0] = indx; return (0); out: - if (dir_vn) - vrele(dir_vn); + if (dvp) + vrele(dvp); return (error); bad: VFS_UNLOCK_GIANT(vfslocked); fdclose(fdp, fp, indx, td); fdrop(fp, td); - if (dir_vn) - vrele(dir_vn); + if (dvp) + vrele(dvp); return (error); } @@ -1240,7 +1240,7 @@ kern_mknodat(struct thread *td, int fd, const char *path, enum uio_seg pathseg, int mode, int dev) { - struct vnode *vp, *dir_vn = NULL; + struct vnode *vp, *dvp = NULL; struct mount *mp; struct vattr vattr; int error; @@ -1268,17 +1268,17 @@ if (error) return (error); restart: - if (dir_vn) - vrele(dir_vn); - error = kern_get_at(td, fd, &dir_vn); + if (dvp) + vrele(dvp); + error = kern_get_at(td, fd, &dvp); if (error && !kern_absolute_path(path, pathseg)) return (error); bwillwrite(); NDINIT_AT(&nd, CREATE, ((error) ? ATBADF : 0) | LOCKPARENT | - SAVENAME | MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn); + SAVENAME | MPSAFE | AUDITVNODE1, pathseg, path, td, dvp); if ((error = namei(&nd)) != 0) { - if (dir_vn) - vrele(dir_vn); + if (dvp) + vrele(dvp); return (error); } vfslocked = NDHASGIANT(&nd); @@ -1291,8 +1291,8 @@ vput(nd.ni_dvp); vrele(vp); VFS_UNLOCK_GIANT(vfslocked); - if (dir_vn) - vrele(dir_vn); + if (dvp) + vrele(dvp); return (EEXIST); } else { VATTR_NULL(&vattr); @@ -1325,8 +1325,8 @@ vput(nd.ni_dvp); VFS_UNLOCK_GIANT(vfslocked); if ((error = vn_start_write(NULL, &mp, V_XSLEEP | PCATCH)) != 0) { - if (dir_vn) - vrele(dir_vn); + if (dvp) + vrele(dvp); return (error); } goto restart; @@ -1347,8 +1347,8 @@ vput(nd.ni_vp); } } - if (dir_vn) - vrele(dir_vn); + if (dvp) + vrele(dvp); NDFREE(&nd, NDF_ONLY_PNBUF); vput(nd.ni_dvp); vn_finished_write(mp); @@ -1405,21 +1405,21 @@ int error; struct nameidata nd; int vfslocked; - struct vnode *dir_vn = NULL; + struct vnode *dvp = NULL; AUDIT_ARG(mode, mode); restart: - if (dir_vn) - vrele(dir_vn); - error = kern_get_at(td, fd, &dir_vn); + if (dvp) + vrele(dvp); + error = kern_get_at(td, fd, &dvp); if (error && !kern_absolute_path(path, pathseg)) return (error); bwillwrite(); NDINIT_AT(&nd, CREATE, ((error) ? ATBADF : 0) | LOCKPARENT | - SAVENAME | MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn); + SAVENAME | MPSAFE | AUDITVNODE1, pathseg, path, td, dvp); if ((error = namei(&nd)) != 0) { - if (dir_vn) - vrele(dir_vn); + if (dvp) + vrele(dvp); return (error); } vfslocked = NDHASGIANT(&nd); @@ -1431,8 +1431,8 @@ vput(nd.ni_dvp); vrele(nd.ni_vp); VFS_UNLOCK_GIANT(vfslocked); - if (dir_vn) - vrele(dir_vn); + if (dvp) + vrele(dvp); return (EEXIST); } if (vn_start_write(nd.ni_dvp, &mp, V_NOWAIT) != 0) { @@ -1440,8 +1440,8 @@ vput(nd.ni_dvp); VFS_UNLOCK_GIANT(vfslocked); if ((error = vn_start_write(NULL, &mp, V_XSLEEP | PCATCH)) != 0) { - if (dir_vn) - vrele(dir_vn); + if (dvp) + vrele(dvp); return (error); } goto restart; @@ -1464,8 +1464,8 @@ #ifdef MAC out: #endif - if (dir_vn) - vrele(dir_vn); + if (dvp) + vrele(dvp); vput(nd.ni_dvp); vn_finished_write(mp); VFS_UNLOCK_GIANT(vfslocked); @@ -1571,25 +1571,25 @@ { struct nameidata ndp, ndl; int error; - struct vnode *pdir_vn, *ldir_vn; + struct vnode *pdvp, *ldvp; struct vnode *vp; struct mount *mp; int vfslocked; int lvfslocked; - error = kern_get_at(td, fd1, &pdir_vn); + error = kern_get_at(td, fd1, &pdvp); if (error && !kern_absolute_path(path1, segflg)) return (error); NDINIT_AT(&ndp, LOOKUP, ((error) ? ATBADF : 0) | follow | MPSAFE | - AUDITVNODE1, segflg, path1, td, pdir_vn); + AUDITVNODE1, segflg, path1, td, pdvp); - error = kern_get_at(td, fd2, &ldir_vn); + error = kern_get_at(td, fd2, &ldvp); if (error && !kern_absolute_path(path2, segflg)) return (error); NDINIT_AT(&ndl, CREATE, ((error) ? ATBADF : 0) | LOCKPARENT | - SAVENAME | MPSAFE | AUDITVNODE1, segflg, path2, td, ldir_vn); + SAVENAME | MPSAFE | AUDITVNODE1, segflg, path2, td, ldvp); bwillwrite(); if ((error = namei(&ndp)) != 0) @@ -1640,10 +1640,10 @@ VFS_UNLOCK_GIANT(vfslocked); out: - if (pdir_vn) - vrele(pdir_vn); - if (ldir_vn) - vrele(ldir_vn); + if (pdvp) + vrele(pdvp); + if (ldvp) + vrele(ldvp); return (error); } @@ -1698,7 +1698,7 @@ int error; struct nameidata nd; int vfslocked; - struct vnode *dir_vn = NULL; + struct vnode *dvp = NULL; if (segflg == UIO_SYSSPACE) { syspath = __DECONST(char *, path1); @@ -1709,14 +1709,14 @@ } AUDIT_ARG(text, syspath); restart: - if (dir_vn) - vrele(dir_vn); - error = kern_get_at(td, fd, &dir_vn); + if (dvp) + vrele(dvp); + error = kern_get_at(td, fd, &dvp); if (error && !kern_absolute_path(path2, segflg)) return (error); bwillwrite(); NDINIT_AT(&nd, CREATE, ((error) ? ATBADF : 0) | LOCKPARENT | - SAVENAME | MPSAFE | AUDITVNODE1, segflg, path2, td, dir_vn); + SAVENAME | MPSAFE | AUDITVNODE1, segflg, path2, td, dvp); if ((error = namei(&nd)) != 0) goto out; vfslocked = NDHASGIANT(&nd); @@ -1762,8 +1762,8 @@ vn_finished_write(mp); VFS_UNLOCK_GIANT(vfslocked); out: - if (dir_vn) - vrele(dir_vn); + if (dvp) + vrele(dvp); if (segflg != UIO_SYSSPACE) uma_zfree(namei_zone, syspath); return (error); @@ -1871,23 +1871,23 @@ kern_unlinkat(struct thread *td, int fd, const char *path, enum uio_seg pathseg) { struct mount *mp; - struct vnode *vp, *dir_vn = NULL; + struct vnode *vp, *dvp = NULL; int error; struct nameidata nd; int vfslocked; restart: - if (dir_vn) - vrele(dir_vn); - error = kern_get_at(td, fd, &dir_vn); + if (dvp) + vrele(dvp); + error = kern_get_at(td, fd, &dvp); if (error && !kern_absolute_path(path, pathseg)) return (error); bwillwrite(); NDINIT_AT(&nd, DELETE, ((error) ? ATBADF : 0) | LOCKPARENT | - LOCKLEAF | MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn); + LOCKLEAF | MPSAFE | AUDITVNODE1, pathseg, path, td, dvp); if ((error = namei(&nd)) != 0) { - if (dir_vn) - vrele(dir_vn); + if (dvp) + vrele(dvp); return (error == EINVAL ? EPERM : error); } vfslocked = NDHASGIANT(&nd); @@ -1914,8 +1914,8 @@ VFS_UNLOCK_GIANT(vfslocked); if ((error = vn_start_write(NULL, &mp, V_XSLEEP | PCATCH)) != 0) { - if (dir_vn) - vrele(dir_vn); + if (dvp) + vrele(dvp); return (error); } goto restart; @@ -1935,8 +1935,8 @@ } NDFREE(&nd, NDF_ONLY_PNBUF); vput(nd.ni_dvp); - if (dir_vn) - vrele(dir_vn); + if (dvp) + vrele(dvp); if (vp == nd.ni_dvp) vrele(vp); else @@ -2149,17 +2149,17 @@ { int error; struct nameidata nd; - struct vnode *dir_vn; + struct vnode *dvp; struct ucred *cred, *tmpcred; struct vnode *vp; int vfslocked; - error = kern_get_at(td, fd, &dir_vn); + error = kern_get_at(td, fd, &dvp); if (error && !kern_absolute_path(path, pathseg)) return (error); NDINIT_AT(&nd, LOOKUP, ((error) ? ATBADF : 0) | FOLLOW | LOCKLEAF | - MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn); + MPSAFE | AUDITVNODE1, pathseg, path, td, dvp); /* * Create and modify a temporary credential instead of one that @@ -2188,8 +2188,8 @@ out: td->td_ucred = cred; crfree(tmpcred); - if (dir_vn) - vrele(dir_vn); + if (dvp) + vrele(dvp); return (error); } @@ -2381,16 +2381,16 @@ struct stat *sbp) { struct nameidata nd; - struct vnode *dir_vn; + struct vnode *dvp; struct stat sb; int error, vfslocked; - error = kern_get_at(td, fd, &dir_vn); + error = kern_get_at(td, fd, &dvp); if (error && !kern_absolute_path(path, pathseg)) return (error); NDINIT_AT(&nd, LOOKUP, ((error) ? ATBADF : 0) | FOLLOW | LOCKSHARED | - LOCKLEAF | AUDITVNODE1 | MPSAFE, pathseg, path, td, dir_vn); + LOCKLEAF | AUDITVNODE1 | MPSAFE, pathseg, path, td, dvp); if ((error = namei(&nd)) != 0) goto out; @@ -2408,8 +2408,8 @@ error = 0; out: - if (dir_vn) - vrele(dir_vn); + if (dvp) + vrele(dvp); return (error); } @@ -2450,17 +2450,17 @@ struct stat *sbp) { struct nameidata nd; - struct vnode *dir_vn; + struct vnode *dvp; struct vnode *vp; struct stat sb; int error, vfslocked; - error = kern_get_at(td, fd, &dir_vn); + error = kern_get_at(td, fd, &dvp); if (error && !kern_absolute_path(path, pathseg)) return (error); NDINIT_AT(&nd, LOOKUP, ((error) ? ATBADF : 0) | NOFOLLOW | LOCKLEAF | - LOCKSHARED | AUDITVNODE1 | MPSAFE, pathseg, path, td, dir_vn); + LOCKSHARED | AUDITVNODE1 | MPSAFE, pathseg, path, td, dvp); if ((error = namei(&nd)) != 0) goto out; @@ -2475,8 +2475,8 @@ *sbp = sb; error = 0; out: - if (dir_vn) - vrele(dir_vn); + if (dvp) + vrele(dvp); return (error); } @@ -2657,18 +2657,18 @@ char *buf, enum uio_seg bufseg, int count) { struct nameidata nd; - struct vnode *dir_vn; + struct vnode *dvp; struct vnode *vp; struct iovec aiov; struct uio auio; int error, vfslocked; - error = kern_get_at(td, fd, &dir_vn); + error = kern_get_at(td, fd, &dvp); if (error && !kern_absolute_path(path, pathseg)) return (error); NDINIT_AT(&nd, LOOKUP, ((error) ? ATBADF : 0) | NOFOLLOW | LOCKLEAF | - MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn); + MPSAFE | AUDITVNODE1, pathseg, path, td, dvp); if ((error = namei(&nd)) != 0) goto out; @@ -2701,8 +2701,8 @@ VFS_UNLOCK_GIANT(vfslocked); td->td_retval[0] = count - auio.uio_resid; out: - if (dir_vn) - vrele(dir_vn); + if (dvp) + vrele(dvp); return (error); } @@ -2930,15 +2930,15 @@ mode_t mode) { struct nameidata nd; - struct vnode *dir_vn; + struct vnode *dvp; int error, vfslocked; - error = kern_get_at(td, fd, &dir_vn); + error = kern_get_at(td, fd, &dvp); if (error && !kern_absolute_path(path, pathseg)) return (error); NDINIT_AT(&nd, LOOKUP, ((error) ? ATBADF : 0) | FOLLOW | MPSAFE | - AUDITVNODE1, pathseg, path, td, dir_vn); + AUDITVNODE1, pathseg, path, td, dvp); if ((error = namei(&nd)) != 0) goto out; @@ -2948,8 +2948,8 @@ vrele(nd.ni_vp); VFS_UNLOCK_GIANT(vfslocked); out: - if (dir_vn) - vrele(dir_vn); + if (dvp) + vrele(dvp); return (error); } @@ -2981,15 +2981,15 @@ int error; struct nameidata nd; int vfslocked; - struct vnode *dir_vn; + struct vnode *dvp; - error = kern_get_at(td, fd, &dir_vn); + error = kern_get_at(td, fd, &dvp); if (error && !kern_absolute_path(path, pathseg)) return (error); AUDIT_ARG(mode, mode); NDINIT_AT(&nd, LOOKUP, NOFOLLOW | MPSAFE | AUDITVNODE1, pathseg, - path, td, dir_vn); + path, td, dvp); if ((error = namei(&nd)) != 0) return (error); vfslocked = NDHASGIANT(&nd); @@ -3120,15 +3120,15 @@ int uid, int gid) { struct nameidata nd; - struct vnode *dir_vn; + struct vnode *dvp; int error, vfslocked; - error = kern_get_at(td, fd, &dir_vn); + error = kern_get_at(td, fd, &dvp); if (error && !kern_absolute_path(path, pathseg)) return (error); NDINIT_AT(&nd, LOOKUP, ((error) ? ATBADF : 0) | FOLLOW | MPSAFE | - AUDITVNODE1, pathseg, path, td, dir_vn); + AUDITVNODE1, pathseg, path, td, dvp); if ((error = namei(&nd)) != 0) goto out; @@ -3138,8 +3138,8 @@ vrele(nd.ni_vp); VFS_UNLOCK_GIANT(vfslocked); out: - if (dir_vn) - vrele(dir_vn); + if (dvp) + vrele(dvp); return (error); } @@ -3178,15 +3178,15 @@ int uid, int gid) { struct nameidata nd; - struct vnode *dir_vn; + struct vnode *dvp; int error, vfslocked; - error = kern_get_at(td, fd, &dir_vn); + error = kern_get_at(td, fd, &dvp); if (error && !kern_absolute_path(path, pathseg)) return (error); NDINIT_AT(&nd, LOOKUP, ((error) ? ATBADF : 0) | NOFOLLOW | MPSAFE | - AUDITVNODE1, pathseg, path, td, dir_vn); + AUDITVNODE1, pathseg, path, td, dvp); if ((error = namei(&nd)) != 0) goto out; @@ -3196,8 +3196,8 @@ vrele(nd.ni_vp); VFS_UNLOCK_GIANT(vfslocked); out: - if (dir_vn) - vrele(dir_vn); + if (dvp) + vrele(dvp); return (error); } @@ -3362,16 +3362,16 @@ const struct timeval *tptr, enum uio_seg tptrseg) { struct nameidata nd; - struct vnode *dir_vn; + struct vnode *dvp; struct timespec ts[2]; int error, vfslocked; - error = kern_get_at(td, fd, &dir_vn); + error = kern_get_at(td, fd, &dvp); if (error && !kern_absolute_path(path, pathseg)) return (error); NDINIT_AT(&nd, LOOKUP, ((error) ? ATBADF : 0) | FOLLOW | AUDITVNODE1 | - MPSAFE, pathseg, path, td, dir_vn); + MPSAFE, pathseg, path, td, dvp); if ((error = getutimes(tptr, tptrseg, ts)) != 0) goto out; @@ -3383,8 +3383,8 @@ vrele(nd.ni_vp); VFS_UNLOCK_GIANT(vfslocked); out: - if (dir_vn) - vrele(dir_vn); + if (dvp) + vrele(dvp); return (error); } @@ -3759,30 +3759,30 @@ const char *new, enum uio_seg pathseg) { struct nameidata fromnd, tond; - struct vnode *fdir_vn, *tdir_vn; + struct vnode *frdvp, *todvp; struct mount *mp = NULL; struct vnode *tvp, *fvp, *tdvp; int tvfslocked; int fvfslocked; int error; - error = kern_get_at(td, oldfd, &fdir_vn); + error = kern_get_at(td, oldfd, &frdvp); if (error && !kern_absolute_path(old, pathseg)) return (error); - error = kern_get_at(td, newfd, &tdir_vn); + error = kern_get_at(td, newfd, &todvp); if (error && !kern_absolute_path(new, pathseg)) return (error); #ifdef MAC NDINIT_AT(&fromnd, DELETE, ((error) ? ATBADF : 0) | LOCKPARENT | - LOCKLEAF | SAVESTART | MPSAFE | AUDITVNODE1, pathseg, old, td, fdir_vn); + LOCKLEAF | SAVESTART | MPSAFE | AUDITVNODE1, pathseg, old, td, frdvp); #else NDINIT_AT(&fromnd, DELETE, ((error) ? ATBADF : 0) | WANTPARENT | - SAVESTART | MPSAFE | AUDITVNODE1, pathseg, old, td, fdir_vn); + SAVESTART | MPSAFE | AUDITVNODE1, pathseg, old, td, frdvp); #endif NDINIT_AT(&tond, RENAME, ((error) ? ATBADF : 0) | LOCKPARENT | LOCKLEAF | NOCACHE | SAVESTART | MPSAFE | AUDITVNODE2, - pathseg, new, td, tdir_vn); + pathseg, new, td, todvp); bwillwrite(); if ((error = namei(&fromnd)) != 0) @@ -3877,10 +3877,10 @@ if (error == -1) return (0); out2: - if (fdir_vn) - vrele(fdir_vn); - if (tdir_vn) - vrele(tdir_vn); + if (frdvp) + vrele(frdvp); + if (todvp) + vrele(todvp); return (error); } @@ -3930,7 +3930,7 @@ int mode) { struct mount *mp; - struct vnode *vp, *dir_vn = NULL; + struct vnode *vp, *dvp = NULL; struct vattr vattr; int error; struct nameidata nd; @@ -3938,18 +3938,18 @@ AUDIT_ARG(mode, mode); restart: - if (dir_vn) - vrele(dir_vn); - error = kern_get_at(td, fd, &dir_vn); + if (dvp) + vrele(dvp); + error = kern_get_at(td, fd, &dvp); if (error && !kern_absolute_path(path, segflg)) return (error); bwillwrite(); NDINIT_AT(&nd, CREATE, ((error) ? ATBADF : 0) | LOCKPARENT | - SAVENAME | MPSAFE | AUDITVNODE1, segflg, path, td, dir_vn); + SAVENAME | MPSAFE | AUDITVNODE1, segflg, path, td, dvp); nd.ni_cnd.cn_flags |= WILLBEDIR; if ((error = namei(&nd)) != 0) { - if (dir_vn) - vrele(dir_vn); + if (dvp) + vrele(dvp); return (error); } vfslocked = NDHASGIANT(&nd); @@ -3967,8 +3967,8 @@ vput(nd.ni_dvp); vrele(vp); VFS_UNLOCK_GIANT(vfslocked); - if (dir_vn) - vrele(dir_vn); + if (dvp) + vrele(dvp); return (EEXIST); } if (vn_start_write(nd.ni_dvp, &mp, V_NOWAIT) != 0) { @@ -3976,8 +3976,8 @@ vput(nd.ni_dvp); VFS_UNLOCK_GIANT(vfslocked); if ((error = vn_start_write(NULL, &mp, V_XSLEEP | PCATCH)) != 0) { - if (dir_vn) - vrele(dir_vn); + if (dvp) + vrele(dvp); return (error); } goto restart; @@ -3998,8 +3998,8 @@ #ifdef MAC out: #endif - if (dir_vn) - vrele(dir_vn); + if (dvp) + vrele(dvp); NDFREE(&nd, NDF_ONLY_PNBUF); vput(nd.ni_dvp); if (!error) @@ -4038,18 +4038,18 @@ kern_rmdirat(struct thread *td, int fd, const char *path, enum uio_seg pathseg) { struct mount *mp; - struct vnode *vp, *dir_vn = NULL; + struct vnode *vp, *dvp = NULL; int error; struct nameidata nd; int vfslocked; restart: - error = kern_get_at(td, fd, &dir_vn); + error = kern_get_at(td, fd, &dvp); if (error && !kern_absolute_path(path, pathseg)) return (error); bwillwrite(); NDINIT_AT(&nd, DELETE, ((error) ? ATBADF : 0) | LOCKPARENT | - LOCKLEAF | MPSAFE | AUDITVNODE1, pathseg, path, td, dir_vn); + LOCKLEAF | MPSAFE | AUDITVNODE1, pathseg, path, td, dvp); if ((error = namei(&nd)) != 0) return (error); vfslocked = NDHASGIANT(&nd); From owner-p4-projects@FreeBSD.ORG Thu Jun 28 11:15:26 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5EAA916A469; Thu, 28 Jun 2007 11:15:26 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 019B916A400 for ; Thu, 28 Jun 2007 11:15:26 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id E591113C45A for ; Thu, 28 Jun 2007 11:15:25 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5SBFPma040404 for ; Thu, 28 Jun 2007 11:15:25 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5SBFPnl040401 for perforce@freebsd.org; Thu, 28 Jun 2007 11:15:25 GMT (envelope-from rdivacky@FreeBSD.org) Date: Thu, 28 Jun 2007 11:15:25 GMT Message-Id: <200706281115.l5SBFPnl040401@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 122475 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Jun 2007 11:15:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=122475 Change 122475 by rdivacky@rdivacky_witten on 2007/06/28 11:14:41 Vrele previously vref-ed vnode in a case of failure of the second kern_get_at. Pointed out by: rwatson Affected files ... .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#36 edit Differences ... ==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#36 (text+ko) ==== @@ -951,7 +951,6 @@ int mode; } */ *uap; { - return kern_open(td, uap->path, UIO_USERSPACE, uap->flags, uap->mode); } @@ -1011,7 +1010,7 @@ } else { error = copyin(path, buf, 1); if (error) - return 0; /* we want to fail */ + return 0; /* We want to fail. */ return (buf[0] == '/'); } } @@ -1050,7 +1049,6 @@ goto out; } flags = FFLAGS(flags); - error = falloc(td, &nfp, &indx); if (error) goto out; @@ -1570,12 +1568,12 @@ enum uio_seg segflg, int follow) { struct nameidata ndp, ndl; - int error; struct vnode *pdvp, *ldvp; struct vnode *vp; struct mount *mp; int vfslocked; int lvfslocked; + int error; error = kern_get_at(td, fd1, &pdvp); if (error && !kern_absolute_path(path1, segflg)) @@ -1585,8 +1583,11 @@ AUDITVNODE1, segflg, path1, td, pdvp); error = kern_get_at(td, fd2, &ldvp); - if (error && !kern_absolute_path(path2, segflg)) + if (error && !kern_absolute_path(path2, segflg)) { + if (pdvp) + vrele(pdvp); return (error); + } NDINIT_AT(&ndl, CREATE, ((error) ? ATBADF : 0) | LOCKPARENT | SAVENAME | MPSAFE | AUDITVNODE1, segflg, path2, td, ldvp); @@ -3769,9 +3770,13 @@ error = kern_get_at(td, oldfd, &frdvp); if (error && !kern_absolute_path(old, pathseg)) return (error); + error = kern_get_at(td, newfd, &todvp); - if (error && !kern_absolute_path(new, pathseg)) + if (error && !kern_absolute_path(new, pathseg)) { + if (frdvp) + vrele(frdvp); return (error); + } #ifdef MAC NDINIT_AT(&fromnd, DELETE, ((error) ? ATBADF : 0) | LOCKPARENT | From owner-p4-projects@FreeBSD.ORG Thu Jun 28 11:21:35 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D6AA916A46C; Thu, 28 Jun 2007 11:21:34 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8601F16A469 for ; Thu, 28 Jun 2007 11:21:34 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 7522413C44B for ; Thu, 28 Jun 2007 11:21:34 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5SBLYpR040938 for ; Thu, 28 Jun 2007 11:21:34 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5SBLYwl040932 for perforce@freebsd.org; Thu, 28 Jun 2007 11:21:34 GMT (envelope-from rdivacky@FreeBSD.org) Date: Thu, 28 Jun 2007 11:21:34 GMT Message-Id: <200706281121.l5SBLYwl040932@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 122476 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Jun 2007 11:21:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=122476 Change 122476 by rdivacky@rdivacky_witten on 2007/06/28 11:20:37 return x -> return (x) Suggested by: rwatson Affected files ... .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#37 edit Differences ... ==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#37 (text+ko) ==== @@ -965,15 +965,15 @@ int openat(struct thread *td, struct openat_args *args) { - return kern_openat(td, args->fd, args->path, UIO_USERSPACE, - args->flag, args->mode); + return (kern_openat(td, args->fd, args->path, UIO_USERSPACE, + args->flag, args->mode)); } int kern_open(struct thread *td, char *path, enum uio_seg pathseg, int flags, int mode) { - return kern_openat(td, AT_FDCWD, (const char *)path, pathseg, flags, mode); + return (kern_openat(td, AT_FDCWD, (const char *)path, pathseg, flags, mode)); } static int @@ -1223,15 +1223,15 @@ int mknodat(struct thread *td, struct mknodat_args *args) { - return kern_mknodat(td, args->fd, args->path, UIO_USERSPACE, args->mode, - args->dev); + return (kern_mknodat(td, args->fd, args->path, UIO_USERSPACE, args->mode, + args->dev)); } int kern_mknod(struct thread *td, char *path, enum uio_seg pathseg, int mode, int dev) { - return kern_mknodat(td, AT_FDCWD, (const char *)path, pathseg, mode, dev); + return (kern_mknodat(td, AT_FDCWD, (const char *)path, pathseg, mode, dev)); } int @@ -1385,13 +1385,13 @@ int mkfifoat(struct thread *td, struct mkfifoat_args *args) { - return kern_mkfifoat(td, args->fd, args->path, UIO_USERSPACE, args->mode); + return (kern_mkfifoat(td, args->fd, args->path, UIO_USERSPACE, args->mode)); } int kern_mkfifo(struct thread *td, char *path, enum uio_seg pathseg, int mode) { - return kern_mkfifoat(td, AT_FDCWD, (const char *)path, pathseg, mode); + return (kern_mkfifoat(td, AT_FDCWD, (const char *)path, pathseg, mode)); } int @@ -1510,11 +1510,11 @@ return (EINVAL); if (args->flag & AT_SYMLINK_FOLLOW) - return kern_linkat(td, args->fd1, args->fd2, args->path1, - args->path2, UIO_USERSPACE, FOLLOW); + return (kern_linkat(td, args->fd1, args->fd2, args->path1, + args->path2, UIO_USERSPACE, FOLLOW)); else - return kern_linkat(td, args->fd1, args->fd2, args->path1, - args->path2, UIO_USERSPACE, 0); + return (kern_linkat(td, args->fd1, args->fd2, args->path1, + args->path2, UIO_USERSPACE, 0)); } static int hardlink_check_uid = 0; @@ -1559,8 +1559,8 @@ int kern_link(struct thread *td, char *path, char *link, enum uio_seg segflg) { - return kern_linkat(td, AT_FDCWD, AT_FDCWD, (const char *)path, - (const char *)link, segflg, FOLLOW); + return (kern_linkat(td, AT_FDCWD, AT_FDCWD, (const char *)path, + (const char *)link, segflg, FOLLOW)); } int @@ -1679,14 +1679,14 @@ int symlinkat(struct thread *td, struct symlinkat_args *args) { - return kern_symlinkat(td, args->path1, args->fd, args->path2, UIO_USERSPACE); + return (kern_symlinkat(td, args->path1, args->fd, args->path2, UIO_USERSPACE)); } int kern_symlink(struct thread *td, char *path, char *link, enum uio_seg segflg) { - return kern_symlinkat(td, (const char *)path, AT_FDCWD, (const char *)link, - segflg); + return (kern_symlinkat(td, (const char *)path, AT_FDCWD, (const char *)link, + segflg)); } int @@ -1857,15 +1857,15 @@ return (EINVAL); if (args->flag & AT_REMOVEDIR) - return kern_rmdirat(td, args->fd, args->path, UIO_USERSPACE); + return (kern_rmdirat(td, args->fd, args->path, UIO_USERSPACE)); else - return kern_unlinkat(td, args->fd, args->path, UIO_USERSPACE); + return (kern_unlinkat(td, args->fd, args->path, UIO_USERSPACE)); } int kern_unlink(struct thread *td, char *path, enum uio_seg pathseg) { - return kern_unlinkat(td, AT_FDCWD, (const char *)path, pathseg); + return (kern_unlinkat(td, AT_FDCWD, (const char *)path, pathseg)); } int @@ -2135,13 +2135,13 @@ if (args->flag & ~AT_EACCESS) return (EINVAL); /* XXX: what about mode? */ - return kern_accessat(td, args->fd, args->path, UIO_USERSPACE, args->flag); + return (kern_accessat(td, args->fd, args->path, UIO_USERSPACE, args->flag)); } int kern_access(struct thread *td, char *path, enum uio_seg pathseg, int flags) { - return kern_accessat(td, AT_FDCWD, (const char *)path, pathseg, flags); + return (kern_accessat(td, AT_FDCWD, (const char *)path, pathseg, flags)); } int @@ -2366,15 +2366,15 @@ return (EINVAL); if (args->flag & AT_SYMLINK_NOFOLLOW) - return kern_lstatat(td, args->fd, args->path, UIO_USERSPACE, args->buf); + return (kern_lstatat(td, args->fd, args->path, UIO_USERSPACE, args->buf)); else - return kern_statat(td, args->fd, args->path, UIO_USERSPACE, args->buf); + return (kern_statat(td, args->fd, args->path, UIO_USERSPACE, args->buf)); } int kern_stat(struct thread *td, char *path, enum uio_seg pathseg, struct stat *sbp) { - return kern_statat(td, AT_FDCWD, (const char *)path, pathseg, sbp); + return (kern_statat(td, AT_FDCWD, (const char *)path, pathseg, sbp)); } int @@ -2443,7 +2443,7 @@ int kern_lstat(struct thread *td, char *path, enum uio_seg pathseg, struct stat *sbp) { - return kern_lstatat(td, AT_FDCWD, (const char *)path, pathseg, sbp); + return (kern_lstatat(td, AT_FDCWD, (const char *)path, pathseg, sbp)); } int @@ -2641,16 +2641,16 @@ ssize_t readlinkat(struct thread *td, struct readlinkat_args *args) { - return kern_readlinkat(td, args->fd, args->path, UIO_USERSPACE, - args->buf, UIO_USERSPACE, args->bufsize); + return (kern_readlinkat(td, args->fd, args->path, UIO_USERSPACE, + args->buf, UIO_USERSPACE, args->bufsize)); } int kern_readlink(struct thread *td, char *path, enum uio_seg pathseg, char *buf, enum uio_seg bufseg, int count) { - return kern_readlinkat(td, AT_FDCWD, (const char *)path, pathseg, buf, - bufseg, count); + return (kern_readlinkat(td, AT_FDCWD, (const char *)path, pathseg, buf, + bufseg, count)); } int @@ -2913,17 +2913,17 @@ return (EINVAL); if (args->flag & AT_SYMLINK_NOFOLLOW) - return kern_lchmodat(td, args->fd, args->path, UIO_USERSPACE, - args->mode); + return (kern_lchmodat(td, args->fd, args->path, UIO_USERSPACE, + args->mode)); else - return kern_chmodat(td, args->fd, args->path, UIO_USERSPACE, - args->mode); + return (kern_chmodat(td, args->fd, args->path, UIO_USERSPACE, + args->mode)); } int kern_chmod(struct thread *td, char *path, enum uio_seg pathseg, int mode) { - return kern_chmodat(td, AT_FDCWD, (const char *)path, pathseg, mode); + return (kern_chmodat(td, AT_FDCWD, (const char *)path, pathseg, mode)); } int @@ -2971,7 +2971,7 @@ int mode; } */ *uap; { - return kern_lchmodat(td, AT_FDCWD, uap->path, UIO_USERSPACE, uap->mode); + return (kern_lchmodat(td, AT_FDCWD, uap->path, UIO_USERSPACE, uap->mode)); } @@ -3102,18 +3102,18 @@ return (EINVAL); if (args->flag & AT_SYMLINK_NOFOLLOW) - return kern_lchownat(td, args->fd, args->path, UIO_USERSPACE, - args->uid, args->gid); + return (kern_lchownat(td, args->fd, args->path, UIO_USERSPACE, + args->uid, args->gid)); else - return kern_chownat(td, args->fd, args->path, UIO_USERSPACE, - args->uid, args->gid); + return (kern_chownat(td, args->fd, args->path, UIO_USERSPACE, + args->uid, args->gid)); } int kern_chown(struct thread *td, char *path, enum uio_seg pathseg, int uid, int gid) { - return kern_chownat(td, AT_FDCWD, (const char *)path, pathseg, uid, gid); + return (kern_chownat(td, AT_FDCWD, (const char *)path, pathseg, uid, gid)); } int @@ -3171,7 +3171,7 @@ kern_lchown(struct thread *td, char *path, enum uio_seg pathseg, int uid, int gid) { - return kern_lchownat(td, AT_FDCWD, (const char *)path, pathseg, uid, gid); + return (kern_lchownat(td, AT_FDCWD, (const char *)path, pathseg, uid, gid)); } int @@ -3346,16 +3346,16 @@ int futimesat(struct thread *td, struct futimesat_args *args) { - return kern_utimesat(td, args->fd, args->path, UIO_USERSPACE, - args->times, UIO_USERSPACE); + return (kern_utimesat(td, args->fd, args->path, UIO_USERSPACE, + args->times, UIO_USERSPACE)); } int kern_utimes(struct thread *td, char *path, enum uio_seg pathseg, struct timeval *tptr, enum uio_seg tptrseg) { - return kern_utimesat(td, AT_FDCWD, (const char *)path, pathseg, - (const struct timeval *)tptr, tptrseg); + return (kern_utimesat(td, AT_FDCWD, (const char *)path, pathseg, + (const struct timeval *)tptr, tptrseg)); } int @@ -3744,15 +3744,15 @@ int renameat(struct thread *td, struct renameat_args *args) { - return kern_renameat(td, args->oldfd, args->old, args->newfd, args->new, - UIO_USERSPACE); + return (kern_renameat(td, args->oldfd, args->old, args->newfd, args->new, + UIO_USERSPACE)); } int kern_rename(struct thread *td, char *from, char *to, enum uio_seg pathseg) { - return kern_renameat(td, AT_FDCWD, (const char *)from, AT_FDCWD, - (const char *)to, pathseg); + return (kern_renameat(td, AT_FDCWD, (const char *)from, AT_FDCWD, + (const char *)to, pathseg)); } int @@ -3921,13 +3921,13 @@ int mkdirat(struct thread *td, struct mkdirat_args *args) { - return kern_mkdirat(td, args->fd, args->path, UIO_USERSPACE, args->mode); + return (kern_mkdirat(td, args->fd, args->path, UIO_USERSPACE, args->mode)); } int kern_mkdir(struct thread *td, char *path, enum uio_seg segflg, int mode) { - return kern_mkdirat(td, AT_FDCWD, (const char *)path, segflg, mode); + return (kern_mkdirat(td, AT_FDCWD, (const char *)path, segflg, mode)); } int @@ -4036,7 +4036,7 @@ int kern_rmdir(struct thread *td, char *path, enum uio_seg pathseg) { - return kern_rmdirat(td, AT_FDCWD, (const char *)path, pathseg); + return (kern_rmdirat(td, AT_FDCWD, (const char *)path, pathseg)); } int From owner-p4-projects@FreeBSD.ORG Thu Jun 28 11:35:52 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B8C3B16A468; Thu, 28 Jun 2007 11:35:52 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 88C1D16A400 for ; Thu, 28 Jun 2007 11:35:52 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 798D713C48C for ; Thu, 28 Jun 2007 11:35:52 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5SBZqqO042262 for ; Thu, 28 Jun 2007 11:35:52 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5SBZqgt042259 for perforce@freebsd.org; Thu, 28 Jun 2007 11:35:52 GMT (envelope-from rdivacky@FreeBSD.org) Date: Thu, 28 Jun 2007 11:35:52 GMT Message-Id: <200706281135.l5SBZqgt042259@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 122477 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Jun 2007 11:35:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=122477 Change 122477 by rdivacky@rdivacky_witten on 2007/06/28 11:35:09 Various fixes suggested by rwatson. Affected files ... .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#38 edit Differences ... ==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#38 (text+ko) ==== @@ -1876,7 +1876,7 @@ int error; struct nameidata nd; int vfslocked; - + restart: if (dvp) vrele(dvp); @@ -2148,12 +2148,12 @@ kern_accessat(struct thread *td, int fd, const char *path, enum uio_seg pathseg, int flags) { - int error; struct nameidata nd; struct vnode *dvp; struct ucred *cred, *tmpcred; struct vnode *vp; int vfslocked; + int error; error = kern_get_at(td, fd, &dvp); if (error && !kern_absolute_path(path, pathseg)) @@ -2400,14 +2400,10 @@ NDFREE(&nd, NDF_ONLY_PNBUF); vput(nd.ni_vp); VFS_UNLOCK_GIANT(vfslocked); - /* dont bother with the path as this is hopefully going away soon */ if (mtx_owned(&Giant)) - printf("stat(%d):\n", vfslocked); - if (error) - goto out; - *sbp = sb; - - error = 0; + printf("stat(%d): %s\n", vfslocked, path); + if (error == 0) + *sbp = sb; out: if (dvp) vrele(dvp); @@ -2461,8 +2457,7 @@ return (error); NDINIT_AT(&nd, LOOKUP, ((error) ? ATBADF : 0) | NOFOLLOW | LOCKLEAF | - LOCKSHARED | AUDITVNODE1 | MPSAFE, pathseg, path, td, dvp); - + LOCKSHARED | MPSAFE | AUDITVNODE1, pathseg, path, td, dvp); if ((error = namei(&nd)) != 0) goto out; vfslocked = NDHASGIANT(&nd); @@ -2471,10 +2466,8 @@ NDFREE(&nd, NDF_ONLY_PNBUF); vput(vp); VFS_UNLOCK_GIANT(vfslocked); - if (error) - goto out; - *sbp = sb; - error = 0; + if (error == 0) + *sbp = sb; out: if (dvp) vrele(dvp); @@ -3371,8 +3364,8 @@ if (error && !kern_absolute_path(path, pathseg)) return (error); - NDINIT_AT(&nd, LOOKUP, ((error) ? ATBADF : 0) | FOLLOW | AUDITVNODE1 | - MPSAFE, pathseg, path, td, dvp); + NDINIT_AT(&nd, LOOKUP, ((error) ? ATBADF : 0) | FOLLOW | MPSAFE | + AUDITVNODE1, pathseg, path, td, dvp); if ((error = getutimes(tptr, tptrseg, ts)) != 0) goto out; From owner-p4-projects@FreeBSD.ORG Thu Jun 28 11:50:12 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 21EE916A469; Thu, 28 Jun 2007 11:50:12 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 87A5016A41F for ; Thu, 28 Jun 2007 11:50:11 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 7750B13C468 for ; Thu, 28 Jun 2007 11:50:11 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5SBoBcB043187 for ; Thu, 28 Jun 2007 11:50:11 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5SBoAsk043177 for perforce@freebsd.org; Thu, 28 Jun 2007 11:50:10 GMT (envelope-from rdivacky@FreeBSD.org) Date: Thu, 28 Jun 2007 11:50:10 GMT Message-Id: <200706281150.l5SBoAsk043177@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 122478 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Jun 2007 11:50:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=122478 Change 122478 by rdivacky@rdivacky_witten on 2007/06/28 11:49:10 Lock Giant in a case of non-MPSAFE fs. Put in some forgotten vrele(dvp)... Affected files ... .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#39 edit Differences ... ==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#39 (text+ko) ==== @@ -994,6 +994,8 @@ *dvpp = NULL; return (ENOTDIR); } + if (VFS_NEEDSGIANT((*dvpp)->v_mount)) + mtx_lock(&Giant); } return (0); @@ -1161,8 +1163,11 @@ VFS_UNLOCK_GIANT(vfslocked); fdclose(fdp, fp, indx, td); fdrop(fp, td); - if (dvp) + if (dvp) { vrele(dvp); + if (VFS_NEEDSGIANT(dvp->v_mount)) + mtx_unlock(&Giant); + } return (error); } @@ -1266,8 +1271,11 @@ if (error) return (error); restart: - if (dvp) + if (dvp) { vrele(dvp); + if (VFS_NEEDSGIANT(dvp->v_mount)) + mtx_unlock(&Giant); + } error = kern_get_at(td, fd, &dvp); if (error && !kern_absolute_path(path, pathseg)) return (error); @@ -1345,8 +1353,11 @@ vput(nd.ni_vp); } } - if (dvp) + if (dvp) { vrele(dvp); + if (VFS_NEEDSGIANT(dvp->v_mount)) + mtx_unlock(&Giant); + } NDFREE(&nd, NDF_ONLY_PNBUF); vput(nd.ni_dvp); vn_finished_write(mp); @@ -1407,8 +1418,11 @@ AUDIT_ARG(mode, mode); restart: - if (dvp) + if (dvp) { vrele(dvp); + if (VFS_NEEDSGIANT(dvp->v_mount)) + mtx_unlock(&Giant); + } error = kern_get_at(td, fd, &dvp); if (error && !kern_absolute_path(path, pathseg)) return (error); @@ -1462,8 +1476,11 @@ #ifdef MAC out: #endif - if (dvp) + if (dvp) { vrele(dvp); + if (VFS_NEEDSGIANT(dvp->v_mount)) + mtx_unlock(&Giant); + } vput(nd.ni_dvp); vn_finished_write(mp); VFS_UNLOCK_GIANT(vfslocked); @@ -1584,7 +1601,10 @@ error = kern_get_at(td, fd2, &ldvp); if (error && !kern_absolute_path(path2, segflg)) { - if (pdvp) + if (pdvp) { + if (VFS_NEEDSGIANT(pdvp->v_mount)) + mtx_unlock(&Giant); + } vrele(pdvp); return (error); } @@ -1641,10 +1661,16 @@ VFS_UNLOCK_GIANT(vfslocked); out: - if (pdvp) + if (pdvp) { vrele(pdvp); - if (ldvp) + if (VFS_NEEDSGIANT(pdvp->v_mount)) + mtx_unlock(&Giant); + } + if (ldvp) { vrele(ldvp); + if (VFS_NEEDSGIANT(ldvp->v_mount)) + mtx_unlock(&Giant); + } return (error); } @@ -1710,8 +1736,11 @@ } AUDIT_ARG(text, syspath); restart: - if (dvp) + if (dvp) { vrele(dvp); + if (VFS_NEEDSGIANT(dvp->v_mount)) + mtx_unlock(&Giant); + } error = kern_get_at(td, fd, &dvp); if (error && !kern_absolute_path(path2, segflg)) return (error); @@ -1763,8 +1792,11 @@ vn_finished_write(mp); VFS_UNLOCK_GIANT(vfslocked); out: - if (dvp) + if (dvp) { vrele(dvp); + if (VFS_NEEDSGIANT(dvp->v_mount)) + mtx_unlock(&Giant); + } if (segflg != UIO_SYSSPACE) uma_zfree(namei_zone, syspath); return (error); @@ -1878,8 +1910,11 @@ int vfslocked; restart: - if (dvp) + if (dvp) { vrele(dvp); + if (VFS_NEEDSGIANT(dvp->v_mount)) + mtx_unlock(&Giant); + } error = kern_get_at(td, fd, &dvp); if (error && !kern_absolute_path(path, pathseg)) return (error); @@ -1936,8 +1971,11 @@ } NDFREE(&nd, NDF_ONLY_PNBUF); vput(nd.ni_dvp); - if (dvp) + if (dvp) { vrele(dvp); + if (VFS_NEEDSGIANT(dvp->v_mount)) + mtx_unlock(&Giant); + } if (vp == nd.ni_dvp) vrele(vp); else @@ -2189,8 +2227,11 @@ out: td->td_ucred = cred; crfree(tmpcred); - if (dvp) + if (dvp) { vrele(dvp); + if (VFS_NEEDSGIANT(dvp->v_mount)) + mtx_unlock(&Giant); + } return (error); } @@ -2405,8 +2446,11 @@ if (error == 0) *sbp = sb; out: - if (dvp) + if (dvp) { vrele(dvp); + if (VFS_NEEDSGIANT(dvp->v_mount)) + mtx_unlock(&Giant); + } return (error); } @@ -2469,8 +2513,11 @@ if (error == 0) *sbp = sb; out: - if (dvp) + if (dvp) { vrele(dvp); + if (VFS_NEEDSGIANT(dvp->v_mount)) + mtx_unlock(&Giant); + } return (error); } @@ -2695,8 +2742,11 @@ VFS_UNLOCK_GIANT(vfslocked); td->td_retval[0] = count - auio.uio_resid; out: - if (dvp) + if (dvp) { vrele(dvp); + if (VFS_NEEDSGIANT(dvp->v_mount)) + mtx_unlock(&Giant); + } return (error); } @@ -2942,8 +2992,11 @@ vrele(nd.ni_vp); VFS_UNLOCK_GIANT(vfslocked); out: - if (dvp) + if (dvp) { vrele(dvp); + if (VFS_NEEDSGIANT(dvp->v_mount)) + mtx_unlock(&Giant); + } return (error); } @@ -2991,6 +3044,12 @@ error = setfmode(td, nd.ni_vp, mode); vrele(nd.ni_vp); VFS_UNLOCK_GIANT(vfslocked); + if (dvp) { + vrele(dvp); + if (VFS_NEEDSGIANT(dvp->v_mount)) + mtx_unlock(&Giant); + } + return (error); } @@ -3132,8 +3191,11 @@ vrele(nd.ni_vp); VFS_UNLOCK_GIANT(vfslocked); out: - if (dvp) + if (dvp) { vrele(dvp); + if (VFS_NEEDSGIANT(dvp->v_mount)) + mtx_unlock(&Giant); + } return (error); } @@ -3190,8 +3252,11 @@ vrele(nd.ni_vp); VFS_UNLOCK_GIANT(vfslocked); out: - if (dvp) + if (dvp) { vrele(dvp); + if (VFS_NEEDSGIANT(dvp->v_mount)) + mtx_unlock(&Giant); + } return (error); } @@ -3377,8 +3442,11 @@ vrele(nd.ni_vp); VFS_UNLOCK_GIANT(vfslocked); out: - if (dvp) + if (dvp) { vrele(dvp); + if (VFS_NEEDSGIANT(dvp->v_mount)) + mtx_unlock(&Giant); + } return (error); } @@ -3766,7 +3834,10 @@ error = kern_get_at(td, newfd, &todvp); if (error && !kern_absolute_path(new, pathseg)) { - if (frdvp) + if (frdvp) { + if (VFS_NEEDSGIANT(frdvp->v_mount)) + mtx_unlock(&Giant); + } vrele(frdvp); return (error); } @@ -3875,11 +3946,16 @@ if (error == -1) return (0); out2: - if (frdvp) + if (frdvp) { vrele(frdvp); - if (todvp) + if (VFS_NEEDSGIANT(frdvp->v_mount)) + mtx_unlock(&Giant); + } + if (todvp) { vrele(todvp); - + if (VFS_NEEDSGIANT(todvp->v_mount)) + mtx_unlock(&Giant); + } return (error); } @@ -3936,8 +4012,11 @@ AUDIT_ARG(mode, mode); restart: - if (dvp) + if (dvp) { vrele(dvp); + if (VFS_NEEDSGIANT(dvp->v_mount)) + mtx_unlock(&Giant); + } error = kern_get_at(td, fd, &dvp); if (error && !kern_absolute_path(path, segflg)) return (error); @@ -3996,8 +4075,11 @@ #ifdef MAC out: #endif - if (dvp) + if (dvp) { vrele(dvp); + if (VFS_NEEDSGIANT(dvp->v_mount)) + mtx_unlock(&Giant); + } NDFREE(&nd, NDF_ONLY_PNBUF); vput(nd.ni_dvp); if (!error) @@ -4042,6 +4124,11 @@ int vfslocked; restart: + if (dvp) { + vrele(dvp); + if (VFS_NEEDSGIANT(dvp->v_mount)) + mtx_unlock(&Giant); + } error = kern_get_at(td, fd, &dvp); if (error && !kern_absolute_path(path, pathseg)) return (error); @@ -4095,6 +4182,11 @@ out: NDFREE(&nd, NDF_ONLY_PNBUF); vput(vp); + if (dvp) { + vrele(dvp); + if (VFS_NEEDSGIANT(dvp->v_mount)) + mtx_unlock(&Giant); + } if (nd.ni_dvp == vp) vrele(nd.ni_dvp); else From owner-p4-projects@FreeBSD.ORG Thu Jun 28 12:05:31 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9B38216A475; Thu, 28 Jun 2007 12:05:31 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5023216A41F for ; Thu, 28 Jun 2007 12:05:31 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 40C6113C44B for ; Thu, 28 Jun 2007 12:05:31 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5SC5VnQ045559 for ; Thu, 28 Jun 2007 12:05:31 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5SC5Ukp045556 for perforce@freebsd.org; Thu, 28 Jun 2007 12:05:30 GMT (envelope-from rdivacky@FreeBSD.org) Date: Thu, 28 Jun 2007 12:05:30 GMT Message-Id: <200706281205.l5SC5Ukp045556@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 122479 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Jun 2007 12:05:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=122479 Change 122479 by rdivacky@rdivacky_witten on 2007/06/28 12:04:32 Initialize dvp's to NULL to prevent panic... also vrele before unlocking Giant. Affected files ... .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#40 edit Differences ... ==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#40 (text+ko) ==== @@ -1585,7 +1585,7 @@ enum uio_seg segflg, int follow) { struct nameidata ndp, ndl; - struct vnode *pdvp, *ldvp; + struct vnode *pdvp = NULL, *ldvp = NULL; struct vnode *vp; struct mount *mp; int vfslocked; @@ -1602,10 +1602,10 @@ error = kern_get_at(td, fd2, &ldvp); if (error && !kern_absolute_path(path2, segflg)) { if (pdvp) { + vrele(pdvp); if (VFS_NEEDSGIANT(pdvp->v_mount)) mtx_unlock(&Giant); } - vrele(pdvp); return (error); } @@ -3821,7 +3821,7 @@ const char *new, enum uio_seg pathseg) { struct nameidata fromnd, tond; - struct vnode *frdvp, *todvp; + struct vnode *frdvp = NULL, *todvp = NULL; struct mount *mp = NULL; struct vnode *tvp, *fvp, *tdvp; int tvfslocked; @@ -3835,10 +3835,10 @@ error = kern_get_at(td, newfd, &todvp); if (error && !kern_absolute_path(new, pathseg)) { if (frdvp) { + vrele(frdvp); if (VFS_NEEDSGIANT(frdvp->v_mount)) mtx_unlock(&Giant); } - vrele(frdvp); return (error); } From owner-p4-projects@FreeBSD.ORG Thu Jun 28 12:14:43 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9834816A46C; Thu, 28 Jun 2007 12:14:43 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6AFCD16A41F for ; Thu, 28 Jun 2007 12:14:43 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 5B78413C448 for ; Thu, 28 Jun 2007 12:14:43 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5SCEhOT046330 for ; Thu, 28 Jun 2007 12:14:43 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5SCEhFq046327 for perforce@freebsd.org; Thu, 28 Jun 2007 12:14:43 GMT (envelope-from rdivacky@FreeBSD.org) Date: Thu, 28 Jun 2007 12:14:43 GMT Message-Id: <200706281214.l5SCEhFq046327@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 122480 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Jun 2007 12:14:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=122480 Change 122480 by rdivacky@rdivacky_witten on 2007/06/28 12:14:14 vrele AFTER checking the vp for being on non-MPSAFE FS + some indentation problems that caused bad scoping Noticed by: rwatson (again ;) ) Affected files ... .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#41 edit Differences ... ==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#41 (text+ko) ==== @@ -1164,9 +1164,9 @@ fdclose(fdp, fp, indx, td); fdrop(fp, td); if (dvp) { - vrele(dvp); if (VFS_NEEDSGIANT(dvp->v_mount)) mtx_unlock(&Giant); + vrele(dvp); } return (error); } @@ -1272,9 +1272,9 @@ return (error); restart: if (dvp) { - vrele(dvp); if (VFS_NEEDSGIANT(dvp->v_mount)) mtx_unlock(&Giant); + vrele(dvp); } error = kern_get_at(td, fd, &dvp); if (error && !kern_absolute_path(path, pathseg)) @@ -1354,9 +1354,9 @@ } } if (dvp) { - vrele(dvp); if (VFS_NEEDSGIANT(dvp->v_mount)) mtx_unlock(&Giant); + vrele(dvp); } NDFREE(&nd, NDF_ONLY_PNBUF); vput(nd.ni_dvp); @@ -1419,9 +1419,9 @@ AUDIT_ARG(mode, mode); restart: if (dvp) { - vrele(dvp); if (VFS_NEEDSGIANT(dvp->v_mount)) mtx_unlock(&Giant); + vrele(dvp); } error = kern_get_at(td, fd, &dvp); if (error && !kern_absolute_path(path, pathseg)) @@ -1477,9 +1477,9 @@ out: #endif if (dvp) { - vrele(dvp); if (VFS_NEEDSGIANT(dvp->v_mount)) mtx_unlock(&Giant); + vrele(dvp); } vput(nd.ni_dvp); vn_finished_write(mp); @@ -1602,10 +1602,10 @@ error = kern_get_at(td, fd2, &ldvp); if (error && !kern_absolute_path(path2, segflg)) { if (pdvp) { - vrele(pdvp); if (VFS_NEEDSGIANT(pdvp->v_mount)) mtx_unlock(&Giant); - } + vrele(pdvp); + } return (error); } @@ -1662,14 +1662,14 @@ out: if (pdvp) { - vrele(pdvp); if (VFS_NEEDSGIANT(pdvp->v_mount)) mtx_unlock(&Giant); + vrele(pdvp); } if (ldvp) { - vrele(ldvp); if (VFS_NEEDSGIANT(ldvp->v_mount)) mtx_unlock(&Giant); + vrele(ldvp); } return (error); } @@ -1737,9 +1737,9 @@ AUDIT_ARG(text, syspath); restart: if (dvp) { - vrele(dvp); if (VFS_NEEDSGIANT(dvp->v_mount)) mtx_unlock(&Giant); + vrele(dvp); } error = kern_get_at(td, fd, &dvp); if (error && !kern_absolute_path(path2, segflg)) @@ -1793,9 +1793,9 @@ VFS_UNLOCK_GIANT(vfslocked); out: if (dvp) { - vrele(dvp); if (VFS_NEEDSGIANT(dvp->v_mount)) mtx_unlock(&Giant); + vrele(dvp); } if (segflg != UIO_SYSSPACE) uma_zfree(namei_zone, syspath); @@ -1911,9 +1911,9 @@ restart: if (dvp) { - vrele(dvp); if (VFS_NEEDSGIANT(dvp->v_mount)) mtx_unlock(&Giant); + vrele(dvp); } error = kern_get_at(td, fd, &dvp); if (error && !kern_absolute_path(path, pathseg)) @@ -1972,9 +1972,9 @@ NDFREE(&nd, NDF_ONLY_PNBUF); vput(nd.ni_dvp); if (dvp) { - vrele(dvp); if (VFS_NEEDSGIANT(dvp->v_mount)) mtx_unlock(&Giant); + vrele(dvp); } if (vp == nd.ni_dvp) vrele(vp); @@ -2228,9 +2228,9 @@ td->td_ucred = cred; crfree(tmpcred); if (dvp) { - vrele(dvp); if (VFS_NEEDSGIANT(dvp->v_mount)) mtx_unlock(&Giant); + vrele(dvp); } return (error); } @@ -2447,9 +2447,9 @@ *sbp = sb; out: if (dvp) { - vrele(dvp); if (VFS_NEEDSGIANT(dvp->v_mount)) mtx_unlock(&Giant); + vrele(dvp); } return (error); } @@ -2514,9 +2514,9 @@ *sbp = sb; out: if (dvp) { - vrele(dvp); if (VFS_NEEDSGIANT(dvp->v_mount)) mtx_unlock(&Giant); + vrele(dvp); } return (error); } @@ -2743,9 +2743,9 @@ td->td_retval[0] = count - auio.uio_resid; out: if (dvp) { - vrele(dvp); if (VFS_NEEDSGIANT(dvp->v_mount)) mtx_unlock(&Giant); + vrele(dvp); } return (error); } @@ -2993,9 +2993,9 @@ VFS_UNLOCK_GIANT(vfslocked); out: if (dvp) { - vrele(dvp); if (VFS_NEEDSGIANT(dvp->v_mount)) mtx_unlock(&Giant); + vrele(dvp); } return (error); } @@ -3045,9 +3045,9 @@ vrele(nd.ni_vp); VFS_UNLOCK_GIANT(vfslocked); if (dvp) { - vrele(dvp); if (VFS_NEEDSGIANT(dvp->v_mount)) mtx_unlock(&Giant); + vrele(dvp); } return (error); @@ -3192,9 +3192,9 @@ VFS_UNLOCK_GIANT(vfslocked); out: if (dvp) { - vrele(dvp); if (VFS_NEEDSGIANT(dvp->v_mount)) mtx_unlock(&Giant); + vrele(dvp); } return (error); } @@ -3253,9 +3253,9 @@ VFS_UNLOCK_GIANT(vfslocked); out: if (dvp) { - vrele(dvp); if (VFS_NEEDSGIANT(dvp->v_mount)) mtx_unlock(&Giant); + vrele(dvp); } return (error); } @@ -3443,9 +3443,9 @@ VFS_UNLOCK_GIANT(vfslocked); out: if (dvp) { - vrele(dvp); if (VFS_NEEDSGIANT(dvp->v_mount)) mtx_unlock(&Giant); + vrele(dvp); } return (error); } @@ -3835,10 +3835,10 @@ error = kern_get_at(td, newfd, &todvp); if (error && !kern_absolute_path(new, pathseg)) { if (frdvp) { - vrele(frdvp); if (VFS_NEEDSGIANT(frdvp->v_mount)) mtx_unlock(&Giant); - } + vrele(frdvp); + } return (error); } @@ -3947,14 +3947,14 @@ return (0); out2: if (frdvp) { - vrele(frdvp); if (VFS_NEEDSGIANT(frdvp->v_mount)) mtx_unlock(&Giant); + vrele(frdvp); } if (todvp) { - vrele(todvp); if (VFS_NEEDSGIANT(todvp->v_mount)) mtx_unlock(&Giant); + vrele(todvp); } return (error); } @@ -4013,9 +4013,9 @@ AUDIT_ARG(mode, mode); restart: if (dvp) { - vrele(dvp); if (VFS_NEEDSGIANT(dvp->v_mount)) mtx_unlock(&Giant); + vrele(dvp); } error = kern_get_at(td, fd, &dvp); if (error && !kern_absolute_path(path, segflg)) @@ -4076,9 +4076,9 @@ out: #endif if (dvp) { - vrele(dvp); if (VFS_NEEDSGIANT(dvp->v_mount)) mtx_unlock(&Giant); + vrele(dvp); } NDFREE(&nd, NDF_ONLY_PNBUF); vput(nd.ni_dvp); @@ -4125,9 +4125,9 @@ restart: if (dvp) { - vrele(dvp); if (VFS_NEEDSGIANT(dvp->v_mount)) mtx_unlock(&Giant); + vrele(dvp); } error = kern_get_at(td, fd, &dvp); if (error && !kern_absolute_path(path, pathseg)) @@ -4183,9 +4183,9 @@ NDFREE(&nd, NDF_ONLY_PNBUF); vput(vp); if (dvp) { - vrele(dvp); if (VFS_NEEDSGIANT(dvp->v_mount)) mtx_unlock(&Giant); + vrele(dvp); } if (nd.ni_dvp == vp) vrele(nd.ni_dvp); From owner-p4-projects@FreeBSD.ORG Thu Jun 28 12:50:28 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BC51B16A469; Thu, 28 Jun 2007 12:50:28 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9095216A41F for ; Thu, 28 Jun 2007 12:50:28 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 80AC713C448 for ; Thu, 28 Jun 2007 12:50:28 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5SCoSSZ063080 for ; Thu, 28 Jun 2007 12:50:28 GMT (envelope-from lulf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5SCoSHh063077 for perforce@freebsd.org; Thu, 28 Jun 2007 12:50:28 GMT (envelope-from lulf@FreeBSD.org) Date: Thu, 28 Jun 2007 12:50:28 GMT Message-Id: <200706281250.l5SCoSHh063077@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lulf@FreeBSD.org using -f From: Ulf Lilleengen To: Perforce Change Reviews Cc: Subject: PERFORCE change 122482 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Jun 2007 12:50:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=122482 Change 122482 by lulf@lulf_carrot on 2007/06/28 12:50:06 - Add support for 'move' command in the new event system. - Rework the move code to use the new event system, error codes, and other small fixes. - Add a move event. Affected files ... .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum.c#23 edit .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum.h#18 edit .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_move.c#2 edit .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_var.h#19 edit Differences ... ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum.c#23 (text+ko) ==== @@ -433,10 +433,8 @@ } else if (!strcmp(verb, "create")) { gv_create(gp, req); -#if 0 } else if (!strcmp(verb, "move")) { gv_move(gp, req); -#endif } else if (!strcmp(verb, "rebuildparity") || !strcmp(verb, "checkparity")) { @@ -799,6 +797,18 @@ g_free(newname); break; + case GV_EVENT_MOVE_SD: + printf("VINUM: event 'move'\n"); + s = ev->arg1; + d = ev->arg2; + flags = ev->arg3; + err = gv_move_sd(sc, s, d, flags); + if (err) + printf("VINUM: error moving %s to %s: " + " error code %d\n", s->name, + d->name, err); + break; + case GV_EVENT_THREAD_EXIT: printf("VINUM: event 'thread exit'\n"); g_free(ev); ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum.h#18 (text+ko) ==== @@ -46,6 +46,7 @@ /* geom_vinum_move.c */ void gv_move(struct g_geom *, struct gctl_req *); +int gv_move_sd(struct gv_softc *, struct gv_sd *, struct gv_drive *, int); /* geom_vinum_rename.c */ void gv_rename(struct g_geom *, struct gctl_req *); ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_move.c#2 (text+ko) ==== @@ -42,17 +42,15 @@ #include #include -#if 0 -static int gv_move_sd(struct gv_softc *, struct gctl_req *, - struct gv_sd *, char *, int); void gv_move(struct g_geom *gp, struct gctl_req *req) { struct gv_softc *sc; struct gv_sd *s; + struct gv_drive *d; char buf[20], *destination, *object; - int *argc, err, *flags, i, type; + int *argc, *flags, i, type; sc = gp->softc; @@ -67,6 +65,7 @@ gctl_error(req, "destination '%s' is not a drive", destination); return; } + d = gv_find_drive(sc, destination); /* * We start with 1 here, because argv[0] on the command line is the @@ -90,68 +89,58 @@ gctl_error(req, "unknown subdisk '%s'", object); return; } - err = gv_move_sd(sc, req, s, destination, *flags); - if (err) - return; + gv_post_event(sc, GV_EVENT_MOVE_SD, s, d, *flags, 0); } - - gv_save_config_all(sc); } /* Move a subdisk. */ -static int -gv_move_sd(struct gv_softc *sc, struct gctl_req *req, struct gv_sd *cursd, char *destination, int flags) +int +gv_move_sd(struct gv_softc *sc, struct gv_sd *cursd, + struct gv_drive *destination, int flags) { struct gv_drive *d; struct gv_sd *newsd, *s, *s2; struct gv_plex *p; - struct g_consumer *cp; - char errstr[ERRBUFSIZ]; int err; g_topology_assert(); KASSERT(cursd != NULL, ("gv_move_sd: NULL cursd")); + KASSERT(destination != NULL, ("gv_move_sd: NULL destination")); - cp = cursd->consumer; + d = cursd->drive_sc; - if (cp != NULL && (cp->acr || cp->acw || cp->ace)) { - gctl_error(req, "subdisk '%s' is busy", cursd->name); - return (-1); + if (gv_consumer_is_open(d->consumer) || + gv_consumer_is_open(destination->consumer)) { + printf("VINUM: consumers on current and destination drive " + " still open"); + return (GV_ERR_ISOPEN); } - if (!(flags && GV_FLAG_F)) { - gctl_error(req, "-f flag not passed; move would be " - "destructive"); - return (-1); + printf("VINUM: -f flag not passed; move would be " + "destructive\n"); + return (GV_ERR_INVFLAG); } - d = gv_find_drive(sc, destination); - if (d == NULL) { - gctl_error(req, "destination drive '%s' not found", - destination); - return (-1); + if (destination == cursd->drive_sc) { + printf("VINUM: subdisk '%s' already on drive '%s'\n", + cursd->name, destination->name); + return (GV_ERR_ISATTACHED); } - if (d == cursd->drive_sc) { - gctl_error(req, "subdisk '%s' already on drive '%s'", - cursd->name, destination); - return (-1); - } - /* XXX: Does it have to be part of a plex? */ p = gv_find_plex(sc, cursd->plex); if (p == NULL) { - gctl_error(req, "subdisk '%s' is not part of a plex", + printf("VINUM: subdisk '%s' is not part of a plex\n", cursd->name); - return (-1); + return (GV_ERR_NOTFOUND); } - + /* Stale the old subdisk. */ err = gv_set_sd_state(cursd, GV_SD_STALE, GV_SETSTATE_FORCE | GV_SETSTATE_CONFIG); if (err) { - gctl_error(req, "could not set the subdisk '%s' to state " - "'stale'", cursd->name); + printf("VINUM: could not set the subdisk '%s' to state " + "'stale'\n", cursd->name); return (err); } @@ -164,55 +153,27 @@ newsd->plex_offset = cursd->plex_offset; newsd->size = cursd->size; newsd->drive_offset = -1; - strncpy(newsd->name, cursd->name, GV_MAXSDNAME); - strncpy(newsd->drive, destination, GV_MAXDRIVENAME); - strncpy(newsd->plex, cursd->plex, GV_MAXPLEXNAME); + strlcpy(newsd->name, cursd->name, GV_MAXSDNAME); + strlcpy(newsd->drive, destination->name, GV_MAXDRIVENAME); + strlcpy(newsd->plex, cursd->plex, GV_MAXPLEXNAME); newsd->state = GV_SD_STALE; newsd->vinumconf = cursd->vinumconf; - err = gv_sd_to_drive(sc, d, newsd, errstr, ERRBUFSIZ); + err = gv_sd_to_drive(newsd, destination); if (err) { /* XXX not enough free space? */ - gctl_error(req, errstr); g_free(newsd); return (err); } /* Replace the old sd by the new one. */ - if (cp != NULL) - g_detach(cp); LIST_FOREACH_SAFE(s, &p->subdisks, in_plex, s2) { if (s == cursd) { - p->sdcount--; - p->size -= s->size; - err = gv_rm_sd(sc, req, s, 0); - if (err) - return (err); - + gv_rm_sd(sc, s); } } - - gv_sd_to_plex(p, newsd, 1); - - /* Creates the new providers.... */ - gv_drive_modify(d); - - /* And reconnect the consumer ... */ - if (cp != NULL) { - newsd->consumer = cp; - err = g_attach(cp, newsd->provider); - if (err) { - g_destroy_consumer(cp); - gctl_error(req, "proposed move would create a loop " - "in GEOM config"); - return (err); - } - } - + gv_sd_to_plex(newsd, p); LIST_INSERT_HEAD(&sc->subdisks, newsd, sd); - gv_save_config_all(sc); - return (0); } -#endif ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_var.h#19 (text+ko) ==== @@ -204,6 +204,7 @@ #define GV_EVENT_RENAME_PLEX 27 #define GV_EVENT_RENAME_SD 28 #define GV_EVENT_RENAME_DRIVE 29 +#define GV_EVENT_MOVE_SD 30 struct gv_event { int type; From owner-p4-projects@FreeBSD.ORG Thu Jun 28 13:01:46 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1A69216A517; Thu, 28 Jun 2007 13:01:45 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 91F2016A473 for ; Thu, 28 Jun 2007 13:01:45 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 826F113C448 for ; Thu, 28 Jun 2007 13:01:45 +0000 (UTC) (envelope-from lulf@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5SD1j2T064448 for ; Thu, 28 Jun 2007 13:01:45 GMT (envelope-from lulf@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5SD1jiS064445 for perforce@freebsd.org; Thu, 28 Jun 2007 13:01:45 GMT (envelope-from lulf@FreeBSD.org) Date: Thu, 28 Jun 2007 13:01:45 GMT Message-Id: <200706281301.l5SD1jiS064445@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to lulf@FreeBSD.org using -f From: Ulf Lilleengen To: Perforce Change Reviews Cc: Subject: PERFORCE change 122486 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Jun 2007 13:01:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=122486 Change 122486 by lulf@lulf_carrot on 2007/06/28 13:00:56 - Style(9) changes. - Add comment. Affected files ... .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_events.c#6 edit .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_move.c#3 edit .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_rm.c#8 edit .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_subr.c#14 edit .. //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_volume.c#10 edit Differences ... ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_events.c#6 (text+ko) ==== @@ -148,8 +148,6 @@ g_detach(cp); g_destroy_consumer(cp); g_topology_unlock(); - - return; } /* ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_move.c#3 (text+ko) ==== @@ -109,12 +109,14 @@ d = cursd->drive_sc; + /* XXX: Can't do a move without unmounting. Perhaps okay. */ if (gv_consumer_is_open(d->consumer) || gv_consumer_is_open(destination->consumer)) { printf("VINUM: consumers on current and destination drive " - " still open"); + " still open\n"); return (GV_ERR_ISOPEN); } + if (!(flags && GV_FLAG_F)) { printf("VINUM: -f flag not passed; move would be " "destructive\n"); ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_rm.c#8 (text+ko) ==== @@ -217,8 +217,6 @@ g_orphan_provider(pp, ENXIO); g_topology_unlock(); } - - return; } /* Remove a plex. */ @@ -256,8 +254,6 @@ } g_free(p); - - return; } /* Remove a subdisk. */ @@ -290,8 +286,6 @@ LIST_REMOVE(s, sd); gv_free_sd(s); g_free(s); - - return; } /* Remove a drive. */ @@ -357,6 +351,4 @@ g_free(d); gv_save_config(sc); - - return; } ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_subr.c#14 (text+ko) ==== @@ -227,8 +227,6 @@ sbuf_printf(sb, " state %s", gv_sdstate(s->state)); sbuf_printf(sb, "\n"); } - - return; } static off_t ==== //depot/projects/soc2007/lulf/gvinum_fixup/sys/geom/vinum/geom_vinum_volume.c#10 (text+ko) ==== @@ -115,8 +115,6 @@ } break; } - - return; } void From owner-p4-projects@FreeBSD.ORG Thu Jun 28 13:01:47 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 013A516A492; Thu, 28 Jun 2007 13:01:46 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 26FD516A521 for ; Thu, 28 Jun 2007 13:01:45 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id D79C713C44B for ; Thu, 28 Jun 2007 13:01:45 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5SD1jOm064455 for ; Thu, 28 Jun 2007 13:01:45 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5SD1jhl064451 for perforce@freebsd.org; Thu, 28 Jun 2007 13:01:45 GMT (envelope-from rdivacky@FreeBSD.org) Date: Thu, 28 Jun 2007 13:01:45 GMT Message-Id: <200706281301.l5SD1jhl064451@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 122487 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Jun 2007 13:01:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=122487 Change 122487 by rdivacky@rdivacky_witten on 2007/06/28 13:01:09 Use vn_fullpath to get the name of the binary and stuff that into p_comm. Affected files ... .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_exec.c#6 edit Differences ... ==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_exec.c#6 (text+ko) ==== @@ -304,7 +304,7 @@ struct ucred *newcred = NULL, *oldcred; struct uidinfo *euip; register_t *stack_base; - int error, len, i; + int error, len = 0, i; struct image_params image_params, *imgp; struct vattr attr; int (*img_first)(struct image_params *); @@ -560,8 +560,16 @@ len = min(ndp->ni_cnd.cn_namelen,MAXCOMLEN); bcopy(ndp->ni_cnd.cn_nameptr, p->p_comm, len); } else { - len = 10; - bcopy("fexec neco", p->p_comm, 10); + char *freepath; + char *fullpath = NULL; + + error = vn_fullpath(td, binvp, &fullpath, &freepath); + if (error == 0) { + len = min(strlen(fullpath), MAXCOMLEN); + bcopy(fullpath, p->p_comm, len); + if (freepath) + free(freepath, M_TEMP); + } } p->p_comm[len] = 0; From owner-p4-projects@FreeBSD.ORG Thu Jun 28 13:05:52 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 262BE16A46D; Thu, 28 Jun 2007 13:05:52 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D395316A400 for ; Thu, 28 Jun 2007 13:05:51 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id AC46E13C44C for ; Thu, 28 Jun 2007 13:05:51 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5SD5pTG065895 for ; Thu, 28 Jun 2007 13:05:51 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5SD5p1N065892 for perforce@freebsd.org; Thu, 28 Jun 2007 13:05:51 GMT (envelope-from rdivacky@FreeBSD.org) Date: Thu, 28 Jun 2007 13:05:51 GMT Message-Id: <200706281305.l5SD5p1N065892@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 122488 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Jun 2007 13:05:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=122488 Change 122488 by rdivacky@rdivacky_witten on 2007/06/28 13:05:19 Wrong indentation of a brace. Affected files ... .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_exec.c#7 edit Differences ... ==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_exec.c#7 (text+ko) ==== @@ -569,7 +569,7 @@ bcopy(fullpath, p->p_comm, len); if (freepath) free(freepath, M_TEMP); - } + } } p->p_comm[len] = 0; From owner-p4-projects@FreeBSD.ORG Thu Jun 28 16:00:32 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 825F316A46C; Thu, 28 Jun 2007 16:00:32 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 366A416A421 for ; Thu, 28 Jun 2007 16:00:32 +0000 (UTC) (envelope-from thioretic@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 2602013C455 for ; Thu, 28 Jun 2007 16:00:32 +0000 (UTC) (envelope-from thioretic@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5SG0W6M003393 for ; Thu, 28 Jun 2007 16:00:32 GMT (envelope-from thioretic@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5SG0V3b003388 for perforce@freebsd.org; Thu, 28 Jun 2007 16:00:31 GMT (envelope-from thioretic@FreeBSD.org) Date: Thu, 28 Jun 2007 16:00:31 GMT Message-Id: <200706281600.l5SG0V3b003388@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thioretic@FreeBSD.org using -f From: Maxim Zhuravlev To: Perforce Change Reviews Cc: Subject: PERFORCE change 122490 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Jun 2007 16:00:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=122490 Change 122490 by thioretic@thioretic on 2007/06/28 16:00:06 Start drivers stack namespace implementation Affected files ... .. //depot/projects/soc2007/thioretic_gidl/TODO#3 edit .. //depot/projects/soc2007/thioretic_gidl/kern/sns_drivers.c#1 add .. //depot/projects/soc2007/thioretic_gidl/kern/stackns_if.m#2 edit Differences ... ==== //depot/projects/soc2007/thioretic_gidl/TODO#3 (text+ko) ==== @@ -43,3 +43,6 @@ # [int state] lets drivers to influence on i/o request # lifecycle. # ... +3. Implement *drivers* stack namespace. + SOLUTION: define stack namespace methods suitable for drivers + FILE(S) AFFECTED: kern/sns_drivers.c ==== //depot/projects/soc2007/thioretic_gidl/kern/stackns_if.m#2 (text+ko) ==== @@ -1,5 +1,7 @@ #include +INTERFACE stackns; + /** * exact args type is defined by namespace itself */ From owner-p4-projects@FreeBSD.ORG Thu Jun 28 17:13:05 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5BCE816A469; Thu, 28 Jun 2007 17:13:05 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 013C916A400 for ; Thu, 28 Jun 2007 17:13:05 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id E523D13C455 for ; Thu, 28 Jun 2007 17:13:04 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5SHD4Jm031729 for ; Thu, 28 Jun 2007 17:13:04 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5SHD4b1031726 for perforce@freebsd.org; Thu, 28 Jun 2007 17:13:04 GMT (envelope-from kmacy@freebsd.org) Date: Thu, 28 Jun 2007 17:13:04 GMT Message-Id: <200706281713.l5SHD4b1031726@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 122495 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Jun 2007 17:13:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=122495 Change 122495 by kmacy@kmacy_vt-x:opentoe_init on 2007/06/28 17:12:16 implement chelsio_usr_sosend down to t3_push_frames Affected files ... .. //depot/projects/opentoe/sys/dev/cxgb/notes.txt#1 add .. //depot/projects/opentoe/sys/dev/cxgb/ulp/t3_tom/t3_cpl_io.c#6 edit .. //depot/projects/opentoe/sys/dev/cxgb/ulp/t3_tom/t3_cpl_socket.c#4 edit .. //depot/projects/opentoe/sys/dev/cxgb/ulp/t3_tom/t3_defs.h#4 edit Differences ... ==== //depot/projects/opentoe/sys/dev/cxgb/ulp/t3_tom/t3_cpl_io.c#6 (text+ko) ==== @@ -66,9 +66,6 @@ #include #include - - - #define DEBUG_WR 0 extern struct protosw t3_tcp_proto; @@ -471,9 +468,9 @@ * Returns true if an mbuf carries urgent data. */ static inline int -skb_urgent(struct mbuf *skb) +mbuf_urgent(struct mbuf *m) { - return (TCP_SKB_CB(skb)->flags & TCPCB_FLAG_URG) != 0; + return (m->m_flags & TCPCB_FLAG_URG) != 0; } /* @@ -491,8 +488,7 @@ struct tx_data_wr *req; struct tcpcb *tp = sototcpcb(so); - skb->h.raw = skb->data; - req = (struct tx_data_wr *)__skb_push(skb, sizeof(*req)); + req = mtod(m, struct tx_data_wr *); req->wr_hi = htonl(V_WR_OP(FW_WROPCODE_OFLD_TX_DATA)); req->wr_lo = htonl(V_WR_TID(TID(so))); req->sndseq = htonl(tp->snd_nxt); @@ -501,24 +497,18 @@ req->param = htonl(V_TX_PORT(L2T_ENTRY(so)->smt_idx)); /* V_TX_ULP_SUBMODE sets both the mode and submode */ req->flags = htonl(V_TX_ULP_SUBMODE(skb_ulp_mode(m)) | - V_TX_URG(skb_urgent(m)) | - V_TX_SHOVE((!sock_flag(sk, TX_MORE_DATA)) && - (skb_peek(&sk->sk_write_queue) ? 0 : 1))); + V_TX_URG(mbuf_urgent(m)) | + V_TX_SHOVE((!GET_TOE_FLAG(so, TX_MORE_DATA)) && + (so->so_snd.sb_mb != NULL)); - if (!sock_flag(sk, TX_DATA_SENT)) { - req->flags |= htonl(F_TX_INIT | V_TX_CPU_IDX(qset(so))); - /* - * The send buffer size is in 32KB. In addition Linux doubles - * what the user requested to account for header and mbuf - * overhead. We care about pure payload here so divide by an - * extra 2 to get the user's requested value. - */ - req->param |= htonl((sk->sk_userlocks & SOCK_SNDBUF_LOCK) ? - V_TX_SNDBUF(sk->sk_sndbuf >> 16) : - V_TX_SNDBUF(M_TX_SNDBUF)); - sock_set_flag(sk, TX_DATA_SENT); - } -} + if (GET_TOE_FLAG(so, TX_DATA_SENT) == 0) { + req->flags |= htonl(F_TX_INIT | V_TX_CPU_IDX(qset(so))); + req->param |= htonl((so->so_snd.sb_flags & SB_AUTOSIZE) ? + V_TX_SNDBUF(tcp_autosndbuf_max) : + V_TX_SNDBUF(so->so_cred->cr_uidinfo->ui_sbsize)); + SET_TOE_FLAG(so, TX_DATA_SENT); + } + /* * Prepends TX_DATA_WR or CPL_CLOSE_CON_REQ headers to buffers waiting in a @@ -535,25 +525,27 @@ struct toedev *cdev; struct tom_data *d; - if (__predict_false(sk_in_state(sk, TCPF_SYN_SENT | TCPF_CLOSE))) + if (__predict_false((tp->t_state == TCPS_SYN_SENT) || + (tp->t_state == TCPS_CLOSE))) return 0; /* * We shouldn't really be called at all after an abort but check just * in case. - */ + * XXX not clear how to check this on FreeBSD + */ +#ifdef notyet if (__predict_false(sock_flag(sk, ABORT_SHUTDOWN))) return 0; - +#endif d = TOM_DATA(TOE_DEV(so)); cdev = d->cdev; - while (WR_AVAIL(so) && (skb = skb_peek(&sk->sk_write_queue)) != NULL && - !sock_flag(sk, TX_WAIT_IDLE) && - (!(TCP_SKB_CB(skb)->flags & TCPCB_FLAG_HOLD) || - skb_queue_len(&sk->sk_write_queue) > 1)) { + while (WR_AVAIL(so) && (m = so->so_snd.sb_mb) != NULL && + !(TOE_FLAGS(so) & TX_WAIT_IDLE) && + (so->so_snd.sb_mb != so->so_snd.sb_lastrecord)) { - int len = skb->len; /* length before skb_push */ + int len = m->m_pkthdr.len; /* length before skb_push */ int frags = skb_shinfo(skb)->nr_frags + (len != skb->data_len); int wrs_needed = skb_wrs[frags]; @@ -561,39 +553,40 @@ if (WR_AVAIL(so) < wrs_needed) break; - __skb_unlink(skb, &sk->sk_write_queue); + so->so_snd.sb_mb = m->m_nextpkt; + m->m_priority = mkprio(CPL_PRIORITY_DATA, so); m->csum_data = wrs_needed; /* remember this until the WR_ACK */ WR_AVAIL(so) -= wrs_needed; WR_UNACKED(so) += wrs_needed; enqueue_wr(tp, m); - if (__predict_true(TCP_SKB_CB(skb)->flags & TCPCB_FLAG_NEED_HDR)) { + if (__predict_true(m->m_flags & TCPCB_FLAG_NEED_HDR)) { len += ulp_extra_len(m); make_tx_data_wr(so, m, len); tp->snd_nxt += len; - tp->lsndtime = tcp_time_stamp; + tp->ts_recent_age = ticks; #if defined(CONFIG_T3_ZCOPY_SENDMSG) || defined(CONFIG_T3_ZCOPY_SENDMSG_MODULE) atomic_add(skb->len - sizeof (struct tx_data_wr), &d->tx_dma_pending); m->m_pkthdr.priv = so; #endif if ((req_completion && WR_UNACKED(so) == wrs_needed) || - (TCP_SKB_CB(skb)->flags & TCPCB_FLAG_COMPL) || + (m->m_flags & TCPCB_FLAG_COMPL) || WR_UNACKED(so) >= WR_MAX(so) / 2) { struct work_request_hdr *wr = cplhdr(m); wr->wr_hi |= htonl(F_WR_COMPL); WR_UNACKED(so) = 0; } - TCP_SKB_CB(skb)->flags &= ~TCPCB_FLAG_NEED_HDR; + m->m_flags &= ~TCPCB_FLAG_NEED_HDR; } else if (skb->data[0] == FW_WROPCODE_OFLD_CLOSE_CON) sock_set_flag(sk, CLOSE_CON_REQUESTED); total_size += skb->truesize; - if (TCP_SKB_CB(skb)->flags & TCPCB_FLAG_BARRIER) - sock_set_flag(sk, TX_WAIT_IDLE); - set_arp_failure_handler(skb, arp_failure_discard); + if (m->m_flags & TCPCB_FLAG_BARRIER) + SET_TOE_FLAG(so, TX_WAIT_IDLE); + set_arp_failure_handler(m, arp_failure_discard); l2t_send(cdev, m, L2T_ENTRY(so)); } @@ -1686,15 +1679,15 @@ /* * XXX ? */ - sototcpcb(so)->ts_recent = tcp_time_stamp; + sototcpcb(so)->ts_recent_age = ticks; + skb->h.th = tcphdr_skb->h.th; #ifdef T3_TRACE T3_TRACE3(TB(q), "tcb_rpl_as_ddp_complete: seq 0x%x hwbuf %u lskb->len %u", TCP_SKB_CB(skb)->seq, q->cur_buf, m->m_len); -#endif - +#endif sbappend(&so->so_rcv, m); if (!sock_flag(so, SOCK_DEAD)) @@ -1753,7 +1746,7 @@ if (!(bsp->flags & DDP_BF_NOFLIP)) q->cur_buf ^= 1; - sototcpcb(so)->ts_recent = tcp_time_stamp; + sototcpcb(so)->ts_recent = ticks; sbappend(so->so_rcv, m); /* For now, don't re-enable DDP after a connection fell out of DDP @@ -1815,7 +1808,7 @@ "new_rx_data: seq 0x%x len %u", TCP_SKB_CB(skb)->seq, m->m_len); #endif - sototcpcb(so)->ts_recent = tcp_time_stamp; + sototcpcb(so)->ts_recent = ticks; sbappend(so->so_rcv, m); if (!sock_flag(sk, SOCK_DEAD)) sk->sk_data_ready(sk, 0); @@ -1919,7 +1912,7 @@ if (ddp_report & F_DDP_PSH) TCP_SKB_CB(skb)->flags |= DDP_BF_PSH; - sototcpcb(so)->ts_recent = tcp_time_stamp; + sototcpcb(so)->ts_recent = ticks; sbappend(&so->so_rcv, m); if (!sock_flag(sk, SOCK_DEAD)) sk->sk_data_ready(sk, 0); @@ -2004,7 +1997,7 @@ TCP_SKB_CB(skb)->seq = tp->rcv_nxt; tp->rcv_nxt += skb->len; - sototcpcb(so)->ts_recent = tcp_time_stamp; + sototcpcb(so)->ts_recent = ticks; sbappend(so->so_rcv, m); if (!sock_flag(sk, SOCK_DEAD)) @@ -2094,7 +2087,7 @@ bsp->cur_offset += skb->len; if (!(bsp->flags & DDP_BF_NOFLIP)) q->cur_buf ^= 1; - sototcpcb(so)->ts_recent = tcp_time_stamp; + sototcpcb(so)->ts_recent = ticks; sbappend(&so->so_rcv, m); if (!sock_flag(so, SOCK_DEAD)) sk->sk_data_ready(so, 0); @@ -3135,7 +3128,7 @@ unsigned int tid = TID(so); skb_queue_walk(&sk->sk_write_queue, skb) { - if (TCP_SKB_CB(skb)->flags & TCPCB_FLAG_NEED_HDR) { + if (m->m_flags & TCPCB_FLAG_NEED_HDR) { TCP_SKB_CB(skb)->seq = tp->write_seq; tp->write_seq += skb->len + ulp_extra_len(m); } else { @@ -3162,7 +3155,7 @@ log(LOG_ERR, "TID %u expected SYN_SENT, found %d\n", TID(so), tp->t_state); - tp->rcv_tstamp = tcp_time_stamp; + tp->ts_recent_age = ticks; DELACK_SEQ(tp) = tp->copied_seq = tp->rcv_wup = tp->rcv_nxt = rcv_isn; make_established(sk, ntohl(req->snd_isn), ntohs(req->tcp_opt)); @@ -3285,7 +3278,7 @@ if (tp->snd_una != snd_una) { tp->snd_una = snd_una; dst_confirm(so->sk_dst_cache); - tp->rcv_tstamp = tcp_time_stamp; + tp->ts_recent_age = ticks; if (tp->snd_una == tp->snd_nxt) sock_reset_flag(so, TX_WAIT_IDLE); } ==== //depot/projects/opentoe/sys/dev/cxgb/ulp/t3_tom/t3_cpl_socket.c#4 (text+ko) ==== @@ -90,6 +90,62 @@ #define TCPDEBUG2(req) #endif + +/* + * Returns true if a connection should send more data to the TOE ASAP. + */ +static inline int +should_push(const struct socket *so) +{ + struct tcpcb *tp = sototcpcb(so); + struct toedev *dev = TOE_DEV(so); + + return !(WR_MAX(tp) - WR_AVAIL(tp)) || + tp->snd_nxt - tp->snd_una <= TOM_TUNABLE(dev, tx_hold_thres) || + (tp->t_flags & TF_NODELAY); +} + +/* + * Decide if the last frame on the send queue needs any special annotations + * (e.g., marked URG) and whether it should be transmitted immediately or + * held for additional data. This is the only routine that performs the full + * suite of tests for a Tx packet and therefore must be called for the last + * packet added by the various send*() APIs. + */ +static void +tcp_push(struct socket *so, int flags) +{ + + if ((so->so_snd.sb_mb != so->so_snd.sb_lastrecord) && + should_push(so)) { +#ifdef notyet + /* + * XXX first cut doesn't support OOB data + */ + struct tcpcb *tp = sototcpcb(so); + struct sk_buff *skb = sk->sk_write_queue.prev; + + mark_urg(tp, flags, skb); +#endif + t3_push_frames(so, 1); + } +} + +/* + * Try to transmit the send queue if it has just one packet. This is intended + * to be called as full packets are added to the send queue by the various + * send*() APIs when we expect additional packets to be generated by the + * current API call. It should not be called for the last packet generated, + * use the full tcp_push call above for that. + */ +static inline void +push_frames_if_head(struct sock *so) +{ + if (so->so_snd.sb_mb == so->so_snd.sb_lastrecord) + t3_push_frames(so, 1); +} + + static int chelsio_ip_ctloutput(struct socket *so, struct sockopt *sopt) { @@ -105,7 +161,7 @@ sizeof optval); if (inp->inp_ip_tos != optval) { inp->inp_ip_tos = optval; -#ifdef notyet +#ifdef notyet sk->sk_priority = rt_tos2priority(optval); #endif t3_set_tos(so); @@ -147,7 +203,8 @@ } tp = intotcpcb(inp); - if (sopt->sopt_name == TCP_NODELAY) { + switch (sopt->sopt_name) { + case TCP_NODELAY: { switch (sopt->sopt_dir) { case SOPT_SET: int oldflags = tp->t_flags; @@ -162,7 +219,8 @@ else tp->t_flags &= ~TF_NODELAY; - if ((oldflags & TF_NODELAY) == 0) + if ((oldflags & TF_NODELAY) != + (tp->t_flags & TF_NODELAY)) t3_set_nagle(so); break; @@ -175,8 +233,42 @@ break; } - } else + break; + } + case TCP_NOPUSH: { + switch (sopt->sopt_dir) { + case SOPT_SET: + int oldflags = tp->t_flags; + + error = sooptcopyin(sopt, &optval, sizeof optval, + sizeof optval); + if (error) + break; + + if (optval > 0) + tp->t_flags |= TF_NOPUSH; + else + tp->t_flags &= ~TF_NODELAY; + + if ((oldflags & TF_NOPUSH) && + ((tp->t_flags & TF_NOPUSH) == 0)) + tcp_push(so, 0); + + break; + case SOPT_GET: + optval = tp->t_flags & TF_NOPUSH; + error = sooptcopyout(sopt, &optval, sizeof optval); + break; + default: + error = ENOPROTOOPT; + break; + + } + break; + } + default: error = tcp_ctloutput(so, sopt); + } out: INP_UNLOCK(inp); return (error); @@ -401,14 +493,14 @@ chelsio_usr_sosend(struct socket *so, struct sockaddr **psa, struct uio *uio, struct mbuf *top, struct mbuf *control, int flags, struct thread *td) { - long space, resid; + long space, resid, resid_init; int clen = 0, error, dontroute; int atomic = sosendallatonce(so) || top; if (uio != NULL) - resid = uio->uio_resid; + resid_init = resid = uio->uio_resid; else - resid = top->m_pkthdr.len; + resid_init = resid = top->m_pkthdr.len; /* * In theory resid should be unsigned. However, space must be * signed, as it might be less than 0 if we over-committed, and we @@ -521,8 +613,40 @@ #endif resid = uio->uio_resid; } - - + if (dontroute) { + SOCK_LOCK(so); + so->so_options |= SO_DONTROUTE; + SOCK_UNLOCK(so); + } + /* + * XXX ignore OOB date for now + */ + if (resid > 0 && space > 0) + push_frames_if_head(so); + + if (dontroute) { + SOCK_LOCK(so); + so->so_options &= ~SO_DONTROUTE; + SOCK_UNLOCK(so); + } + clen = 0; + control = NULL; + top = NULL; + if (error) + goto release; + } while (resid && space > 0); + } while (resid); + + if (resid_init != resid) + tcp_push(so, flags); +release: + sbunlock(&so->so_snd); +out: + if (top != NULL) + m_freem(top); + if (control != NULL) + m_freem(control); + return (error); } /* ==== //depot/projects/opentoe/sys/dev/cxgb/ulp/t3_tom/t3_defs.h#4 (text+ko) ==== @@ -22,6 +22,24 @@ struct toedev; struct tom_data; +struct t3_toe_private { + unsigned int t3_tid; + struct toedev t3_toedev; + struct l2t_entry t3_l2t_entry; + unsigned int t3_wr_avail; + unsigned int t3_wr_unacked; + unsigned int t3_wr_max; + struct ddp_state t3_ddp_state; + struct mbuf *t3_ctrl_mbuf_cache; + struct mbuf *t3_mbuf_ulp_lhdr; + uint8_t t3_mtu_idx; + uint8_t t3_ulp_mode; + uint8_t t3_hw_qset_idx; + uint8_t t3_rss_qset_idx; + uint32_t t3_flags; +}; + + /* * These flags track some close related events. They share the same space as * the sock_flags in include/net/sock.h, make sure there are no collisions. @@ -39,6 +57,8 @@ TX_FAILOVER // Tx traffic failing over }; +#define + /* * Flags for tcp_skb_cb.flags. Make sure there are no collisions with the * ones already defined, we use only TCPCB_FLAG_URG currently. @@ -53,8 +73,11 @@ TCPCB_FLAG_ZCOPY = 1 << 6, TCPCB_FLAG_ZCOPY_COW = 1 << 7, #endif +}; + +#define TCPCB_FLAG_NEED_HDR M_PROTO1 +#define TCPCB_FLAG_BARRIER M_PROTO2 -}; #define mtoso(m) ((struct socket *)m->m_pkthdr.priv) /* The ULP mode/submode of an mbuf */ @@ -94,6 +117,9 @@ /* the TOE device */ #define TOE_DEV(so) (T3_TOE(so)->t3_toedev) +/* socket TOE flags */ +#define TOE_FLAGS(so) (T3_TOE(so)->t3_flags) + /* pointer to the L2T entry. */ #define L2T_ENTRY(so) (T3_TOE(so)->t3_l2t_entry) @@ -133,6 +159,8 @@ /* TOE RSS queue set */ #define qset(so) (T3_TOE(so)->t3_qset) +#define GET_TOE_FLAG(so, flag) (TOE_FLAGS((so)) & (flag)) +#define SET_TOE_FLAG(so, flag) (TOE_FLAGS((so)) |= (flag)) typedef void (*defer_handler_t)(struct toedev *dev, struct mbuf *m); @@ -200,19 +228,6 @@ #endif } -/* - * Set the ULP mode and submode for a Tx packet. - */ -static inline void skb_set_ulp_mode(struct mbuf *m, int mode, int submode) -{ -#ifdef notyet - /* - * XXX need to flesh out t3_priv structure - */ - skb_ulp_mode(m) = (mode << 4) | submode; -#endif -} - extern const unsigned int t3_ulp_extra_len[]; /* * Return the length of any HW additions that will be made to a Tx packet. @@ -220,11 +235,7 @@ */ static inline unsigned int ulp_extra_len(const struct mbuf *m) { -#ifdef notyet - return t3_ulp_extra_len[skb_ulp_mode(m) & 3]; -#else - return (0); -#endif + return t3_ulp_extra_len[ULP_MODE(mtoso(m)) & 3]; } #include From owner-p4-projects@FreeBSD.ORG Thu Jun 28 21:03:55 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 17CAE16A478; Thu, 28 Jun 2007 21:03:55 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D672416A421 for ; Thu, 28 Jun 2007 21:03:54 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id C4D3F13C45A for ; Thu, 28 Jun 2007 21:03:54 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5SL3sdp081325 for ; Thu, 28 Jun 2007 21:03:54 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5SL3qBj081322 for perforce@freebsd.org; Thu, 28 Jun 2007 21:03:52 GMT (envelope-from mjacob@freebsd.org) Date: Thu, 28 Jun 2007 21:03:52 GMT Message-Id: <200706282103.l5SL3qBj081322@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 122499 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Jun 2007 21:03:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=122499 Change 122499 by mjacob@mjexp on 2007/06/28 21:03:32 IFC Affected files ... .. //depot/projects/mjexp/ObsoleteFiles.inc#19 integrate .. //depot/projects/mjexp/contrib/ipfilter/tools/ipfstat.c#3 integrate .. //depot/projects/mjexp/contrib/less/main.c#4 integrate .. //depot/projects/mjexp/contrib/less/screen.c#4 integrate .. //depot/projects/mjexp/etc/mtree/BSD.include.dist#9 integrate .. //depot/projects/mjexp/include/Makefile#8 integrate .. //depot/projects/mjexp/lib/libarchive/Makefile#12 integrate .. //depot/projects/mjexp/lib/libarchive/archive.h.in#13 integrate .. //depot/projects/mjexp/lib/libarchive/archive_read_open_fd.c#6 integrate .. //depot/projects/mjexp/lib/libarchive/archive_read_open_file.c#5 integrate .. //depot/projects/mjexp/lib/libarchive/archive_read_open_filename.c#5 integrate .. //depot/projects/mjexp/lib/libarchive/archive_write_set_format.c#4 integrate .. //depot/projects/mjexp/lib/libarchive/archive_write_set_format_by_name.c#5 integrate .. //depot/projects/mjexp/lib/libarchive/archive_write_set_format_cpio_newc.c#1 branch .. //depot/projects/mjexp/lib/libarchive/test/Makefile#7 integrate .. //depot/projects/mjexp/lib/libarchive/test/test_write_format_cpio.c#1 branch .. //depot/projects/mjexp/lib/libc/arm/sys/sbrk.S#2 integrate .. //depot/projects/mjexp/lib/libc/net/sctp_sys_calls.c#6 integrate .. //depot/projects/mjexp/release/scripts/src-install.sh#2 integrate .. //depot/projects/mjexp/rescue/rescue/Makefile#4 integrate .. //depot/projects/mjexp/sbin/Makefile#6 integrate .. //depot/projects/mjexp/sbin/mount/mount.8#2 integrate .. //depot/projects/mjexp/sbin/mount/mount.c#7 integrate .. //depot/projects/mjexp/sbin/mount_umapfs/Makefile#2 delete .. //depot/projects/mjexp/sbin/mount_umapfs/mount_umapfs.8#2 delete .. //depot/projects/mjexp/sbin/mount_umapfs/mount_umapfs.c#2 delete .. //depot/projects/mjexp/sbin/mount_umapfs/sample.group.mapfile#2 delete .. //depot/projects/mjexp/sbin/mount_umapfs/sample.user.mapfile#2 delete .. //depot/projects/mjexp/sbin/mount_umapfs/umap_manual#2 delete .. //depot/projects/mjexp/share/Makefile#2 integrate .. //depot/projects/mjexp/share/man/man4/bce.4#6 integrate .. //depot/projects/mjexp/share/man/man4/mac.4#2 integrate .. //depot/projects/mjexp/share/man/man4/pcm.4#6 integrate .. //depot/projects/mjexp/share/man/man4/tty.4#2 integrate .. //depot/projects/mjexp/share/man/man7/hier.7#8 integrate .. //depot/projects/mjexp/share/man/man9/priv.9#5 integrate .. //depot/projects/mjexp/share/man/man9/suser.9#4 integrate .. //depot/projects/mjexp/share/misc/committers-src.dot#6 integrate .. //depot/projects/mjexp/share/mk/bsd.own.mk#8 integrate .. //depot/projects/mjexp/share/mk/sys.mk#3 integrate .. //depot/projects/mjexp/sys/cam/scsi/scsi_da.c#15 integrate .. //depot/projects/mjexp/sys/conf/NOTES#27 integrate .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#7 integrate .. //depot/projects/mjexp/sys/dev/ata/ata-all.h#7 integrate .. //depot/projects/mjexp/sys/dev/ata/ata-disk.c#6 integrate .. //depot/projects/mjexp/sys/dev/isp/isp_pci.c#31 integrate .. //depot/projects/mjexp/sys/dev/iwi/if_iwi.c#12 integrate .. //depot/projects/mjexp/sys/dev/rp/rp.c#3 integrate .. //depot/projects/mjexp/sys/dev/usb/if_ural.c#15 integrate .. //depot/projects/mjexp/sys/dev/usb/ugen.c#3 integrate .. //depot/projects/mjexp/sys/dev/usb/umodem.c#5 integrate .. //depot/projects/mjexp/sys/dev/usb/usbdevs#15 integrate .. //depot/projects/mjexp/sys/fs/tmpfs/tmpfs.h#2 integrate .. //depot/projects/mjexp/sys/fs/tmpfs/tmpfs_fifoops.c#2 integrate .. //depot/projects/mjexp/sys/fs/tmpfs/tmpfs_fifoops.h#2 integrate .. //depot/projects/mjexp/sys/fs/tmpfs/tmpfs_subr.c#2 integrate .. //depot/projects/mjexp/sys/fs/tmpfs/tmpfs_uma.c#2 integrate .. //depot/projects/mjexp/sys/fs/tmpfs/tmpfs_uma.h#2 integrate .. //depot/projects/mjexp/sys/fs/tmpfs/tmpfs_vfsops.c#2 integrate .. //depot/projects/mjexp/sys/fs/tmpfs/tmpfs_vnops.c#2 integrate .. //depot/projects/mjexp/sys/fs/tmpfs/tmpfs_vnops.h#2 integrate .. //depot/projects/mjexp/sys/kern/kern_malloc.c#8 integrate .. //depot/projects/mjexp/sys/kern/kern_rwlock.c#10 integrate .. //depot/projects/mjexp/sys/kern/kern_timeout.c#4 integrate .. //depot/projects/mjexp/sys/net/if_gre.c#3 integrate .. //depot/projects/mjexp/sys/netatalk/aarp.h#3 integrate .. //depot/projects/mjexp/sys/netatalk/ddp.h#3 integrate .. //depot/projects/mjexp/sys/netinet/sctputil.c#18 integrate .. //depot/projects/mjexp/sys/security/audit/audit.h#6 integrate .. //depot/projects/mjexp/sys/security/audit/audit_arg.c#10 integrate .. //depot/projects/mjexp/sys/security/audit/audit_bsm.c#6 integrate .. //depot/projects/mjexp/sys/security/audit/audit_bsm_token.c#6 integrate .. //depot/projects/mjexp/sys/security/audit/audit_syscalls.c#11 integrate .. //depot/projects/mjexp/sys/security/mac/mac_audit.c#2 integrate .. //depot/projects/mjexp/sys/security/mac/mac_framework.h#7 integrate .. //depot/projects/mjexp/sys/security/mac/mac_policy.h#4 integrate .. //depot/projects/mjexp/sys/security/mac_stub/mac_stub.c#7 integrate .. //depot/projects/mjexp/sys/security/mac_test/mac_test.c#7 integrate .. //depot/projects/mjexp/sys/sys/_rwlock.h#3 integrate .. //depot/projects/mjexp/sys/sys/rwlock.h#7 integrate .. //depot/projects/mjexp/sys/vm/vm_pageout.c#10 integrate .. //depot/projects/mjexp/tools/regression/fsx/fsx.c#2 integrate .. //depot/projects/mjexp/tools/regression/lib/libc/nss/test-gethostby.c#2 integrate .. //depot/projects/mjexp/tools/regression/lib/libc/nss/test-gethostby.t#2 integrate .. //depot/projects/mjexp/tools/regression/tmpfs/Makefile#2 integrate .. //depot/projects/mjexp/tools/regression/tmpfs/t_id_gen#2 delete .. //depot/projects/mjexp/tools/tools/tinybsd/conf/bridge/tinybsd.basefiles#3 integrate .. //depot/projects/mjexp/tools/tools/tinybsd/conf/default/tinybsd.basefiles#3 integrate .. //depot/projects/mjexp/tools/tools/tinybsd/conf/firewall/tinybsd.basefiles#3 integrate .. //depot/projects/mjexp/tools/tools/tinybsd/conf/minimal/tinybsd.basefiles#3 integrate .. //depot/projects/mjexp/tools/tools/tinybsd/conf/vpn/tinybsd.basefiles#3 integrate .. //depot/projects/mjexp/tools/tools/tinybsd/conf/wireless/tinybsd.basefiles#3 integrate .. //depot/projects/mjexp/tools/tools/tinybsd/conf/wrap/tinybsd.basefiles#3 integrate .. //depot/projects/mjexp/usr.bin/calendar/calendars/calendar.freebsd#14 integrate .. //depot/projects/mjexp/usr.bin/truss/amd64-fbsd.c#3 integrate .. //depot/projects/mjexp/usr.bin/truss/i386-fbsd.c#3 integrate .. //depot/projects/mjexp/usr.bin/truss/i386-linux.c#3 integrate .. //depot/projects/mjexp/usr.bin/truss/ia64-fbsd.c#3 integrate .. //depot/projects/mjexp/usr.bin/truss/main.c#3 integrate .. //depot/projects/mjexp/usr.bin/truss/powerpc-fbsd.c#3 integrate .. //depot/projects/mjexp/usr.bin/truss/setup.c#3 integrate .. //depot/projects/mjexp/usr.bin/truss/sparc64-fbsd.c#3 integrate .. //depot/projects/mjexp/usr.sbin/periodic/periodic.8#2 integrate .. //depot/projects/mjexp/usr.sbin/periodic/periodic.sh#2 integrate .. //depot/projects/mjexp/usr.sbin/sysinstall/dist.c#5 integrate .. //depot/projects/mjexp/usr.sbin/sysinstall/dist.h#2 integrate .. //depot/projects/mjexp/usr.sbin/sysinstall/help/distributions.hlp#2 integrate .. //depot/projects/mjexp/usr.sbin/sysinstall/help/fixit.hlp#2 integrate .. //depot/projects/mjexp/usr.sbin/sysinstall/help/media.hlp#2 integrate .. //depot/projects/mjexp/usr.sbin/sysinstall/help/network_device.hlp#2 integrate .. //depot/projects/mjexp/usr.sbin/sysinstall/help/options.hlp#2 integrate .. //depot/projects/mjexp/usr.sbin/sysinstall/help/securelevel.hlp#2 integrate .. //depot/projects/mjexp/usr.sbin/sysinstall/help/shortcuts.hlp#2 integrate .. //depot/projects/mjexp/usr.sbin/sysinstall/index.c#7 integrate .. //depot/projects/mjexp/usr.sbin/sysinstall/install.c#4 integrate .. //depot/projects/mjexp/usr.sbin/sysinstall/menus.c#5 integrate .. //depot/projects/mjexp/usr.sbin/sysinstall/sysinstall.8#3 integrate .. //depot/projects/mjexp/usr.sbin/sysinstall/sysinstall.h#3 integrate .. //depot/projects/mjexp/usr.sbin/sysinstall/system.c#3 integrate Differences ... ==== //depot/projects/mjexp/ObsoleteFiles.inc#19 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.96 2007/06/18 18:50:59 rafan Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.97 2007/06/25 05:06:52 rafan 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,12 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20070625: umapfs removal +OLD_FILES+=rescue/mount_umapfs +OLD_FILES+=sbin/mount_umapfs +OLD_FILES+=usr/include/fs/umapfs/umap.h +OLD_FILES+=usr/share/man/man8/mount_umapfs.8.gz +OLD_DIRS+=usr/include/fs/umapfs # 20070618: shared library version bump OLD_LIBS+=lib/libalias.so.5 OLD_LIBS+=lib/libbsnmp.so.3 ==== //depot/projects/mjexp/contrib/ipfilter/tools/ipfstat.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/ipfilter/tools/ipfstat.c,v 1.5 2007/06/04 02:54:34 darrenr Exp $ */ +/* $FreeBSD: src/contrib/ipfilter/tools/ipfstat.c,v 1.6 2007/06/24 16:39:12 darrenr Exp $ */ /* * Copyright (C) 2002-2006 by Darren Reed. @@ -1811,7 +1811,7 @@ *port = -1; } else if (!sscanf(comma + 1, "%d", port) || (*port < 0) || (*port > 65535)) { - fprintf(stderr, "Invalid port specfication in %s\n", + fprintf(stderr, "Invalid port specification in %s\n", argument); free(s); exit(-2); @@ -1823,6 +1823,7 @@ /* get ip address */ if (!strcasecmp(s, "any")) { ip->in4.s_addr = INADDR_ANY; + ok = 1; #ifdef USE_INET6 ip->in6 = in6addr_any; } else if (use_inet6 && inet_pton(AF_INET6, s, &ip->in6)) { ==== //depot/projects/mjexp/contrib/less/main.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/less/main.c,v 1.8 2007/06/21 10:39:24 delphij Exp $ */ +/* $FreeBSD: src/contrib/less/main.c,v 1.9 2007/06/23 15:28:00 delphij Exp $ */ /* * Copyright (C) 1984-2007 Mark Nudelman * @@ -59,6 +59,7 @@ extern int missing_cap; extern int know_dumb; extern int quit_if_one_screen; +extern int no_init; extern int pr_type; @@ -165,7 +166,7 @@ } if (less_is_more && get_quit_at_eof()) - quit_if_one_screen = TRUE; + no_init = quit_if_one_screen = TRUE; #if EDITOR editor = lgetenv("VISUAL"); ==== //depot/projects/mjexp/contrib/less/screen.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/less/screen.c,v 1.7 2007/06/21 10:44:50 delphij Exp $ */ +/* $FreeBSD: src/contrib/less/screen.c,v 1.8 2007/06/23 15:28:00 delphij Exp $ */ /* * Copyright (C) 1984-2007 Mark Nudelman * @@ -228,8 +228,6 @@ extern int no_back_scroll; extern int swindow; extern int no_init; -extern int quit_at_eof; -extern int less_is_more; extern int no_keypad; extern int sigs; extern int wscroll; @@ -1211,19 +1209,11 @@ if (sc_e_keypad == NULL) sc_e_keypad = ""; - /* - * This loses for terminals with termcap entries with ti/te strings - * that switch to/from an alternate screen, and we're in quit_at_eof - * (eg, more(1)). - */ - if (!quit_at_eof && !less_is_more) { - sc_init = ltgetstr("ti", &sp); - sc_deinit = ltgetstr("te", &sp); - } - + sc_init = ltgetstr("ti", &sp); if (sc_init == NULL) sc_init = ""; + sc_deinit= ltgetstr("te", &sp); if (sc_deinit == NULL) sc_deinit = ""; ==== //depot/projects/mjexp/etc/mtree/BSD.include.dist#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.114 2007/06/01 18:53:36 ru Exp $ +# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.115 2007/06/25 05:06:53 rafan Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -146,8 +146,6 @@ .. udf .. - umapfs - .. unionfs .. .. ==== //depot/projects/mjexp/include/Makefile#8 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.270 2007/04/13 01:39:33 pjd Exp $ +# $FreeBSD: src/include/Makefile,v 1.271 2007/06/25 05:06:53 rafan Exp $ # # Doing a "make install" builds /usr/include. @@ -43,8 +43,7 @@ dev/ic dev/iicbus ${_dev_ieee488} dev/lmc dev/ofw \ dev/pbio ${_dev_powermac_nvram} dev/ppbus dev/smbus dev/speaker dev/usb dev/utopia dev/vkbd dev/wi \ fs/devfs fs/fdescfs fs/fifofs fs/msdosfs fs/ntfs fs/nullfs \ - ${_fs_nwfs} fs/portalfs fs/procfs fs/smbfs fs/udf fs/umapfs \ - fs/unionfs \ + ${_fs_nwfs} fs/portalfs fs/procfs fs/smbfs fs/udf fs/unionfs \ geom/cache geom/concat geom/eli geom/gate geom/journal geom/label \ geom/mirror geom/multipath geom/nop geom/raid3 geom/shsec geom/stripe \ netatm/ipatm netatm/sigpvc netatm/spans netatm/uni \ ==== //depot/projects/mjexp/lib/libarchive/Makefile#12 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libarchive/Makefile,v 1.72 2007/05/29 01:00:18 kientzle Exp $ +# $FreeBSD: src/lib/libarchive/Makefile,v 1.73 2007/06/22 05:47:00 kientzle Exp $ LIB= archive DPADD= ${LIBBZ2} ${LIBZ} @@ -87,6 +87,7 @@ archive_write_set_format_ar.c \ archive_write_set_format_by_name.c \ archive_write_set_format_cpio.c \ + archive_write_set_format_cpio_newc.c \ archive_write_set_format_pax.c \ archive_write_set_format_shar.c \ archive_write_set_format_ustar.c \ ==== //depot/projects/mjexp/lib/libarchive/archive.h.in#13 (text+ko) ==== @@ -22,7 +22,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libarchive/archive.h.in,v 1.44 2007/05/29 01:00:18 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive.h.in,v 1.45 2007/06/22 05:47:00 kientzle Exp $ */ #ifndef ARCHIVE_H_INCLUDED @@ -390,6 +390,7 @@ int archive_write_set_format_ar_bsd(struct archive *); int archive_write_set_format_ar_svr4(struct archive *); int archive_write_set_format_cpio(struct archive *); +int archive_write_set_format_cpio_newc(struct archive *); /* TODO: int archive_write_set_format_old_tar(struct archive *); */ int archive_write_set_format_pax(struct archive *); int archive_write_set_format_pax_restricted(struct archive *); ==== //depot/projects/mjexp/lib/libarchive/archive_read_open_fd.c#6 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_open_fd.c,v 1.12 2007/06/18 00:36:54 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_open_fd.c,v 1.13 2007/06/26 03:06:48 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include @@ -78,7 +78,8 @@ return (ARCHIVE_FATAL); } mine->fd = fd; - mine->can_skip = 1; + /* lseek() hardly ever works, so disable it by default. See below. */ + mine->can_skip = 0; return (archive_read_open2(a, mine, file_open, file_read, file_skip, file_close)); } @@ -93,8 +94,18 @@ return (ARCHIVE_FATAL); } - if (S_ISREG(st.st_mode)) + if (S_ISREG(st.st_mode)) { archive_read_extract_set_skip_file(a, st.st_dev, st.st_ino); + /* + * Enabling skip here is a performance optimization for + * anything that supports lseek(). On FreeBSD, only + * regular files and raw disk devices support lseek() and + * there's no portable way to determine if a device is + * a raw disk device, so we only enable this optimization + * for regular files. + */ + mine->can_skip = 1; + } return (ARCHIVE_OK); } ==== //depot/projects/mjexp/lib/libarchive/archive_read_open_file.c#5 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_open_file.c,v 1.19 2007/01/09 08:05:55 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_open_file.c,v 1.20 2007/06/26 03:06:48 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include @@ -51,6 +51,7 @@ FILE *f; size_t block_size; void *buffer; + char can_skip; }; static int file_close(struct archive *, void *); @@ -80,6 +81,8 @@ return (ARCHIVE_FATAL); } mine->f = f; + /* Suppress skip by default. See below. */ + mine->can_skip = 0; return (archive_read_open2(a, mine, file_open, file_read, file_skip, file_close)); } @@ -95,8 +98,11 @@ * it's not a file. (FILE * objects can wrap many kinds * of I/O streams.) */ - if (fstat(fileno(mine->f), &st) == 0 && S_ISREG(st.st_mode)) + if (fstat(fileno(mine->f), &st) == 0 && S_ISREG(st.st_mode)) { archive_read_extract_set_skip_file(a, st.st_dev, st.st_ino); + /* Enable the seek optimization for regular files. */ + mine->can_skip = 1; + } return (ARCHIVE_OK); } @@ -125,21 +131,25 @@ { struct read_FILE_data *mine = (struct read_FILE_data *)client_data; + (void)a; /* UNUSED */ + /* - * Note: the 'fd' and 'filename' versions round the request - * down to a multiple of the block size to ensure proper - * operation on block-oriented media such as tapes. But stdio - * doesn't work with such media (it doesn't ensure blocking), - * so we don't need to bother. + * If we can't skip, return 0 as the amount we did step and + * the caller will work around by reading and discarding. */ + if (!mine->can_skip) + return (0); + if (request == 0) + return (0); + #if HAVE_FSEEKO if (fseeko(mine->f, request, SEEK_CUR) != 0) #else if (fseek(mine->f, request, SEEK_CUR) != 0) #endif { - archive_set_error(a, errno, "Error skipping forward"); - return (ARCHIVE_FATAL); + mine->can_skip = 0; + return (0); } return (request); } ==== //depot/projects/mjexp/lib/libarchive/archive_read_open_filename.c#5 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_open_filename.c,v 1.19 2007/06/18 00:36:54 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_open_filename.c,v 1.20 2007/06/26 03:06:48 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include @@ -96,7 +96,8 @@ mine->block_size = block_size; mine->buffer = NULL; mine->fd = -1; - mine->can_skip = 1; + /* lseek() almost never works; disable it by default. See below. */ + mine->can_skip = 0; return (archive_read_open2(a, mine, file_open, file_read, file_skip, file_close)); } @@ -123,8 +124,19 @@ if (fstat(mine->fd, &st) == 0) { /* If we're reading a file from disk, ensure that we don't overwrite it with an extracted file. */ - if (S_ISREG(st.st_mode)) + if (S_ISREG(st.st_mode)) { archive_read_extract_set_skip_file(a, st.st_dev, st.st_ino); + /* + * Enabling skip here is a performance + * optimization for anything that supports + * lseek(). On FreeBSD, only regular files + * and raw disk devices support lseek() and + * there's no portable way to determine if a + * device is a raw disk device, so we only + * enable this optimization for regular files. + */ + mine->can_skip = 1; + } /* Remember mode so close can decide whether to flush. */ mine->st_mode = st.st_mode; } else { ==== //depot/projects/mjexp/lib/libarchive/archive_write_set_format.c#4 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format.c,v 1.4 2007/01/09 08:05:56 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format.c,v 1.5 2007/06/22 05:47:00 kientzle Exp $"); #ifdef HAVE_SYS_TYPES_H #include @@ -42,6 +42,7 @@ struct { int code; int (*setter)(struct archive *); } codes[] = { { ARCHIVE_FORMAT_CPIO, archive_write_set_format_cpio }, + { ARCHIVE_FORMAT_CPIO_SVR4_NOCRC, archive_write_set_format_cpio_newc }, { ARCHIVE_FORMAT_CPIO_POSIX, archive_write_set_format_cpio }, { ARCHIVE_FORMAT_SHAR, archive_write_set_format_shar }, { ARCHIVE_FORMAT_SHAR_BASE, archive_write_set_format_shar }, ==== //depot/projects/mjexp/lib/libarchive/archive_write_set_format_by_name.c#5 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_by_name.c,v 1.6 2007/04/14 22:34:10 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_by_name.c,v 1.7 2007/06/22 05:47:00 kientzle Exp $"); #ifdef HAVE_SYS_TYPES_H #include @@ -49,6 +49,8 @@ { "argnu", archive_write_set_format_ar_svr4 }, { "arsvr4", archive_write_set_format_ar_svr4 }, { "cpio", archive_write_set_format_cpio }, + { "newc", archive_write_set_format_cpio_newc }, + { "odc", archive_write_set_format_cpio }, { "pax", archive_write_set_format_pax }, { "posix", archive_write_set_format_pax }, { "shar", archive_write_set_format_shar }, ==== //depot/projects/mjexp/lib/libarchive/test/Makefile#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libarchive/test/Makefile,v 1.7 2007/06/13 03:35:37 kientzle Exp $ +# $FreeBSD: src/lib/libarchive/test/Makefile,v 1.9 2007/06/22 05:49:13 kientzle Exp $ TESTS= \ test_acl_basic.c \ @@ -37,6 +37,7 @@ test_write_disk_perms.c \ test_write_disk_secure.c \ test_write_format_ar.c \ + test_write_format_cpio.c \ test_write_format_cpio_empty.c \ test_write_format_shar_empty.c \ test_write_format_tar.c \ ==== //depot/projects/mjexp/lib/libc/arm/sys/sbrk.S#2 (text+ko) ==== @@ -32,10 +32,10 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/arm/sys/sbrk.S,v 1.2 2004/11/09 16:49:14 cognet Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/arm/sys/sbrk.S,v 1.3 2007/06/27 02:45:37 kan Exp $"); #include "SYS.h" - .globl _C_LABEL(end) + .globl _C_LABEL(_end) #ifdef WEAK_ALIAS WEAK_ALIAS(sbrk, _sbrk) @@ -46,7 +46,7 @@ .globl CURBRK .type CURBRK,#object CURBRK: - .word _C_LABEL(end) + .word _C_LABEL(_end) /* * Change the data segment size ==== //depot/projects/mjexp/lib/libc/net/sctp_sys_calls.c#6 (text+ko) ==== @@ -29,7 +29,7 @@ * SUCH DAMAGE. */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/sctp_sys_calls.c,v 1.8 2007/06/11 21:05:29 rrs Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/sctp_sys_calls.c,v 1.11 2007/06/26 02:07:47 mjacob Exp $"); #include #include #include @@ -152,14 +152,14 @@ sd = socket(AF_INET6, SOCK_SEQPACKET, IPPROTO_SCTP); #endif if (sd == -1) { - return (errno); + return (-1); } error = getsockopt(sd, IPPROTO_SCTP, SCTP_GET_ADDR_LEN, &av, &siz); close(sd); if (error == 0) { return ((int)av.assoc_value); } else { - return (error); + return (-1); } } @@ -185,10 +185,18 @@ /* validate all the addresses and get the size */ for (i = 0; i < addrcnt; i++) { if (at->sa_family == AF_INET) { + if (at->sa_len != sizeof(struct sockaddr_in)) { + errno = EINVAL; + return (-1); + } memcpy(cpto, at, at->sa_len); cpto = ((caddr_t)cpto + at->sa_len); len += at->sa_len; } else if (at->sa_family == AF_INET6) { + if (at->sa_len != sizeof(struct sockaddr_in6)) { + errno = EINVAL; + return (-1); + } if (IN6_IS_ADDR_V4MAPPED(&((struct sockaddr_in6 *)at)->sin6_addr)) { len += sizeof(struct sockaddr_in); in6_sin6_2_sin((struct sockaddr_in *)cpto, (struct sockaddr_in6 *)at); @@ -205,7 +213,8 @@ } if (len > (sizeof(buf) - sizeof(int))) { /* Never enough memory */ - return (E2BIG); + errno = E2BIG; + return (-1); } at = (struct sockaddr *)((caddr_t)at + at->sa_len); cnt++; @@ -231,7 +240,7 @@ { struct sctp_getaddresses *gaddrs; struct sockaddr *sa; - int i, sz, fam, argsz; + int i, sz, argsz; /* validate the flags */ if ((flags != SCTP_BINDX_ADD_ADDR) && @@ -251,23 +260,30 @@ errno = ENOMEM; return (-1); } - gaddrs->sget_assoc_id = 0; sa = addrs; for (i = 0; i < addrcnt; i++) { sz = sa->sa_len; - fam = sa->sa_family; - ((struct sockaddr_in *)&addrs[i])->sin_port = ((struct sockaddr_in *)sa)->sin_port; - if ((fam != AF_INET) && (fam != AF_INET6)) { + if (sa->sa_family == AF_INET) { + if (sa->sa_len != sizeof(struct sockaddr_in)) + goto out_error; + } else if (sa->sa_family == AF_INET6) { + if (sa->sa_len != sizeof(struct sockaddr_in6)) + goto out_error; + } else { + /* invalid address family specified */ + out_error: + free(gaddrs); errno = EINVAL; return (-1); } + memset(gaddrs, 0, argsz); + gaddrs->sget_assoc_id = 0; memcpy(gaddrs->addr, sa, sz); - if (setsockopt(sd, IPPROTO_SCTP, flags, - gaddrs, (socklen_t) argsz) != 0) { + if (setsockopt(sd, IPPROTO_SCTP, flags, gaddrs, + (socklen_t) argsz) != 0) { free(gaddrs); return (-1); } - memset(gaddrs, 0, argsz); sa = (struct sockaddr *)((caddr_t)sa + sz); } free(gaddrs); @@ -315,7 +331,6 @@ errno = ENOMEM; return (-1); } - memset(addrs, 0, siz); addrs->sget_assoc_id = id; /* Now lets get the array of addresses */ if (getsockopt(sd, IPPROTO_SCTP, SCTP_GET_PEER_ADDRESSES, @@ -380,7 +395,6 @@ errno = ENOMEM; return (-1); } - memset(addrs, 0, siz); addrs->sget_assoc_id = id; /* Now lets get the array of addresses */ if (getsockopt(sd, IPPROTO_SCTP, SCTP_GET_LOCAL_ADDRESSES, addrs, ==== //depot/projects/mjexp/release/scripts/src-install.sh#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/release/scripts/src-install.sh,v 1.10 2004/08/06 08:42:05 cperciva Exp $ +# $FreeBSD: src/release/scripts/src-install.sh,v 1.11 2007/06/28 18:26:35 jhb Exp $ # if [ "`id -u`" != "0" ]; then @@ -11,7 +11,7 @@ echo "You must specify which components of src to extract" echo "possible subcomponents are:" echo - echo "base bin contrib crypto etc games gnu include krb5 lib" + echo "base bin cddl contrib crypto etc games gnu include krb5 lib" echo "libexec release rescue sbin secure share sys tools ubin" echo "usbin" echo @@ -20,7 +20,7 @@ fi if [ "$1" = "all" ]; then - dists="base bin contrib crypto etc games gnu include krb5 lib libexec release rescue sbin secure share sys tools ubin usbin" + dists="base bin cddl contrib crypto etc games gnu include krb5 lib libexec release rescue sbin secure share sys tools ubin usbin" else dists="$*" fi ==== //depot/projects/mjexp/rescue/rescue/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -#$FreeBSD: src/rescue/rescue/Makefile,v 1.54 2007/01/26 10:19:07 delphij Exp $ +#$FreeBSD: src/rescue/rescue/Makefile,v 1.55 2007/06/25 05:06:53 rafan Exp $ # @(#)Makefile 8.1 (Berkeley) 6/2/93 NO_MAN= @@ -113,7 +113,7 @@ kldconfig kldload kldstat kldunload ldconfig \ md5 mdconfig mdmfs mknod mount mount_cd9660 \ mount_msdosfs mount_nfs mount_ntfs mount_nullfs \ - mount_udf mount_umapfs mount_unionfs newfs \ + mount_udf mount_unionfs newfs \ newfs_msdos nos-tun ping reboot \ restore rcorder route routed rtquery rtsol savecore \ slattach spppcontrol startslip swapon sysctl tunefs umount ==== //depot/projects/mjexp/sbin/Makefile#6 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.5 (Berkeley) 3/31/94 -# $FreeBSD: src/sbin/Makefile,v 1.166 2007/06/12 21:31:39 phk Exp $ +# $FreeBSD: src/sbin/Makefile,v 1.167 2007/06/25 05:06:53 rafan Exp $ .include @@ -59,7 +59,6 @@ mount_ntfs \ mount_nullfs \ mount_udf \ - mount_umapfs \ mount_unionfs \ natd \ newfs \ ==== //depot/projects/mjexp/sbin/mount/mount.8#2 (text+ko) ==== @@ -26,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)mount.8 8.8 (Berkeley) 6/16/94 -.\" $FreeBSD: src/sbin/mount/mount.8,v 1.81 2006/09/18 11:55:10 ru Exp $ +.\" $FreeBSD: src/sbin/mount/mount.8,v 1.82 2007/06/25 05:06:54 rafan Exp $ .\" .Dd July 12, 2006 .Dt MOUNT 8 @@ -420,7 +420,6 @@ .Cm portalfs , .Cm smbfs , .Cm udf , -.Cm umapfs , and .Cm unionfs , .Nm @@ -513,7 +512,6 @@ .Xr mount_smbfs 8 , .Xr mount_std 8 , .Xr mount_udf 8 , -.Xr mount_umapfs 8 , .Xr mount_unionfs 8 , .Xr umount 8 .Sh CAVEATS ==== //depot/projects/mjexp/sbin/mount/mount.c#7 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)mount.c 8.25 (Berkeley) 5/8/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/mount/mount.c,v 1.95 2007/04/13 21:30:47 phk Exp $"; + "$FreeBSD: src/sbin/mount/mount.c,v 1.96 2007/06/25 05:06:54 rafan Exp $"; #endif /* not lint */ #include @@ -135,8 +135,7 @@ unsigned int i; const char *fs[] = { "cd9660", "mfs", "msdosfs", "nfs", "nfs4", "ntfs", - "nwfs", "nullfs", "portalfs", "smbfs", "udf", "umapfs", - "unionfs", + "nwfs", "nullfs", "portalfs", "smbfs", "udf", "unionfs", NULL }; ==== //depot/projects/mjexp/share/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/5/93 -# $FreeBSD: src/share/Makefile,v 1.36 2006/03/17 18:54:32 ru Exp $ +# $FreeBSD: src/share/Makefile,v 1.37 2007/06/26 19:40:03 remko Exp $ .include @@ -25,7 +25,7 @@ tabset \ termcap \ ${_timedef} \ - zoneinfo + ${_zoneinfo} .if ${MK_LOCALES} != "no" _colldef = colldef @@ -68,4 +68,8 @@ _doc= doc .endif +.if ${MK_ZONEINFO} != "no" +_zoneinfo= zoneinfo +.endif + .include ==== //depot/projects/mjexp/share/man/man4/bce.4#6 (text) ==== @@ -26,9 +26,9 @@ .\" 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/bce.4,v 1.7 2007/02/09 18:26:13 brueffer Exp $ +.\" $FreeBSD: src/share/man/man4/bce.4,v 1.8 2007/06/24 18:36:07 brueffer Exp $ .\" -.Dd February 9, 2007 +.Dd June 24, 2007 .Dt BCE 4 .Os .Sh NAME @@ -140,6 +140,17 @@ .It HP NC370i Multifunction Gigabit Server Adapter .El +.Sh SYSCTL VARIABLES +The following variables are available as both +.Xr sysctl 8 +variables and +.Xr loader 8 +tunables: +.Bl -tag -width indent +.It Va hw.bce.msi_enable +Whether or not MSI support is enabled in the driver. +The default value is 1. +.El .Sh DIAGNOSTICS .Bl -diag .It "bce%d: PCI memory allocation failed!" ==== //depot/projects/mjexp/share/man/man4/mac.4#2 (text+ko) ==== @@ -28,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/mac.4,v 1.12 2004/07/03 18:29:20 ru Exp $ +.\" $FreeBSD: src/share/man/man4/mac.4,v 1.13 2007/06/27 09:32:50 kevlo Exp $ .\" .Dd January 8, 2003 .Os @@ -109,10 +109,6 @@ .Pa /dev ) corresponding to the file system on which to enable multilabel support. .Ss Policy Enforcement -MAC can be configured to enforce only specific portions of -policies -(see -.Sx "Runtime Configuration" ) . Policy enforcement is divided into the following areas of the system: .Bl -ohang .It Sy "File System" @@ -187,40 +183,6 @@ is documented in the .Xr mac 3 man page. -.Ss Runtime Configuration -The following -.Xr sysctl 8 -MIBs are available for fine-tuning the enforcement of MAC policies. -Unless specifically noted, all MIBs default to 1 -(that is, all areas are enforced by default): -.Bl -tag -width ".Va security.mac.enforce_network" -.It Va security.mac.enforce_fs -Enforce MAC policies for file system accesses. -.It Va security.mac.enforce_kld -Enforce MAC policies on -.Xr kld 4 . -.It Va security.mac.enforce_network -Enforce MAC policies on network interfaces. -.It Va security.mac.enforce_pipe -Enforce MAC policies on pipes. -.It Va security.mac.enforce_process -Enforce MAC policies between system processes -(e.g.\& -.Xr ps 1 , -.Xr ktrace 2 ) . -.It Va security.mac.enforce_socket -Enforce MAC policies on sockets. -.It Va security.mac.enforce_system -Enforce MAC policies on system-related items -(e.g.\& -.Xr kenv 1 , -.Xr acct 2 , -.Xr reboot 2 ) . -.It Va security.mac.enforce_vm -Enforce MAC policies on -.Xr mmap 2 -and -.Xr mprotect 2 . .\" *** XXX *** .\" Support for this feature is poor and should not be encouraged. .\" ==== //depot/projects/mjexp/share/man/man4/pcm.4#6 (text+ko) ==== @@ -23,9 +23,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/pcm.4,v 1.51 2007/05/31 20:26:39 joel Exp $ +.\" $FreeBSD: src/share/man/man4/pcm.4,v 1.52 2007/06/23 14:34:30 joel Exp $ .\" -.Dd May 31, 2007 +.Dd June 23, 2007 .Dt SOUND 4 .Os .Sh NAME @@ -191,6 +191,11 @@ available transparently to the application software. When disabled or not available, the application will only be able to select formats the device natively supports. +.It Va hw.snd.compat_linux_mmap +Enable to allow PROT_EXEC page mappings. +All Linux applications using sound and +.Xr mmap 2 +require this. .It Va hw.snd.feeder_rate_round Sample rate rounding threshold, to avoid large prime division at the cost of accuracy. @@ -245,6 +250,9 @@ .Pa /dev/dsp to .Pa /dev/dsp Ns Va ${hw.snd.default_unit} . +.It Va hw.snd.default_auto +Enable to automatically assign default sound unit to the most recent +attached device. .It Va dev.pcm.%d.[play|rec].vchans The current number of .Tn VCHANs ==== //depot/projects/mjexp/share/man/man4/tty.4#2 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)tty.4 8.3 (Berkeley) 4/19/94 -.\" $FreeBSD: src/share/man/man4/tty.4,v 1.22 2005/02/13 22:25:17 ru Exp $ +.\" $FreeBSD: src/share/man/man4/tty.4,v 1.23 2007/06/27 15:14:06 remko Exp $ .\" -.Dd August 14, 1992 +.Dd Jun 27, 2007 .Dt TTY 4 .Os .Sh NAME @@ -280,7 +280,7 @@ a process on an .Fn open call: there is a specific ioctl called -.Dv TIOSCTTY +.Dv TIOCSCTTY to make a terminal the controlling terminal. In addition, a program can ==== //depot/projects/mjexp/share/man/man7/hier.7#8 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)hier.7 8.1 (Berkeley) 6/5/93 -.\" $FreeBSD: src/share/man/man7/hier.7,v 1.127 2007/06/10 08:51:03 brueffer Exp $ +.\" $FreeBSD: src/share/man/man7/hier.7,v 1.128 2007/06/25 05:06:55 rafan Exp $ .\" .Dd June 10, 2007 .Dt HIER 7 @@ -268,8 +268,6 @@ SMB/CIFS file system .It Pa udf/ UDF file system -.It Pa umapfs/ -alternate uid/gid mappings file system >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jun 28 21:08:01 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E7C3D16A46B; Thu, 28 Jun 2007 21:08:00 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9252016A400 for ; Thu, 28 Jun 2007 21:08:00 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 828C713C44B for ; Thu, 28 Jun 2007 21:08:00 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5SL80fx081511 for ; Thu, 28 Jun 2007 21:08:00 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5SL80Xi081508 for perforce@freebsd.org; Thu, 28 Jun 2007 21:08:00 GMT (envelope-from thompsa@freebsd.org) Date: Thu, 28 Jun 2007 21:08:00 GMT Message-Id: <200706282108.l5SL80Xi081508@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 122500 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Jun 2007 21:08:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=122500 Change 122500 by thompsa@thompsa_heff on 2007/06/28 21:07:01 Fix wi in the new world order - the channels are no longer indexed by ieee number [1] - Fix scanning when the firmware can only do all chans - the rate from the firmware is in different units - pass IEEE80211_S_SCAN to net80211 so it can kick off scanning - fix overflow in rates[] from wi_scan_result - dont disard after mindwell in ieee80211_add_scan - ieee80211_scanparams takes a pointer to the channel Submitted by: Tai-hwa Liang [1] Affected files ... .. //depot/projects/wifi/sys/dev/wi/if_wi.c#36 edit .. //depot/projects/wifi/sys/net80211/ieee80211_input.c#107 edit .. //depot/projects/wifi/sys/net80211/ieee80211_scan.c#14 edit .. //depot/projects/wifi/sys/net80211/ieee80211_scan.h#9 edit .. //depot/projects/wifi/sys/net80211/ieee80211_scan_sta.c#20 edit Differences ... ==== //depot/projects/wifi/sys/dev/wi/if_wi.c#36 (text+ko) ==== @@ -165,6 +165,8 @@ static int wi_symbol_set_hcr(struct wi_softc *, int); static void wi_scan_start(struct ieee80211com *); +static void wi_scan_curchan(struct ieee80211com *, unsigned long); +static void wi_scan_mindwell(struct ieee80211com *); static void wi_scan_end(struct ieee80211com *); static void wi_set_channel(struct ieee80211com *); static void wi_update_slot(struct ifnet *); @@ -369,8 +371,9 @@ val = le16toh(val); ic->ic_bsschan = ieee80211_find_channel(ic, ieee80211_ieee2mhz(val, IEEE80211_CHAN_B), - IEEE80211_MODE_AUTO); - /* XXX check return value */ + IEEE80211_CHAN_B); + if (ic->ic_bsschan == NULL) + ic->ic_bsschan = &ic->ic_channels[0]; } else { device_printf(dev, "WI_RID_OWN_CHNL failed, using first channel!\n"); @@ -467,7 +470,6 @@ rs->rs_rates[rs->rs_nrates++] = ratebuf[2+i]; } else { /* XXX fallback on error? */ - rs->rs_nrates = 0; } buflen = sizeof(val); @@ -504,6 +506,8 @@ ic->ic_raw_xmit = wi_raw_xmit; ic->ic_scan_start = wi_scan_start; + ic->ic_scan_curchan = wi_scan_curchan; + ic->ic_scan_mindwell = wi_scan_mindwell; ic->ic_scan_end = wi_scan_end; ic->ic_set_channel = wi_set_channel; ic->ic_node_alloc = wi_node_alloc; @@ -1922,9 +1926,9 @@ case WI_INFO_SCAN_RESULTS: case WI_INFO_HOST_SCAN_RESULTS: wi_scan_result(sc, fid, le16toh(ltbuf[0])); - ieee80211_notify_scan_done(ic); + ieee80211_scan_done(ic); break; - + default: DPRINTF(("wi_info_intr: got fid %x type %x len %d\n", fid, le16toh(ltbuf[1]), le16toh(ltbuf[0]))); @@ -2952,6 +2956,8 @@ return (*sc->sc_newstate)(ic, nstate, arg); case IEEE80211_S_SCAN: + return (*sc->sc_newstate)(ic, nstate, arg); + case IEEE80211_S_AUTH: case IEEE80211_S_ASSOC: ic->ic_state = nstate; /* NB: skip normal ieee80211 handling */ @@ -2966,8 +2972,12 @@ IEEE80211_ADDR_COPY(ni->ni_macaddr, ni->ni_bssid); buflen = sizeof(val); wi_read_rid(sc, WI_RID_CURRENT_CHAN, &val, &buflen); + ni->ni_chan = ieee80211_find_channel(ic, + ieee80211_ieee2mhz(val, IEEE80211_CHAN_B), + IEEE80211_CHAN_B); + if (ni->ni_chan == NULL) + ni->ni_chan = &ic->ic_channels[0]; /* XXX validate channel */ - ni->ni_chan = &ic->ic_channels[le16toh(val)]; ic->ic_curchan = ic->ic_bsschan = ni->ni_chan; #if NBPFILTER > 0 sc->sc_tx_th.wt_chan_freq = sc->sc_rx_th.wr_chan_freq = @@ -3085,7 +3095,7 @@ memset(&ws_dat, 0, sizeof(ws_dat)); for (i = 0; i < naps; i++, ap++) { - uint8_t rates[2]; + uint8_t rates[2 + IEEE80211_RATE_MAXSIZE]; uint16_t *bssid; wi_read_bap(sc, fid, off, &ws_dat, (sizeof(ws_dat) < szbuf ? sizeof(ws_dat) : szbuf)); @@ -3102,7 +3112,7 @@ memcpy(wh.i_addr2, ws_dat.wi_bssid, sizeof(ap->bssid)); memcpy(wh.i_addr3, ws_dat.wi_bssid, sizeof(ap->bssid)); - sp.chan = ap->channel = le16toh(ws_dat.wi_chid); + ap->channel = le16toh(ws_dat.wi_chid); ap->signal = le16toh(ws_dat.wi_signal); ap->noise = le16toh(ws_dat.wi_noise); ap->quality = ap->signal - ap->noise; @@ -3110,7 +3120,7 @@ sp.bintval = ap->interval = le16toh(ws_dat.wi_interval); ap->rate = le16toh(ws_dat.wi_rate); rates[1] = 1; - rates[2] = (uint8_t)ap->rate; + rates[2] = (uint8_t)ap->rate / 5; ap->namelen = le16toh(ws_dat.wi_namelen); if (ap->namelen > sizeof(ap->name)) ap->namelen = sizeof(ap->name); @@ -3118,9 +3128,15 @@ sp.ssid = (uint8_t *)&ssid[0]; memcpy(sp.ssid + 2, ap->name, ap->namelen); sp.ssid[1] = ap->namelen; + sp.chan = ieee80211_find_channel(ic, + ieee80211_ieee2mhz(ap->channel, IEEE80211_CHAN_B), + IEEE80211_CHAN_B); + if (sp.chan == NULL) + sp.chan = &ic->ic_channels[0]; sp.rates = &rates[0]; sp.tstamp = (uint8_t *)&rstamp; - printf("calling add_scan \n"); + DPRINTF(("calling add_scan, bssid %s chan %d signal %d\n", + ether_sprintf(ws_dat.wi_bssid), ap->channel, ap->signal)); ieee80211_add_scan(ic, &sp, &wh, 0, ap->signal, ap->noise, rstamp); } done: @@ -3536,6 +3552,18 @@ } static void +wi_scan_curchan(struct ieee80211com *ic, unsigned long maxdwell) +{ + /* The firmware is not capable of scanning a single channel */ +} + +static void +wi_scan_mindwell(struct ieee80211com *ic) +{ + /* NB: don't try to abort scan; wait for firmware to finish */ +} + +static void wi_scan_end(struct ieee80211com *ic) { struct ifnet *ifp = ic->ic_ifp; ==== //depot/projects/wifi/sys/net80211/ieee80211_input.c#107 (text+ko) ==== @@ -2090,7 +2090,7 @@ scan.tstamp = frm; frm += 8; scan.bintval = le16toh(*(uint16_t *)frm); frm += 2; scan.capinfo = le16toh(*(uint16_t *)frm); frm += 2; - scan.bchan = ieee80211_chan2ieee(ic, ic->ic_curchan); + scan.bchan = ic->ic_curchan; scan.chan = scan.bchan; while (efrm - frm > 1) { ==== //depot/projects/wifi/sys/net80211/ieee80211_scan.c#14 (text+ko) ==== @@ -633,6 +633,19 @@ } /* + * Public access to scan_next for drivers that are not able to scan single + * channels (e.g. for firmware-based devices). + */ +void +ieee80211_scan_done(struct ieee80211com *ic) +{ + struct ieee80211_scan_state *ss = ic->ic_scan; + + ss->ss_next = ss->ss_last; /* all channels are complete */ + scan_next(ss); +} + +/* * Scan curchan. If this is an active scan and the channel * is not marked passive then send probe request frame(s). * Arrange for the channel change after maxdwell ticks. @@ -833,7 +846,7 @@ #ifdef IEEE80211_DEBUG static void -dump_probe_beacon(uint8_t subtype, int isnew, +dump_probe_beacon(struct ieee80211com *ic, uint8_t subtype, int isnew, const uint8_t mac[IEEE80211_ADDR_LEN], const struct ieee80211_scanparams *sp) { @@ -841,7 +854,8 @@ printf("[%s] %s%s on chan %u (bss chan %u) ", ether_sprintf(mac), isnew ? "new " : "", ieee80211_mgt_subtype_name[subtype >> IEEE80211_FC0_SUBTYPE_SHIFT], - sp->chan, sp->bchan); + ieee80211_chan2ieee(ic, sp->chan), + ieee80211_chan2ieee(ic, sp->bchan)); ieee80211_print_essid(sp->ssid + 2, sp->ssid[1]); printf("\n"); @@ -887,7 +901,7 @@ return; #ifdef IEEE80211_DEBUG if (ieee80211_msg_scan(ic) && (ic->ic_flags & IEEE80211_F_SCAN)) - dump_probe_beacon(subtype, 1, wh->i_addr2, sp); + dump_probe_beacon(ic, subtype, 1, wh->i_addr2, sp); #endif if (ss->ss_ops != NULL && ss->ss_ops->scan_add(ss, sp, wh, subtype, rssi, noise, rstamp)) { @@ -903,17 +917,7 @@ ieee80211_chan2ieee(ic, ic->ic_curchan), channel_type(ic->ic_curchan), ticks, SCAN_PRIVATE(ss)->ss_chanmindwell); - /* - * XXX - * We want to just kick the timer and still - * process frames until it fires but linux - * will livelock unless we discard frames. - */ -#if 0 SCAN_PRIVATE(ss)->ss_iflags |= ISCAN_MINDWELL; -#else - SCAN_PRIVATE(ss)->ss_iflags |= ISCAN_DISCARD; -#endif /* * NB: trigger at next clock tick or wait for the * hardware ==== //depot/projects/wifi/sys/net80211/ieee80211_scan.h#9 (text+ko) ==== @@ -89,6 +89,7 @@ int ieee80211_bg_scan(struct ieee80211com *); void ieee80211_cancel_scan(struct ieee80211com *); void ieee80211_scan_next(struct ieee80211com *); +void ieee80211_scan_done(struct ieee80211com *); struct ieee80211_scanparams; void ieee80211_add_scan(struct ieee80211com *, @@ -123,8 +124,8 @@ struct ieee80211_scanparams { uint16_t capinfo; /* 802.11 capabilities */ uint16_t fhdwell; /* FHSS dwell interval */ - uint8_t chan; /* */ - uint8_t bchan; + struct ieee80211_channel *chan; + struct ieee80211_channel *bchan; uint8_t fhindex; uint8_t erp; uint16_t bintval; ==== //depot/projects/wifi/sys/net80211/ieee80211_scan_sta.c#20 (text+ko) ==== @@ -263,7 +263,7 @@ memcpy(ise->se_tstamp.data, sp->tstamp, sizeof(ise->se_tstamp)); ise->se_intval = sp->bintval; ise->se_capinfo = sp->capinfo; - ise->se_chan = ic->ic_curchan; + ise->se_chan = sp->chan; ise->se_fhdwell = sp->fhdwell; ise->se_fhindex = sp->fhindex; ise->se_erp = sp->erp; From owner-p4-projects@FreeBSD.ORG Thu Jun 28 22:00:06 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7814416A469; Thu, 28 Jun 2007 22:00:06 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 444C416A46F for ; Thu, 28 Jun 2007 22:00:06 +0000 (UTC) (envelope-from ivoras@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 2CAE613C4AE for ; Thu, 28 Jun 2007 22:00:06 +0000 (UTC) (envelope-from ivoras@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5SM06E4085234 for ; Thu, 28 Jun 2007 22:00:06 GMT (envelope-from ivoras@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5SM057R085231 for perforce@freebsd.org; Thu, 28 Jun 2007 22:00:05 GMT (envelope-from ivoras@FreeBSD.org) Date: Thu, 28 Jun 2007 22:00:05 GMT Message-Id: <200706282200.l5SM057R085231@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ivoras@FreeBSD.org using -f From: Ivan Voras To: Perforce Change Reviews Cc: Subject: PERFORCE change 122502 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Jun 2007 22:00:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=122502 Change 122502 by ivoras@ivoras_finstall on 2007/06/28 21:59:39 Remove config file generation from script code and move it to external files. Affected files ... .. //depot/projects/soc2007/ivoras_finstall/makeimage/bundles/bundle-spec#1 add .. //depot/projects/soc2007/ivoras_finstall/makeimage/bundles/dot.xinitrc#1 add .. //depot/projects/soc2007/ivoras_finstall/makeimage/bundles/fstab#1 add .. //depot/projects/soc2007/ivoras_finstall/makeimage/bundles/hosts#1 add .. //depot/projects/soc2007/ivoras_finstall/makeimage/bundles/livecd#1 add .. //depot/projects/soc2007/ivoras_finstall/makeimage/bundles/loader.conf#1 add .. //depot/projects/soc2007/ivoras_finstall/makeimage/bundles/rc.conf#1 add .. //depot/projects/soc2007/ivoras_finstall/makeimage/bundles/xorg.conf#1 add .. //depot/projects/soc2007/ivoras_finstall/makeimage/makeimage.py#6 edit .. //depot/projects/soc2007/ivoras_finstall/makeimage/util.py#4 edit Differences ... ==== //depot/projects/soc2007/ivoras_finstall/makeimage/makeimage.py#6 (text+ko) ==== @@ -22,7 +22,7 @@ # finstall LiveCD image creator -import os, os.path, sys +import os, os.path, sys, stat from time import strftime from getopt import getopt, GetoptError from util import nukedir, execute, printmsg, cmdout, readline, initutils, getpkgdeps, getpkgfullname @@ -37,11 +37,11 @@ raise MakeImageException("This utility requires mkisofs(8) (install ports/sysutils/cdrtools)") def usage(exit=True): - print "usage: %s -d WORKDIR [-i ISOFILE] [-k KERNEL] [-p PKGLISTFILE] [-s SRCDIR] [-b] [-c] " % sys.argv[0] + print "usage: %s -d WORKDIR [-i ISOFILE] [-k KERNEL] [-p PKGLISTFILE] [-s SRCDIR] [-x BUNDLEDIR] [-b] [-c] " % sys.argv[0] print print "Description:" print " -d WORKDIR Base work directory to hold intermediate and final files" - print " (requires ~800MB free). This is the only required" + print " (requires ~1.5 GB free). This is the only required" print " argument." print " -k KERNEL FreeBSD kernel to package (default: GENERIC)" print " -i ISOFILE ISO image to generate (default: WORKDIR/image.iso)" @@ -49,6 +49,8 @@ print " LiveCD system. All packages from the list must be" print " installed on the system doing the build." print " -s SRCDIR Directory with FreeBSD source tree (default: /usr/src)" + print " -x BUNDLEDIR Directory containing bundle-spec file and appropriate" + print " files to bundle (default: bundles)" print " -b Do buildworld / buildkernel before proceeding" print " -c Assume installworld / installkernel phase has been" print " done in WORKDIR/livecd and proceed with configuration" @@ -65,6 +67,8 @@ DoBuild = False DoMakeRoot = True # Create / install livecd tree LABEL = "FreeBSD7" # ISO9660 Volume label +BUNDLEDIR = "bundles" +BUNDLEFILE = "bundle-spec" PKGLISTFILE = None ISO = None @@ -90,6 +94,8 @@ DoMakeRoot = False elif o == "-i": ISO = a + elif o == "-x": + BUNDLEDIR = a elif o == "-h": usage() @@ -100,6 +106,8 @@ raise MakeImageException("Source directory not found: '%s'") if not os.path.exists(WORKDIR): os.makedirs(WORKDIR) +if not os.path.exists(BUNDLEDIR) or not os.path.exists("%s/%s" % (BUNDLEDIR, BUNDLEFILE)): + BUNDLEDIR = None DESTDIR = "%s/livecd" % WORKDIR @@ -128,39 +136,52 @@ execute("make installworld DESTDIR=%s" % DESTDIR) execute("make distribution DESTDIR=%s" % DESTDIR) execute("make installkernel KERNCONF=%s DESTDIR=%s" % (KERNEL, DESTDIR)) + execute("rm %s/boot/kernel/*.symbols" % DESTDIR) else: if not os.path.exists(DESTDIR) or not os.path.exists("%s/COPYRIGHT" % DESTDIR): print "%s doesn't look like existing livecd root" % DESTDIR sys.exit(1) -str_time = strftime("%Y-%m-%d %H:%M") -printmsg("Creating config files") +str_time = strftime("%H:%M") +str_date = strftime("%Y-%m-%d") -# Edit loader.conf -lc = file("%s/boot/loader.conf" % DESTDIR, "w+") -lc.write("# /boot/loader.conf generated by finstall makeimage.py on %s\n" % str_time) -lc.write('rootdev="iso9660/%s"\n' % LABEL) -lc.write('boot_cdrom="1"\n') -lc.close() +if os.path.exists("%s/%s" % (BUNDLEDIR, BUNDLEFILE)): + printmsg("Bundling config files") + f = file("%s/%s" % (BUNDLEDIR, BUNDLEFILE), "r") + for line in f.readlines(): + line = line.strip() + if len(line) == 0: + continue + if line[0] == "#": + continue + if line.find("=") == -1: + raise MakeImageException("Invalid %s line: %s", (BUNDLEFILE, line)) + if line.find(";") != -1: + files, flags = line.split(";", 1) + flags = flags.split(";") + dest_file, src_file = files.split("=", 1) + else: + flags = [] + dest_file, src_file = line.split("=", 1) + file_contents = file("%s/%s" % (BUNDLEDIR, src_file), "r").read() + if "kw" in flags: + file_contents = file_contents.replace("$label$", LABEL) + file_contents = file_contents.replace("$time$", str_time) + file_contents = file_contents.replace("$date$", str_date) + file_contents = file_contents.replace("$dest_file$", dest_file) + file_contents = file_contents.replace("$src_file$", src_file) + if "a" in flags: + df = file("%s%s" % (DESTDIR, dest_file), "a") + else: + df = file("%s%s" % (DESTDIR, dest_file), "w") + df.write(file_contents) + df.close() + if "x" in flags: + os.chmod("%s%s" % (DESTDIR, dest_file), stat.S_IRUSR | stat.S_IXUSR | stat.S_IRGRP | stat.S_IXGRP | stat.S_IROTH | stat.S_IXOTH) + f.close() -# Edit fstab -f = file("%s/etc/fstab" % DESTDIR, "w+") -f.write("# /etc/fstab generated by finstall makeimage.py on %s\n" % str_time) -f.write("/dev/iso9660/%s / cd9660 ro 0 0\n" % LABEL) -#f.write("md /tmp mfs rw,-S,-s32m 0 0\n") -#f.write("/tmp /etc unionfs rw,copymode=transparent 0 0\n") -f.close() - -# Edit rc.conf -f = file("%s/etc/rc.conf" % DESTDIR, "w+") -f.write("# /etc/rc.conf generated by finstall makeimage.py on %s\n" % str_time) -f.write('rc_debug="NO"\n') -f.write('hostname="finstall"\n') -f.write('background_fsck="NO"\n') -f.write('syslogd_flags="-C"\n') -f.close() - if PKGLISTFILE != None: + printmsg("Bundling packages") # Install packages into the liveCD tree, using chroot master_pkglist = [] f = file(PKGLISTFILE, "r") @@ -178,8 +199,8 @@ dest_pkgs[p2] = True os.chdir("%s/tmp" % DESTDIR) for pkg in dest_pkgs: - pkg_file = "%s.tbz" % pkg - execute("pkg_create -v -j -b %s %s" % (pkg, pkg_file)) + pkg_file = "%s.tgz" % pkg + execute("pkg_create -v -b %s %s" % (pkg, pkg_file)) dest_pkgs[pkg] = pkg_file f = file("pkginst.sh", "w") f.write("#!/bin/sh\ncd /tmp\npkg_delete -av\n") @@ -192,19 +213,6 @@ os.unlink(dest_pkgs[pkg]) os.unlink("pkginst.sh") -f = file("%s/etc/rc.d/livecd" % DESTDIR, "w") -f.write("# /etc/rc.d/livecd generated by finstall makeimage.py on %s\n" % str_time) -f.write("# BEFORE: hostid\n") -f.write("# REQUIRE: root\n") -f.write("# KEYWORD: nojail\n\n") -f.write("/sbin/mount_mfs -s 32m -S md /tmp\n") -f.write("/bin/mkdir /tmp/etc /tmp/log /tmp/run /tmp/tmp\n") -f.write("/sbin/mount_unionfs -o copymode=transparent /tmp/etc /etc\n") -f.write("/sbin/mount_unionfs -o copymode=transparent /tmp/log /var/log\n") -f.write("/sbin/mount_unionfs -o copymode=transparent /tmp/run /var/run\n") -f.write("/sbin/mount_unionfs -o copymode=transparent /tmp/tmp /var/tmp\n") -f.close() -execute("chmod a+x %s/etc/rc.d/livecd" % DESTDIR) os.chdir(WORKDIR) if ISO == None: ==== //depot/projects/soc2007/ivoras_finstall/makeimage/util.py#4 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Thu Jun 28 22:42:01 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7351616A46B; Thu, 28 Jun 2007 22:42:01 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3BFB216A400 for ; Thu, 28 Jun 2007 22:42:01 +0000 (UTC) (envelope-from chub@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 2ABC013C43E for ; Thu, 28 Jun 2007 22:42:01 +0000 (UTC) (envelope-from chub@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5SMg1mZ091784 for ; Thu, 28 Jun 2007 22:42:01 GMT (envelope-from chub@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5SMfwwo091774 for perforce@freebsd.org; Thu, 28 Jun 2007 22:41:58 GMT (envelope-from chub@FreeBSD.org) Date: Thu, 28 Jun 2007 22:41:58 GMT Message-Id: <200706282241.l5SMfwwo091774@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to chub@FreeBSD.org using -f From: Brian Chu To: Perforce Change Reviews Cc: Subject: PERFORCE change 122504 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Jun 2007 22:42:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=122504 Change 122504 by chub@chub-msdosfs on 2007/06/28 22:41:08 Pulling vendor tree into msdosfs branch. Affected files ... .. //depot/projects/soc2007/chub-msdosfs/boot/forth/loader.conf#2 integrate .. //depot/projects/soc2007/chub-msdosfs/cam/scsi/scsi_da.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/conf/NOTES#2 integrate .. //depot/projects/soc2007/chub-msdosfs/conf/files#2 integrate .. //depot/projects/soc2007/chub-msdosfs/conf/files.sparc64#2 integrate .. //depot/projects/soc2007/chub-msdosfs/conf/files.sun4v#2 integrate .. //depot/projects/soc2007/chub-msdosfs/conf/options#2 integrate .. //depot/projects/soc2007/chub-msdosfs/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/dev/acpica/acpi.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/dev/acpica/acpiio.h#2 integrate .. //depot/projects/soc2007/chub-msdosfs/dev/acpica/acpivar.h#2 integrate .. //depot/projects/soc2007/chub-msdosfs/dev/ata/ata-all.h#2 integrate .. //depot/projects/soc2007/chub-msdosfs/dev/ata/ata-chipset.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/dev/ata/ata-disk.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/dev/ata/ata-pci.h#2 integrate .. //depot/projects/soc2007/chub-msdosfs/dev/ata/ata-usb.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/dev/ath/if_ath.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/dev/if_ndis/if_ndis_usb.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/dev/isp/isp.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/dev/isp/isp_pci.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/dev/iwi/if_iwi.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/dev/mpt/mpt_cam.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/dev/rp/rp.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/dev/sound/pci/hda/hdac.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/dev/sound/pcm/sound.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/dev/sound/usb/uaudio.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/dev/sym/sym_hipd.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/dev/syscons/scgfbrndr.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/dev/usb/ehci.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/dev/usb/ehci_pci.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/dev/usb/hid.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/dev/usb/if_aue.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/dev/usb/if_axe.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/dev/usb/if_cdce.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/dev/usb/if_cue.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/dev/usb/if_kue.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/dev/usb/if_rue.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/dev/usb/if_rum.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/dev/usb/if_udav.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/dev/usb/if_ural.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/dev/usb/ohci.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/dev/usb/ohci_pci.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/dev/usb/sl811hs.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/dev/usb/slhci_pccard.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/dev/usb/uark.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/dev/usb/ubsa.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/dev/usb/ubser.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/dev/usb/ucom.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/dev/usb/ucycom.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/dev/usb/udbp.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/dev/usb/ufm.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/dev/usb/ufoma.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/dev/usb/uftdi.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/dev/usb/ugen.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/dev/usb/uhci_pci.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/dev/usb/uhid.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/dev/usb/uhub.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/dev/usb/uipaq.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/dev/usb/ukbd.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/dev/usb/ulpt.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/dev/usb/umass.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/dev/usb/umct.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/dev/usb/umodem.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/dev/usb/ums.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/dev/usb/uplcom.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/dev/usb/urio.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/dev/usb/usb.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/dev/usb/usb.h#2 integrate .. //depot/projects/soc2007/chub-msdosfs/dev/usb/usb_mem.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/dev/usb/usb_port.h#2 integrate .. //depot/projects/soc2007/chub-msdosfs/dev/usb/usb_quirks.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/dev/usb/usb_quirks.h#2 integrate .. //depot/projects/soc2007/chub-msdosfs/dev/usb/usb_subr.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/dev/usb/usbdevs#2 integrate .. //depot/projects/soc2007/chub-msdosfs/dev/usb/usbdi.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/dev/usb/usbdi_util.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/dev/usb/uscanner.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/dev/usb/uvisor.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/dev/usb/uvscom.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/fs/tmpfs/tmpfs.h#2 integrate .. //depot/projects/soc2007/chub-msdosfs/fs/tmpfs/tmpfs_fifoops.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/fs/tmpfs/tmpfs_fifoops.h#2 integrate .. //depot/projects/soc2007/chub-msdosfs/fs/tmpfs/tmpfs_subr.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/fs/tmpfs/tmpfs_uma.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/fs/tmpfs/tmpfs_uma.h#2 integrate .. //depot/projects/soc2007/chub-msdosfs/fs/tmpfs/tmpfs_vfsops.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/fs/tmpfs/tmpfs_vnops.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/fs/tmpfs/tmpfs_vnops.h#2 integrate .. //depot/projects/soc2007/chub-msdosfs/fs/umapfs/umap.h#2 delete .. //depot/projects/soc2007/chub-msdosfs/fs/umapfs/umap_subr.c#2 delete .. //depot/projects/soc2007/chub-msdosfs/fs/umapfs/umap_vfsops.c#2 delete .. //depot/projects/soc2007/chub-msdosfs/fs/umapfs/umap_vnops.c#2 delete .. //depot/projects/soc2007/chub-msdosfs/geom/part/g_part.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/geom/part/g_part.h#2 integrate .. //depot/projects/soc2007/chub-msdosfs/geom/part/g_part_mbr.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/i386/acpica/acpi_machdep.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/kern/Make.tags.inc#2 integrate .. //depot/projects/soc2007/chub-msdosfs/kern/Makefile#2 integrate .. //depot/projects/soc2007/chub-msdosfs/kern/kern_conf.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/kern/kern_malloc.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/kern/kern_rwlock.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/kern/kern_timeout.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/kern/subr_unit.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/kern/vfs_cache.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/modules/acpi/acpi_video/Makefile#2 integrate .. //depot/projects/soc2007/chub-msdosfs/modules/i2c/controllers/alpm/Makefile#2 integrate .. //depot/projects/soc2007/chub-msdosfs/modules/i2c/controllers/viapm/Makefile#2 integrate .. //depot/projects/soc2007/chub-msdosfs/modules/slhci/Makefile#2 integrate .. //depot/projects/soc2007/chub-msdosfs/modules/umapfs/Makefile#2 delete .. //depot/projects/soc2007/chub-msdosfs/net/bpf.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/net/bridgestp.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/net/if_gre.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/net80211/ieee80211_freebsd.h#2 integrate .. //depot/projects/soc2007/chub-msdosfs/netatalk/aarp.h#2 integrate .. //depot/projects/soc2007/chub-msdosfs/netatalk/ddp.h#2 integrate .. //depot/projects/soc2007/chub-msdosfs/netatm/atm_cm.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/netatm/ipatm/ipatm_event.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/netatm/spans/spans_proto.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/netatm/uni/sscf_uni_lower.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/netatm/uni/uniarp.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/netatm/uni/uniarp_timer.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/netatm/uni/unisig_decode.h#2 integrate .. //depot/projects/soc2007/chub-msdosfs/netatm/uni/unisig_proto.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/netgraph/bluetooth/drivers/ubt/ng_ubt.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/netgraph/ng_parse.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/netinet/ip_fw2.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/netinet/sctp.h#2 integrate .. //depot/projects/soc2007/chub-msdosfs/netinet/sctp_asconf.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/netinet/sctp_bsd_addr.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/netinet/sctp_indata.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/netinet/sctp_indata.h#2 integrate .. //depot/projects/soc2007/chub-msdosfs/netinet/sctp_input.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/netinet/sctp_output.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/netinet/sctp_pcb.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/netinet/sctp_timer.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/netinet/sctp_uio.h#2 integrate .. //depot/projects/soc2007/chub-msdosfs/netinet/sctp_usrreq.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/netinet/sctputil.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/powerpc/powerpc/busdma_machdep.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/security/audit/audit.h#2 integrate .. //depot/projects/soc2007/chub-msdosfs/security/audit/audit_arg.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/security/audit/audit_bsm.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/security/audit/audit_bsm_token.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/security/audit/audit_syscalls.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/security/mac/mac_audit.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/security/mac/mac_framework.h#2 integrate .. //depot/projects/soc2007/chub-msdosfs/security/mac/mac_policy.h#2 integrate .. //depot/projects/soc2007/chub-msdosfs/security/mac_stub/mac_stub.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/security/mac_test/mac_test.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/sparc64/pci/ofw_pci.c#2 delete .. //depot/projects/soc2007/chub-msdosfs/sparc64/pci/ofw_pci.h#2 integrate .. //depot/projects/soc2007/chub-msdosfs/sparc64/pci/ofw_pci_if.m#2 integrate .. //depot/projects/soc2007/chub-msdosfs/sparc64/pci/ofw_pcib.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/sparc64/pci/ofw_pcib_subr.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/sparc64/pci/psycho.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/sys/_rwlock.h#2 integrate .. //depot/projects/soc2007/chub-msdosfs/sys/priv.h#2 integrate .. //depot/projects/soc2007/chub-msdosfs/sys/rwlock.h#2 integrate .. //depot/projects/soc2007/chub-msdosfs/ufs/ffs/ffs_softdep.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/ufs/ufs/ufs_inode.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/vm/swap_pager.c#2 integrate .. //depot/projects/soc2007/chub-msdosfs/vm/vm_pageout.c#2 integrate Differences ... ==== //depot/projects/soc2007/chub-msdosfs/boot/forth/loader.conf#2 (text+ko) ==== @@ -6,7 +6,7 @@ # # All arguments must be in double quotes. # -# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.120 2007/04/09 22:09:09 pjd Exp $ +# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.121 2007/06/25 05:06:55 rafan Exp $ ############################################################## ### Basic configuration options ############################ @@ -135,7 +135,6 @@ portalfs_load="NO" # Portal filesystem procfs_load="NO" # Process filesystem reiserfs_load="NO" # ReiserFS -#umapfs_load="NO" # User-id map filesystem unionfs_load="NO" # Union filesystem xfs_load="NO" # XFS zfs_load="NO" # ZFS ==== //depot/projects/soc2007/chub-msdosfs/cam/scsi/scsi_da.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.215 2007/06/16 18:22:19 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.217 2007/06/28 06:12:55 imp Exp $"); #include @@ -457,6 +457,14 @@ }, { /* + * iRiver U10 MP3 player + * PR: usb/92306 + */ + {T_DIRECT, SIP_MEDIA_REMOVABLE, "iriver", "U10*", + "*"}, /*quirks*/ DA_Q_NO_SYNC_CACHE + }, + { + /* * X-Micro Flash Disk * PR: usb/96901 */ @@ -471,6 +479,14 @@ {T_DIRECT, SIP_MEDIA_REMOVABLE, "EM732X", "MP3 Player*", "1.0"}, /*quirks*/ DA_Q_NO_SYNC_CACHE }, + { + /* + * Denver MP3 player + * PR: usb/107101 + */ + {T_DIRECT, SIP_MEDIA_REMOVABLE, "DENVER", "MP3 PLAYER", + "*"}, /*quirks*/ DA_Q_NO_SYNC_CACHE + }, }; static disk_strategy_t dastrategy; ==== //depot/projects/soc2007/chub-msdosfs/conf/NOTES#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1434 2007/06/16 04:57:03 alc Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1437 2007/06/27 02:34:22 rafan Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -938,10 +938,12 @@ # currently be demand-loaded.) Some people still prefer to statically # compile other filesystems as well. # -# NB: The NULL, PORTAL, UMAP and UNION filesystems are known to be -# buggy, and WILL panic your system if you attempt to do anything with -# them. They are included here as an incentive for some enterprising -# soul to sit down and fix them. +# NB: The PORTAL filesystem is known to be buggy, and WILL panic your +# system if you attempt to do anything with it. It is included here +# as an incentive for some enterprising soul to sit down and fix it. +# The UNION filesystem was known to be buggy in the past. It is now +# being actively maintained, although there are still some issues being +# resolved. # # One of these is mandatory: @@ -964,8 +966,6 @@ options PSEUDOFS_TRACE #Debugging support for PSEUDOFS options SMBFS #SMB/CIFS filesystem options UDF #Universal Disk Format -# Broken (seriously (functionally) broken): -#options UMAPFS #UID map filesystem options UNIONFS #Union filesystem # The xFS_ROOT options REQUIRE the associated ``options xFS'' options NFS_ROOT #NFS usable as root device ==== //depot/projects/soc2007/chub-msdosfs/conf/files#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.1222 2007/06/16 04:57:04 alc Exp $ +# $FreeBSD: src/sys/conf/files,v 1.1223 2007/06/25 05:06:55 rafan Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1199,9 +1199,6 @@ fs/udf/udf_iconv.c optional udf_iconv fs/udf/udf_vfsops.c optional udf fs/udf/udf_vnops.c optional udf -fs/umapfs/umap_subr.c optional umapfs -fs/umapfs/umap_vfsops.c optional umapfs -fs/umapfs/umap_vnops.c optional umapfs fs/unionfs/union_subr.c optional unionfs fs/unionfs/union_vfsops.c optional unionfs fs/unionfs/union_vnops.c optional unionfs ==== //depot/projects/soc2007/chub-msdosfs/conf/files.sparc64#2 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.sparc64,v 1.90 2007/06/16 21:48:48 marius Exp $ +# $FreeBSD: src/sys/conf/files.sparc64,v 1.91 2007/06/18 21:49:42 marius Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -81,7 +81,6 @@ sparc64/isa/isa_dma.c optional isa sparc64/isa/ofw_isa.c optional ebus | isa sparc64/pci/apb.c optional pci -sparc64/pci/ofw_pci.c optional pci sparc64/pci/ofw_pcib.c optional pci sparc64/pci/ofw_pcib_subr.c optional pci sparc64/pci/ofw_pcibus.c optional pci ==== //depot/projects/soc2007/chub-msdosfs/conf/files.sun4v#2 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.sun4v,v 1.9 2007/06/11 00:38:06 marcel Exp $ +# $FreeBSD: src/sys/conf/files.sun4v,v 1.10 2007/06/18 21:49:42 marius Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -47,7 +47,6 @@ sparc64/sparc64/gdb_machdep.c optional gdb sun4v/sun4v/hv_pci.c optional pci sun4v/sun4v/trap_trace.S optional trap_tracing -sparc64/pci/ofw_pci.c optional pci sparc64/pci/ofw_pcib.c optional pci sparc64/pci/ofw_pcib_subr.c optional pci sparc64/pci/ofw_pcibus.c optional pci ==== //depot/projects/soc2007/chub-msdosfs/conf/options#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.596 2007/06/16 04:57:04 alc Exp $ +# $FreeBSD: src/sys/conf/options,v 1.597 2007/06/25 05:06:55 rafan Exp $ # # On the handling of kernel options # @@ -198,7 +198,6 @@ SMBFS opt_dontuse.h TMPFS opt_dontuse.h UDF opt_dontuse.h -UMAPFS opt_dontuse.h UNIONFS opt_dontuse.h # Pseudofs debugging ==== //depot/projects/soc2007/chub-msdosfs/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#2 (text+ko) ==== @@ -766,7 +766,7 @@ vn_lock(*vpp, flags, curthread); } ZFS_EXIT(zfsvfs); - return (0); + return (err); } static int ==== //depot/projects/soc2007/chub-msdosfs/dev/acpica/acpi.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi.c,v 1.239 2007/06/15 18:02:33 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi.c,v 1.240 2007/06/21 22:50:37 njl Exp $"); #include "opt_acpi.h" #include @@ -136,6 +136,7 @@ static ACPI_STATUS acpi_probe_child(ACPI_HANDLE handle, UINT32 level, void *context, void **status); static BOOLEAN acpi_MatchHid(ACPI_HANDLE h, const char *hid); +static ACPI_STATUS acpi_EnterSleepState(struct acpi_softc *sc, int state); static void acpi_shutdown_final(void *arg, int howto); static void acpi_enable_fixed_events(struct acpi_softc *sc); static int acpi_wake_sleep_prep(ACPI_HANDLE handle, int sstate); @@ -410,6 +411,7 @@ sc = device_get_softc(dev); sc->acpi_dev = dev; + callout_init(&sc->susp_force_to, TRUE); error = ENXIO; @@ -592,7 +594,7 @@ /* Pick the first valid sleep state for the sleep button default. */ sc->acpi_sleep_button_sx = ACPI_S_STATES_MAX + 1; - for (state = ACPI_STATE_S1; state < ACPI_STATE_S5; state++) + for (state = ACPI_STATE_S1; state <= ACPI_STATE_S4; state++) if (ACPI_SUCCESS(AcpiGetSleepTypeData(state, &TypeA, &TypeB))) { sc->acpi_sleep_button_sx = state; break; @@ -2118,7 +2120,151 @@ return (acpi_SetInteger(ACPI_ROOT_OBJECT, "_PIC", model)); } +/* + * DEPRECATED. This interface has serious deficiencies and will be + * removed. + * + * Immediately enter the sleep state. In the old model, acpiconf(8) ran + * rc.suspend and rc.resume so we don't have to notify devd(8) to do this. + */ +ACPI_STATUS +acpi_SetSleepState(struct acpi_softc *sc, int state) +{ + static int once; + + if (!once) { + printf( +"warning: acpi_SetSleepState() deprecated, need to update your software\n"); + once = 1; + } + return (acpi_EnterSleepState(sc, state)); +} + static void +acpi_sleep_force(void *arg) +{ + struct acpi_softc *sc; + + printf("acpi: suspend request timed out, forcing sleep now\n"); + sc = arg; + if (ACPI_FAILURE(acpi_EnterSleepState(sc, sc->acpi_next_sstate))) + printf("acpi: force sleep state S%d failed\n", sc->acpi_next_sstate); +} + +/* + * Request that the system enter the given suspend state. All /dev/apm + * devices and devd(8) will be notified. Userland then has a chance to + * save state and acknowledge the request. The system sleeps once all + * acks are in. + */ +int +acpi_ReqSleepState(struct acpi_softc *sc, int state) +{ + struct apm_clone_data *clone; + + if (state < ACPI_STATE_S1 || state > ACPI_STATE_S5) + return (EINVAL); + + /* S5 (soft-off) should be entered directly with no waiting. */ + if (state == ACPI_STATE_S5) { + if (ACPI_SUCCESS(acpi_EnterSleepState(sc, state))) + return (0); + else + return (ENXIO); + } + + /* If a suspend request is already in progress, just return. */ + ACPI_LOCK(acpi); + if (sc->acpi_next_sstate != 0) { + ACPI_UNLOCK(acpi); + return (0); + } + + /* Record the pending state and notify all apm devices. */ + sc->acpi_next_sstate = state; + STAILQ_FOREACH(clone, &sc->apm_cdevs, entries) { + clone->notify_status = APM_EV_NONE; + if ((clone->flags & ACPI_EVF_DEVD) == 0) { + selwakeuppri(&clone->sel_read, PZERO); + KNOTE_UNLOCKED(&clone->sel_read.si_note, 0); + } + } + + /* Now notify devd(8) also. */ + acpi_UserNotify("Suspend", ACPI_ROOT_OBJECT, state); + + /* + * Set a timeout to fire if userland doesn't ack the suspend request + * in time. This way we still eventually go to sleep if we were + * overheating or running low on battery, even if userland is hung. + * We cancel this timeout once all userland acks are in or the + * suspend request is aborted. + */ + callout_reset(&sc->susp_force_to, 10 * hz, acpi_sleep_force, sc); + ACPI_UNLOCK(acpi); + return (0); +} + +/* + * Acknowledge (or reject) a pending sleep state. The caller has + * prepared for suspend and is now ready for it to proceed. If the + * error argument is non-zero, it indicates suspend should be cancelled + * and gives an errno value describing why. Once all votes are in, + * we suspend the system. + */ +int +acpi_AckSleepState(struct apm_clone_data *clone, int error) +{ + struct acpi_softc *sc; + int ret, sleeping; + + /* If no pending sleep state, return an error. */ + ACPI_LOCK(acpi); + sc = clone->acpi_sc; + if (sc->acpi_next_sstate == 0) { + ACPI_UNLOCK(acpi); + return (ENXIO); + } + + /* Caller wants to abort suspend process. */ + if (error) { + sc->acpi_next_sstate = 0; + callout_stop(&sc->susp_force_to); + printf("acpi: listener on %s cancelled the pending suspend\n", + devtoname(clone->cdev)); + ACPI_UNLOCK(acpi); + return (0); + } + + /* + * Mark this device as acking the suspend request. Then, walk through + * all devices, seeing if they agree yet. We only count devices that + * are writable since read-only devices couldn't ack the request. + */ + clone->notify_status = APM_EV_ACKED; + sleeping = TRUE; + STAILQ_FOREACH(clone, &sc->apm_cdevs, entries) { + if ((clone->flags & ACPI_EVF_WRITE) != 0 && + clone->notify_status != APM_EV_ACKED) { + sleeping = FALSE; + break; + } + } + + /* If all devices have voted "yes", we will suspend now. */ + if (sleeping) + callout_stop(&sc->susp_force_to); + ACPI_UNLOCK(acpi); + ret = 0; + if (sleeping) { + if (ACPI_FAILURE(acpi_EnterSleepState(sc, sc->acpi_next_sstate))) + ret = ENODEV; + } + + return (ret); +} + +static void acpi_sleep_enable(void *arg) { @@ -2134,12 +2280,12 @@ }; /* - * Set the system sleep state + * Enter the desired system sleep state. * * Currently we support S1-S5 but S4 is only S4BIOS */ -ACPI_STATUS -acpi_SetSleepState(struct acpi_softc *sc, int state) +static ACPI_STATUS +acpi_EnterSleepState(struct acpi_softc *sc, int state) { ACPI_STATUS status; UINT8 TypeA; @@ -2148,14 +2294,13 @@ ACPI_FUNCTION_TRACE_U32((char *)(uintptr_t)__func__, state); + /* Re-entry once we're suspending is not allowed. */ status = AE_OK; ACPI_LOCK(acpi); if (sc->acpi_sleep_disabled) { - if (sc->acpi_sstate != ACPI_STATE_S0) - status = AE_ERROR; ACPI_UNLOCK(acpi); printf("acpi: suspend request ignored (not ready yet)\n"); - return (status); + return (AE_ERROR); } sc->acpi_sleep_disabled = 1; ACPI_UNLOCK(acpi); @@ -2251,6 +2396,7 @@ * Back out state according to how far along we got in the suspend * process. This handles both the error and success cases. */ + sc->acpi_next_sstate = 0; if (slp_state >= ACPI_SS_GPE_SET) { acpi_wake_prep_walk(state); sc->acpi_sstate = ACPI_STATE_S0; @@ -2264,7 +2410,10 @@ /* Allow another sleep request after a while. */ if (state != ACPI_STATE_S5) - timeout(acpi_sleep_enable, (caddr_t)sc, hz * ACPI_MINIMUM_AWAKETIME); + timeout(acpi_sleep_enable, sc, hz * ACPI_MINIMUM_AWAKETIME); + + /* Run /etc/rc.resume after we are back. */ + acpi_UserNotify("Resume", ACPI_ROOT_OBJECT, state); mtx_unlock(&Giant); return_ACPI_STATUS (status); @@ -2574,11 +2723,15 @@ static void acpi_system_eventhandler_sleep(void *arg, int state) { + int ret; ACPI_FUNCTION_TRACE_U32((char *)(uintptr_t)__func__, state); - if (state >= ACPI_STATE_S0 && state <= ACPI_S_STATES_MAX) - acpi_SetSleepState((struct acpi_softc *)arg, state); + /* Request that the system prepare to enter the given suspend state. */ + ret = acpi_ReqSleepState((struct acpi_softc *)arg, state); + if (ret != 0) + printf("acpi: request to enter state S%d failed (err %d)\n", + state, ret); return_VOID; } @@ -2840,7 +2993,20 @@ /* Core system ioctls. */ switch (cmd) { - case ACPIIO_SETSLPSTATE: + case ACPIIO_REQSLPSTATE: + state = *(int *)addr; + if (state != ACPI_STATE_S5) + error = acpi_ReqSleepState(sc, state); + else { + printf("power off via acpi ioctl not supported\n"); + error = ENXIO; + } + break; + case ACPIIO_ACKSLPSTATE: + error = *(int *)addr; + error = acpi_AckSleepState(sc->acpi_clone, error); + break; + case ACPIIO_SETSLPSTATE: /* DEPRECATED */ error = EINVAL; state = *(int *)addr; if (state >= ACPI_STATE_S0 && state <= ACPI_S_STATES_MAX) @@ -3171,7 +3337,8 @@ goto out; } - acpi_SetSleepState(sc, acpi_state); + if (ACPI_FAILURE(acpi_EnterSleepState(sc, acpi_state))) + error = ENXIO; break; default: error = EINVAL; ==== //depot/projects/soc2007/chub-msdosfs/dev/acpica/acpiio.h#2 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpiio.h,v 1.16 2005/10/23 00:16:41 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpiio.h,v 1.17 2007/06/21 22:50:37 njl Exp $ */ #ifndef _ACPIIO_H_ @@ -33,7 +33,13 @@ /* * Core ACPI subsystem ioctls */ -#define ACPIIO_SETSLPSTATE _IOW('P', 3, int) +#define ACPIIO_SETSLPSTATE _IOW('P', 3, int) /* DEPRECATED */ + +/* Request S1-5 sleep state. User is notified and then sleep proceeds. */ +#define ACPIIO_REQSLPSTATE _IOW('P', 4, int) + +/* Allow suspend to continue (0) or abort it (errno). */ +#define ACPIIO_ACKSLPSTATE _IOW('P', 5, int) struct acpi_battinfo { int cap; /* percent */ ==== //depot/projects/soc2007/chub-msdosfs/dev/acpica/acpivar.h#2 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/acpica/acpivar.h,v 1.106 2007/06/15 18:02:34 njl Exp $ + * $FreeBSD: src/sys/dev/acpica/acpivar.h,v 1.107 2007/06/21 22:50:37 njl Exp $ */ #ifndef _ACPIVAR_H_ @@ -39,12 +39,14 @@ #include #include #include +#include #include #include #include #include +struct apm_clone_data; struct acpi_softc { device_t acpi_dev; struct cdev *acpi_dev_t; @@ -76,6 +78,11 @@ bus_dmamap_t acpi_wakemap; vm_offset_t acpi_wakeaddr; vm_paddr_t acpi_wakephys; + + int acpi_next_sstate; /* Next suspend Sx state. */ + struct apm_clone_data *acpi_clone; /* Pseudo-dev for devd(8). */ + STAILQ_HEAD(,apm_clone_data) apm_cdevs; /* All apm/apmctl/acpi cdevs. */ + struct callout susp_force_to; /* Force suspend if no acks. */ }; struct acpi_device { @@ -89,6 +96,22 @@ struct resource_list ad_rl; }; +/* Track device (/dev/{apm,apmctl} and /dev/acpi) notification status. */ +struct apm_clone_data { + STAILQ_ENTRY(apm_clone_data) entries; + struct cdev *cdev; + int flags; +#define ACPI_EVF_NONE 0 /* /dev/apm semantics */ +#define ACPI_EVF_DEVD 1 /* /dev/acpi is handled via devd(8) */ +#define ACPI_EVF_WRITE 2 /* Device instance is opened writable. */ + int notify_status; +#define APM_EV_NONE 0 /* Device not yet aware of pending sleep. */ +#define APM_EV_NOTIFIED 1 /* Device saw next sleep state. */ +#define APM_EV_ACKED 2 /* Device agreed sleep can occur. */ + struct acpi_softc *acpi_sc; + struct selinfo sel_read; +}; + #define ACPI_PRW_MAX_POWERRES 8 struct acpi_prw_data { @@ -304,6 +327,8 @@ ACPI_RESOURCE *res); ACPI_STATUS acpi_OverrideInterruptLevel(UINT32 InterruptNumber); ACPI_STATUS acpi_SetIntrModel(int model); +int acpi_ReqSleepState(struct acpi_softc *sc, int state); +int acpi_AckSleepState(struct apm_clone_data *clone, int error); ACPI_STATUS acpi_SetSleepState(struct acpi_softc *sc, int state); int acpi_wake_init(device_t dev, int type); int acpi_wake_set_enable(device_t dev, int enable); ==== //depot/projects/soc2007/chub-msdosfs/dev/ata/ata-all.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ata/ata-all.h,v 1.123 2007/04/08 19:18:51 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-all.h,v 1.124 2007/06/26 22:13:43 remko Exp $ */ /* ATA register defines */ @@ -294,6 +294,7 @@ #define ATA_DEV(device) ((device == ATA_MASTER) ? 0 : 1) #define ATA_CFA_MAGIC1 0x844A #define ATA_CFA_MAGIC2 0x848A +#define ATA_CFA_MAGIC3 0x8400 #define ATAPI_MAGIC_LSB 0x14 #define ATAPI_MAGIC_MSB 0xeb #define ATAPI_P_READ (ATA_S_DRQ | ATA_I_IN) ==== //depot/projects/soc2007/chub-msdosfs/dev/ata/ata-chipset.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.197 2007/06/13 17:44:49 bms Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.198 2007/06/25 08:21:21 sos Exp $"); #include "opt_ata.h" #include @@ -2890,6 +2890,10 @@ { ATA_NFORCE_MCP55, 0, AMDNVIDIA, NVIDIA, ATA_UDMA6, "nForce MCP55" }, { ATA_NFORCE_MCP55_S1, 0, 0, NV4|NVQ, ATA_SA300, "nForce MCP55" }, { ATA_NFORCE_MCP55_S2, 0, 0, NV4|NVQ, ATA_SA300, "nForce MCP55" }, + { ATA_NFORCE_MCP61, 0, AMDNVIDIA, NVIDIA, ATA_UDMA6, "nForce MCP61" }, + { ATA_NFORCE_MCP61_S1, 0, 0, NV4|NVQ, ATA_SA300, "nForce MCP61" }, + { ATA_NFORCE_MCP61_S2, 0, 0, NV4|NVQ, ATA_SA300, "nForce MCP61" }, + { ATA_NFORCE_MCP61_S3, 0, 0, NV4|NVQ, ATA_SA300, "nForce MCP61" }, { 0, 0, 0, 0, 0, 0}} ; char buffer[64] ; ==== //depot/projects/soc2007/chub-msdosfs/dev/ata/ata-disk.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-disk.c,v 1.203 2007/05/06 01:20:06 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-disk.c,v 1.204 2007/06/26 22:13:43 remko Exp $"); #include "opt_ata.h" #include @@ -80,7 +80,8 @@ if (!(atadev->param.config & ATA_PROTO_ATAPI) || (atadev->param.config == ATA_CFA_MAGIC1) || - (atadev->param.config == ATA_CFA_MAGIC2)) + (atadev->param.config == ATA_CFA_MAGIC2) || + (atadev->param.config == ATA_CFA_MAGIC3)) return 0; else return ENXIO; ==== //depot/projects/soc2007/chub-msdosfs/dev/ata/ata-pci.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ata/ata-pci.h,v 1.76 2007/03/09 22:23:39 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-pci.h,v 1.77 2007/06/25 08:21:21 sos Exp $ */ /* structure holding chipset config info */ @@ -222,6 +222,10 @@ #define ATA_NFORCE_MCP55 0x036e10de #define ATA_NFORCE_MCP55_S1 0x037e10de #define ATA_NFORCE_MCP55_S2 0x037f10de +#define ATA_NFORCE_MCP61 0x03ec10de +#define ATA_NFORCE_MCP61_S1 0x03e710de +#define ATA_NFORCE_MCP61_S2 0x03f610de +#define ATA_NFORCE_MCP61_S3 0x03f710de #define ATA_PROMISE_ID 0x105a #define ATA_PDC20246 0x4d33105a ==== //depot/projects/soc2007/chub-msdosfs/dev/ata/ata-usb.c#2 (text) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-usb.c,v 1.6 2007/02/21 19:07:18 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-usb.c,v 1.7 2007/06/23 21:52:05 imp Exp $"); #include "opt_ata.h" #include @@ -45,6 +45,7 @@ #include #include #include +#include #include #include #include ==== //depot/projects/soc2007/chub-msdosfs/dev/ath/if_ath.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.171 2007/06/11 03:36:49 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.172 2007/06/24 01:57:20 sam Exp $"); /* * Driver for the Atheros Wireless LAN controller. @@ -4798,8 +4798,10 @@ bf->bf_node = NULL; if (ni != NULL) { /* - * Reclaim node reference. + * Do any callback and reclaim the node reference. */ + if (bf->bf_m->m_flags & M_TXCB) + ieee80211_process_callback(ni, bf->bf_m, -1); ieee80211_free_node(ni); } m_freem(bf->bf_m); ==== //depot/projects/soc2007/chub-msdosfs/dev/if_ndis/if_ndis_usb.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis_usb.c,v 1.8 2007/06/12 15:37:19 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis_usb.c,v 1.9 2007/06/18 22:24:32 imp Exp $"); #include #include @@ -69,10 +69,9 @@ MODULE_DEPEND(ndis, usb, 1, 1, 1); -static int ndisusb_match (device_t); -static int ndisusb_attach (device_t); -static struct resource_list *ndis_get_resource_list - (device_t, device_t); +static device_probe_t ndisusb_match; +static device_attach_t ndisusb_attach; +static bus_get_resource_list_t ndis_get_resource_list; extern int ndisdrv_modevent (module_t, int, void *); extern int ndis_attach (device_t); @@ -108,22 +107,25 @@ DRIVER_MODULE(ndis, uhub, ndis_driver, ndis_devclass, ndisdrv_modevent, 0); -USB_MATCH(ndisusb) +static int +ndisusb_match(device_t self) { - USB_MATCH_START(ndisusb, uaa); + struct usb_attach_arg *uaa = device_get_ivars(self); if (windrv_lookup(0, "USB Bus") == NULL) - return(UMATCH_NONE); + return (UMATCH_NONE); if (uaa->iface != NULL) - return(UMATCH_NONE); + return (UMATCH_NONE); - return(UMATCH_NONE); + return (UMATCH_NONE); } -USB_ATTACH(ndisusb) +static int +ndisusb_attach(device_t self) { - USB_ATTACH_START(ndisusb, dummy, uaa); + struct ndisusb_softc *dummy = device_get_softc(self); + struct usb_attach_arg *uaa = device_get_ivars(self); struct ndis_softc *sc; driver_object *drv; @@ -146,9 +148,7 @@ } static struct resource_list * -ndis_get_resource_list(dev, child) - device_t dev; - device_t child; +ndis_get_resource_list(device_t dev, device_t child) { struct ndis_softc *sc; ==== //depot/projects/soc2007/chub-msdosfs/dev/isp/isp.c#2 (text+ko) ==== @@ -46,7 +46,7 @@ #endif #ifdef __FreeBSD__ #include -__FBSDID("$FreeBSD: src/sys/dev/isp/isp.c,v 1.146 2007/05/05 20:17:22 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/isp/isp.c,v 1.147 2007/06/24 01:41:16 mjacob Exp $"); #include #endif #ifdef __OpenBSD__ @@ -812,7 +812,7 @@ } cp = isp->isp_rquest; for (i = 0; i < nw; i++) { - cp[i] = ptr[wi++]; + ISP_IOXPUT_32(isp, ptr[wi++], &cp[i]); wl--; } MEMORYBARRIER(isp, SYNC_REQUEST, @@ -875,7 +875,7 @@ } cp = isp->isp_rquest; for (i = 0; i < nw; i++) { - cp[i] = ptr[wi++]; + ISP_IOXPUT_16(isp, ptr[wi++], &cp[i]); wl--; } MEMORYBARRIER(isp, SYNC_REQUEST, ==== //depot/projects/soc2007/chub-msdosfs/dev/isp/isp_pci.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ * FreeBSD Version. */ #include -__FBSDID("$FreeBSD: src/sys/dev/isp/isp_pci.c,v 1.145 2007/06/11 17:56:17 mjacob Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/isp/isp_pci.c,v 1.148 2007/06/26 23:08:57 mjacob Exp $"); #include #include @@ -2847,10 +2847,22 @@ (ispextreq_t *)qep); break; case RQSTYPE_T2RQS: - isp_put_request_t2(isp, (ispreqt2_t *) rq, (ispreqt2_t *) qep); + if (FCPARAM(isp)->isp_2klogin) { + isp_put_request_t2e(isp, + (ispreqt2e_t *) rq, (ispreqt2e_t *) qep); + } else { >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Jun 28 23:19:58 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7637016A468; Thu, 28 Jun 2007 23:19:58 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4205D16A421 for ; Thu, 28 Jun 2007 23:19:58 +0000 (UTC) (envelope-from chub@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 30B6013C46A for ; Thu, 28 Jun 2007 23:19:58 +0000 (UTC) (envelope-from chub@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5SNJwAv095504 for ; Thu, 28 Jun 2007 23:19:58 GMT (envelope-from chub@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5SNJwPo095497 for perforce@freebsd.org; Thu, 28 Jun 2007 23:19:58 GMT (envelope-from chub@FreeBSD.org) Date: Thu, 28 Jun 2007 23:19:58 GMT Message-Id: <200706282319.l5SNJwPo095497@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to chub@FreeBSD.org using -f From: Brian Chu To: Perforce Change Reviews Cc: Subject: PERFORCE change 122505 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Jun 2007 23:19:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=122505 Change 122505 by chub@chub-msdosfs on 2007/06/28 23:16:33 Re-rooted branch to start from freebsd source; need to access certain directories outside of sys/ Affected files ... .. //depot/projects/soc2007/chub-msdosfs/sbin/fsck/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/sbin/fsck/fsck.8#1 branch .. //depot/projects/soc2007/chub-msdosfs/sbin/fsck/fsck.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sbin/fsck/fsutil.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sbin/fsck/fsutil.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sbin/fsck/preen.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sbin/fsck_msdosfs/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/sbin/fsck_msdosfs/boot.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sbin/fsck_msdosfs/check.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sbin/fsck_msdosfs/dir.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sbin/fsck_msdosfs/dosfs.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sbin/fsck_msdosfs/ext.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sbin/fsck_msdosfs/fat.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sbin/fsck_msdosfs/fsck_msdosfs.8#1 branch .. //depot/projects/soc2007/chub-msdosfs/sbin/fsck_msdosfs/main.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sbin/mount_msdosfs/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/sbin/mount_msdosfs/mount_msdosfs.8#1 branch .. //depot/projects/soc2007/chub-msdosfs/sbin/mount_msdosfs/mount_msdosfs.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/acpica/OsdEnvironment.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/acpica/acpi_machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/acpica/acpi_wakeup.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/acpica/madt.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/amd64/amd64_mem.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/amd64/apic_vector.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/amd64/atomic.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/amd64/autoconf.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/amd64/bios.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/amd64/bpf_jit_machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/amd64/bpf_jit_machdep.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/amd64/busdma_machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/amd64/cpu_switch.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/amd64/db_disasm.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/amd64/db_interface.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/amd64/db_trace.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/amd64/dump_machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/amd64/elf_machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/amd64/exception.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/amd64/fpu.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/amd64/gdb_machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/amd64/genassym.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/amd64/identcpu.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/amd64/in_cksum.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/amd64/initcpu.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/amd64/intr_machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/amd64/io.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/amd64/io_apic.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/amd64/legacy.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/amd64/local_apic.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/amd64/locore.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/amd64/machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/amd64/mem.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/amd64/minidump_machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/amd64/mp_machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/amd64/mp_watchdog.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/amd64/mpboot.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/amd64/mptable.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/amd64/mptable_pci.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/amd64/msi.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/amd64/nexus.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/amd64/pmap.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/amd64/prof_machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/amd64/sigtramp.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/amd64/support.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/amd64/sys_machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/amd64/trap.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/amd64/tsc.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/amd64/uio_machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/amd64/uma_machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/amd64/vm_machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/compile/.cvsignore#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/conf/.cvsignore#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/conf/DEFAULTS#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/conf/GENERIC#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/conf/GENERIC.hints#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/conf/MAC#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/conf/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/conf/NOTES#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/ia32/ia32_exception.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/ia32/ia32_reg.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/ia32/ia32_signal.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/ia32/ia32_sigtramp.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/ia32/ia32_syscall.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/include/_bus.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/include/_inttypes.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/include/_limits.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/include/_stdint.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/include/_types.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/include/acpica_machdep.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/include/apicreg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/include/apicvar.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/include/asm.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/include/asmacros.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/include/atomic.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/include/bus.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/include/bus_dma.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/include/clock.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/include/cpu.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/include/cpufunc.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/include/cputypes.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/include/db_machdep.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/include/elf.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/include/endian.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/include/exec.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/include/float.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/include/floatingpoint.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/include/fpu.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/include/frame.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/include/gdb_machdep.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/include/ieeefp.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/include/in_cksum.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/include/intr_machdep.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/include/iodev.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/include/kdb.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/include/legacyvar.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/include/limits.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/include/md_var.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/include/memdev.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/include/metadata.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/include/minidump.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/include/mp_watchdog.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/include/mptable.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/include/mutex.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/include/param.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/include/pc/bios.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/include/pc/display.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/include/pcb.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/include/pcb_ext.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/include/pci_cfgreg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/include/pcpu.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/include/pmap.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/include/pmc_mdep.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/include/ppireg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/include/proc.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/include/profile.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/include/psl.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/include/ptrace.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/include/reg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/include/reloc.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/include/resource.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/include/runq.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/include/segments.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/include/setjmp.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/include/sf_buf.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/include/sigframe.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/include/signal.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/include/smp.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/include/specialreg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/include/stdarg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/include/sysarch.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/include/timerreg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/include/trap.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/include/tss.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/include/ucontext.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/include/varargs.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/include/vmparam.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/isa/atpic.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/isa/atpic_vector.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/isa/clock.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/isa/elcr.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/isa/icu.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/isa/isa.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/isa/isa.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/isa/isa_dma.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/isa/nmi.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/linux32/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/linux32/linux.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/linux32/linux32_dummy.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/linux32/linux32_genassym.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/linux32/linux32_ipc64.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/linux32/linux32_locore.s#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/linux32/linux32_machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/linux32/linux32_proto.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/linux32/linux32_support.s#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/linux32/linux32_syscall.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/linux32/linux32_sysent.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/linux32/linux32_sysvec.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/linux32/syscalls.conf#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/linux32/syscalls.master#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/pci/pci_bus.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/amd64/pci/pci_cfgreg.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/arm/autoconf.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/arm/bcopy_page.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/arm/bcopyinout.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/arm/bcopyinout_xscale.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/arm/blockio.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/arm/bootconfig.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/arm/bus_space_asm_generic.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/arm/busdma_machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/arm/copystr.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/arm/cpufunc.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/arm/cpufunc_asm.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/arm/cpufunc_asm_arm10.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/arm/cpufunc_asm_arm7tdmi.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/arm/cpufunc_asm_arm8.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/arm/cpufunc_asm_arm9.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/arm/cpufunc_asm_armv4.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/arm/cpufunc_asm_ixp12x0.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/arm/cpufunc_asm_sa1.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/arm/cpufunc_asm_sa11x0.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/arm/cpufunc_asm_xscale.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/arm/db_disasm.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/arm/db_interface.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/arm/db_trace.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/arm/disassem.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/arm/dump_machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/arm/elf_machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/arm/elf_trampoline.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/arm/exception.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/arm/fiq.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/arm/fiq_subr.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/arm/fusu.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/arm/gdb_machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/arm/genassym.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/arm/identcpu.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/arm/in_cksum.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/arm/in_cksum_arm.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/arm/inckern.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/arm/intr.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/arm/irq_dispatch.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/arm/locore.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/arm/machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/arm/mem.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/arm/nexus.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/arm/nexus_io.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/arm/nexus_io_asm.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/arm/pmap.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/arm/setcpsr.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/arm/setstack.s#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/arm/support.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/arm/swtch.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/arm/sys_machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/arm/trap.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/arm/uio_machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/arm/undefined.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/arm/vectors.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/arm/vm_machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/at91/at91.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/at91/at91_mci.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/at91/at91_mcireg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/at91/at91_pdcreg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/at91/at91_pio.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/at91/at91_pio_rm9200.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/at91/at91_pioreg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/at91/at91_piovar.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/at91/at91_pmc.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/at91/at91_pmcreg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/at91/at91_pmcvar.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/at91/at91_rtc.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/at91/at91_rtcreg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/at91/at91_spi.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/at91/at91_spireg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/at91/at91_ssc.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/at91/at91_sscreg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/at91/at91_st.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/at91/at91_streg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/at91/at91_twi.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/at91/at91_twiio.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/at91/at91_twireg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/at91/at91_usartreg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/at91/at91rm92reg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/at91/at91var.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/at91/files.at91#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/at91/files.kb920x#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/at91/hints.at91rm9200#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/at91/hints.at91sam9261#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/at91/if_ate.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/at91/if_atereg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/at91/kb920x_machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/at91/ohci_atmelarm.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/at91/std.at91#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/at91/std.kb920x#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/at91/uart_bus_at91usart.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/at91/uart_cpu_at91rm9200usart.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/at91/uart_dev_at91usart.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/compile/.cvsignore#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/conf/.cvsignore#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/conf/AVILA#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/conf/AVILA.hints#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/conf/BWCT#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/conf/BWCT.hints#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/conf/EP80219#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/conf/IQ31244#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/conf/KB920X#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/conf/KB920X.hints#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/conf/SIMICS#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/conf/SKYEYE#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/include/_bus.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/include/_inttypes.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/include/_limits.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/include/_stdint.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/include/_types.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/include/armreg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/include/asm.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/include/asmacros.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/include/atomic.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/include/blockio.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/include/bootconfig.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/include/bus.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/include/bus_dma.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/include/clock.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/include/cpu.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/include/cpuconf.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/include/cpufunc.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/include/db_machdep.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/include/disassem.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/include/elf.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/include/endian.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/include/exec.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/include/fiq.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/include/float.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/include/floatingpoint.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/include/fp.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/include/frame.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/include/gdb_machdep.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/include/ieee.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/include/ieeefp.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/include/in_cksum.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/include/intr.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/include/katelib.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/include/kdb.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/include/limits.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/include/machdep.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/include/md_var.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/include/memdev.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/include/metadata.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/include/mutex.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/include/param.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/include/pcb.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/include/pcpu.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/include/pmap.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/include/pmc_mdep.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/include/proc.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/include/profile.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/include/psl.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/include/pte.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/include/ptrace.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/include/reg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/include/reloc.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/include/resource.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/include/runq.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/include/setjmp.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/include/sf_buf.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/include/sigframe.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/include/signal.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/include/smp.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/include/stdarg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/include/swi.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/include/sysarch.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/include/trap.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/include/ucontext.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/include/undefined.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/include/utrap.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/include/vmparam.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/sa11x0/assabet_machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/sa11x0/files.sa11x0#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/sa11x0/sa11x0.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/sa11x0/sa11x0_dmacreg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/sa11x0/sa11x0_gpioreg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/sa11x0/sa11x0_io.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/sa11x0/sa11x0_io_asm.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/sa11x0/sa11x0_irq.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/sa11x0/sa11x0_irqhandler.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/sa11x0/sa11x0_ost.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/sa11x0/sa11x0_ostreg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/sa11x0/sa11x0_ppcreg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/sa11x0/sa11x0_reg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/sa11x0/sa11x0_var.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/sa11x0/std.sa11x0#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/sa11x0/uart_bus_sa1110.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/sa11x0/uart_cpu_sa1110.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/sa11x0/uart_dev_sa1110.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/sa11x0/uart_dev_sa1110.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/xscale/i80321/ep80219_machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/xscale/i80321/files.ep80219#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/xscale/i80321/files.i80219#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/xscale/i80321/files.i80321#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/xscale/i80321/files.iq31244#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/xscale/i80321/i80321.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/xscale/i80321/i80321_aau.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/xscale/i80321/i80321_dma.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/xscale/i80321/i80321_intr.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/xscale/i80321/i80321_mcu.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/xscale/i80321/i80321_pci.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/xscale/i80321/i80321_space.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/xscale/i80321/i80321_timer.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/xscale/i80321/i80321_wdog.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/xscale/i80321/i80321reg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/xscale/i80321/i80321var.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/xscale/i80321/iq31244_7seg.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/xscale/i80321/iq31244_machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/xscale/i80321/iq80321.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/xscale/i80321/iq80321reg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/xscale/i80321/iq80321var.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/xscale/i80321/obio.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/xscale/i80321/obio_space.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/xscale/i80321/obiovar.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/xscale/i80321/std.ep80219#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/xscale/i80321/std.i80219#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/xscale/i80321/std.i80321#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/xscale/i80321/std.iq31244#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/xscale/i80321/uart_bus_i80321.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/xscale/i80321/uart_cpu_i80321.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/xscale/ixp425/avila_ata.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/xscale/ixp425/avila_led.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/xscale/ixp425/avila_machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/xscale/ixp425/files.avila#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/xscale/ixp425/files.ixp425#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/xscale/ixp425/if_npe.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/xscale/ixp425/if_npereg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/xscale/ixp425/ixdp425_pci.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/xscale/ixp425/ixdp425reg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/xscale/ixp425/ixp425.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/xscale/ixp425/ixp425_a4x_io.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/xscale/ixp425/ixp425_a4x_space.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/xscale/ixp425/ixp425_iic.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/xscale/ixp425/ixp425_intr.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/xscale/ixp425/ixp425_mem.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/xscale/ixp425/ixp425_npe.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/xscale/ixp425/ixp425_npereg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/xscale/ixp425/ixp425_npevar.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/xscale/ixp425/ixp425_pci.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/xscale/ixp425/ixp425_pci_asm.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/xscale/ixp425/ixp425_pci_space.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/xscale/ixp425/ixp425_qmgr.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/xscale/ixp425/ixp425_qmgr.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/xscale/ixp425/ixp425_space.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/xscale/ixp425/ixp425_timer.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/xscale/ixp425/ixp425_wdog.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/xscale/ixp425/ixp425reg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/xscale/ixp425/ixp425var.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/xscale/ixp425/std.avila#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/xscale/ixp425/std.ixp425#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/xscale/ixp425/uart_bus_ixp425.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/xscale/ixp425/uart_cpu_ixp425.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/xscale/std.xscale#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/xscale/xscalereg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/arm/xscale/xscalevar.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/README#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/arm/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/arm/at91/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/arm/at91/Makefile.inc#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/arm/at91/boot0/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/arm/at91/boot0/README#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/arm/at91/boot0/linker.cfg#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/arm/at91/boot0/main.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/arm/at91/boot0iic/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/arm/at91/boot0iic/main.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/arm/at91/boot0spi/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/arm/at91/boot0spi/main.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/arm/at91/boot2/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/arm/at91/boot2/board.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/arm/at91/boot2/boot2.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/arm/at91/boot2/kb920x_board.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/arm/at91/bootiic/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/arm/at91/bootiic/README#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/arm/at91/bootiic/env_vars.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/arm/at91/bootiic/env_vars.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/arm/at91/bootiic/loader_prompt.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/arm/at91/bootiic/loader_prompt.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/arm/at91/bootiic/main.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/arm/at91/bootspi/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/arm/at91/bootspi/README#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/arm/at91/bootspi/ee.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/arm/at91/bootspi/ee.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/arm/at91/bootspi/env_vars.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/arm/at91/bootspi/env_vars.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/arm/at91/bootspi/loader_prompt.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/arm/at91/bootspi/loader_prompt.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/arm/at91/bootspi/main.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/arm/at91/libat91/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/arm/at91/libat91/arm_init.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/arm/at91/libat91/at91rm9200.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/arm/at91/libat91/delay.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/arm/at91/libat91/eeprom.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/arm/at91/libat91/emac.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/arm/at91/libat91/emac.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/arm/at91/libat91/emac_init.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/arm/at91/libat91/getc.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/arm/at91/libat91/lib.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/arm/at91/libat91/lib_AT91RM9200.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/arm/at91/libat91/mci_device.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/arm/at91/libat91/memcmp.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/arm/at91/libat91/memcpy.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/arm/at91/libat91/memset.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/arm/at91/libat91/p_string.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/arm/at91/libat91/printf.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/arm/at91/libat91/putchar.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/arm/at91/libat91/reset.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/arm/at91/libat91/sd-card.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/arm/at91/libat91/sd-card.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/arm/at91/libat91/spi_flash.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/arm/at91/libat91/spi_flash.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/arm/at91/libat91/strcmp.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/arm/at91/libat91/strcpy.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/arm/at91/libat91/strcvt.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/arm/at91/libat91/strlen.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/arm/at91/libat91/tag_list.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/arm/at91/libat91/tag_list.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/arm/at91/libat91/xmodem.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/arm/at91/linker.cfg#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/common/Makefile.inc#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/common/bcache.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/common/boot.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/common/bootstrap.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/common/commands.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/common/console.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/common/dev_net.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/common/dev_net.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/common/devopen.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/common/help.common#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/common/interp.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/common/interp_backslash.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/common/interp_forth.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/common/interp_parse.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/common/isapnp.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/common/isapnp.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/common/load.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/common/load_elf.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/common/load_elf32.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/common/load_elf32_obj.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/common/load_elf64.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/common/load_elf64_obj.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/common/load_elf_obj.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/common/loader.8#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/common/ls.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/common/merge_help.awk#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/common/misc.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/common/module.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/common/newvers.sh#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/common/panic.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/common/pnp.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/common/reloc_elf.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/common/reloc_elf32.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/common/reloc_elf64.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/common/ufsread.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/efi/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/efi/Makefile.inc#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/efi/include/README#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/efi/include/efi.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/efi/include/efi_nii.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/efi/include/efiapi.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/efi/include/eficon.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/efi/include/efidebug.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/efi/include/efidef.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/efi/include/efidevp.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/efi/include/efierr.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/efi/include/efifpswa.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/efi/include/efifs.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/efi/include/efilib.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/efi/include/efinet.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/efi/include/efipart.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/efi/include/efiprot.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/efi/include/efipxebc.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/efi/include/efiser.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/efi/include/efistdarg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/efi/include/i386/efibind.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/efi/include/i386/pe.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/efi/include/ia64/efibind.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/efi/include/ia64/pe.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/efi/libefi/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/efi/libefi/delay.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/efi/libefi/efi_console.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/efi/libefi/efifs.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/efi/libefi/efinet.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/efi/libefi/errno.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/efi/libefi/handles.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/efi/libefi/libefi.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/efi/libefi/time.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ficl/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ficl/arm/sysdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ficl/arm/sysdep.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ficl/dict.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ficl/ficl.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ficl/ficl.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ficl/fileaccess.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ficl/float.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ficl/i386/sysdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ficl/i386/sysdep.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ficl/ia64/sysdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ficl/ia64/sysdep.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ficl/loader.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ficl/math64.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ficl/math64.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ficl/powerpc/sysdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ficl/powerpc/sysdep.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ficl/prefix.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ficl/search.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ficl/softwords/classes.fr#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ficl/softwords/ficlclass.fr#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ficl/softwords/ficllocal.fr#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ficl/softwords/fileaccess.fr#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ficl/softwords/forml.fr#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ficl/softwords/freebsd.fr#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ficl/softwords/ifbrack.fr#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ficl/softwords/jhlocal.fr#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ficl/softwords/marker.fr#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ficl/softwords/oo.fr#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ficl/softwords/prefix.fr#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ficl/softwords/softcore.awk#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ficl/softwords/softcore.fr#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ficl/softwords/string.fr#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ficl/sparc64/sysdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ficl/sparc64/sysdep.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ficl/stack.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ficl/testmain.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ficl/tools.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ficl/unix.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ficl/vm.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ficl/words.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/forth/beastie.4th#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/forth/frames.4th#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/forth/loader.4th#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/forth/loader.4th.8#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/forth/loader.conf#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/forth/loader.conf.5#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/forth/loader.rc#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/forth/pnp.4th#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/forth/screen.4th#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/forth/support.4th#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/i386/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/i386/Makefile.inc#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/i386/boot0/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/i386/boot0/boot0.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/i386/boot0/boot0ext.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/i386/boot0ext/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/i386/boot0sio/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/i386/boot2/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/i386/boot2/boot1.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/i386/boot2/boot2.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/i386/boot2/lib.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/i386/boot2/sio.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/i386/btx/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/i386/btx/Makefile.inc#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/i386/btx/btx/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/i386/btx/btx/btx.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/i386/btx/btxldr/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/i386/btx/btxldr/btxldr.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/i386/btx/lib/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/i386/btx/lib/btxcsu.s#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/i386/btx/lib/btxsys.s#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/i386/btx/lib/btxv86.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/i386/btx/lib/btxv86.s#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/i386/cdboot/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/i386/cdboot/cdboot.s#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/i386/kgzldr/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/i386/kgzldr/boot.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/i386/kgzldr/crt.s#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/i386/kgzldr/kgzldr.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/i386/kgzldr/lib.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/i386/kgzldr/sio.s#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/i386/kgzldr/start.s#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/i386/libfirewire/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/i386/libfirewire/dconsole.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/i386/libfirewire/firewire.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/i386/libfirewire/fwohci.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/i386/libfirewire/fwohci.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/i386/libfirewire/fwohcireg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/i386/libi386/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/i386/libi386/amd64_tramp.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/i386/libi386/biosacpi.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/i386/libi386/bioscd.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/i386/libi386/biosdisk.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/i386/libi386/biosmem.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/i386/libi386/biospci.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/i386/libi386/biospnp.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/i386/libi386/biossmap.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/i386/libi386/bootinfo.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/i386/libi386/bootinfo32.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/i386/libi386/bootinfo64.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/i386/libi386/comconsole.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/i386/libi386/devicename.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/i386/libi386/elf32_freebsd.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/i386/libi386/elf64_freebsd.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/i386/libi386/i386_copy.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/i386/libi386/i386_module.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/i386/libi386/libi386.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/i386/libi386/nullconsole.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/i386/libi386/pread.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/i386/libi386/pxe.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/i386/libi386/pxe.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/i386/libi386/pxetramp.s#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/i386/libi386/smbios.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/i386/libi386/time.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/i386/libi386/vidconsole.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/i386/loader/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/i386/loader/conf.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/i386/loader/help.i386#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/i386/loader/loader.rc#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/i386/loader/main.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/i386/loader/version#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/i386/mbr/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/i386/mbr/mbr.s#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/i386/pxeldr/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/i386/pxeldr/pxeboot.8#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/i386/pxeldr/pxeldr.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ia64/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ia64/Makefile.inc#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ia64/common/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ia64/common/autoload.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ia64/common/bootinfo.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ia64/common/copy.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ia64/common/devicename.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ia64/common/exec.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ia64/common/libia64.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ia64/efi/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ia64/efi/conf.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ia64/efi/efimd.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ia64/efi/ldscript.ia64#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ia64/efi/main.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ia64/efi/start.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ia64/efi/version#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ia64/ski/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ia64/ski/acpi_stub.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ia64/ski/conf.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ia64/ski/delay.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ia64/ski/efi_stub.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ia64/ski/exit.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ia64/ski/ldscript.ia64#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ia64/ski/libski.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ia64/ski/main.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ia64/ski/pal_stub.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ia64/ski/sal_stub.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ia64/ski/skiconsole.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ia64/ski/skifs.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ia64/ski/skiload.cmd#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ia64/ski/skimd.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ia64/ski/ssc.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ia64/ski/start.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ia64/ski/time.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ia64/ski/version#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ofw/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ofw/common/Makefile.inc#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ofw/common/main.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ofw/libofw/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ofw/libofw/devicename.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ofw/libofw/elf_freebsd.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ofw/libofw/libofw.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ofw/libofw/ofw_console.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ofw/libofw/ofw_copy.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ofw/libofw/ofw_disk.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ofw/libofw/ofw_memory.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ofw/libofw/ofw_module.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ofw/libofw/ofw_net.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ofw/libofw/ofw_reboot.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ofw/libofw/ofw_time.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ofw/libofw/openfirm.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/ofw/libofw/openfirm.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/pc98/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/pc98/Makefile.inc#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/pc98/boot0.5/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/pc98/boot0.5/boot.s#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/pc98/boot0.5/boot0.5.s#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/pc98/boot0.5/disk.s#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/pc98/boot0.5/ldscript#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/pc98/boot0.5/putssjis.s#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/pc98/boot0.5/selector.s#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/pc98/boot0.5/start.s#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/pc98/boot0.5/support.s#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/pc98/boot0.5/syscons.s#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/pc98/boot0/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/pc98/boot0/boot0.s#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/pc98/boot2/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/pc98/boot2/README.serial.98#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/pc98/boot2/asm.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/pc98/boot2/asm.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/pc98/boot2/bios.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/pc98/boot2/boot.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/pc98/boot2/boot.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/pc98/boot2/boot2.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/pc98/boot2/dinode.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/pc98/boot2/disk.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/pc98/boot2/fs.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/pc98/boot2/inode.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/pc98/boot2/io.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/pc98/boot2/probe_keyboard.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/pc98/boot2/quota.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/pc98/boot2/serial.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/pc98/boot2/serial_16550.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/pc98/boot2/serial_8251.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/pc98/boot2/start.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/pc98/boot2/sys.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/pc98/boot2/table.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/pc98/btx/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/pc98/btx/Makefile.inc#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/pc98/btx/btx/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/pc98/btx/btx/btx.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/pc98/btx/btxldr/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/pc98/btx/btxldr/btxldr.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/pc98/btx/lib/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/pc98/btx/lib/btxcsu.s#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/pc98/btx/lib/btxsys.s#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/pc98/btx/lib/btxv86.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/pc98/btx/lib/btxv86.s#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/pc98/cdboot/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/pc98/cdboot/cdboot.s#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/pc98/kgzldr/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/pc98/kgzldr/crt.s#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/pc98/libpc98/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/pc98/libpc98/bioscd.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/pc98/libpc98/biosdisk.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/pc98/libpc98/biosmem.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/pc98/libpc98/biossmap.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/pc98/libpc98/comconsole.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/pc98/libpc98/i386_module.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/pc98/libpc98/time.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/pc98/libpc98/vidconsole.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/pc98/loader/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/pc98/loader/conf.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/pc98/loader/help.pc98#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/pc98/loader/main.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/powerpc/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/powerpc/loader/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/powerpc/loader/conf.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/powerpc/loader/help.ofw#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/powerpc/loader/ldscript.powerpc#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/powerpc/loader/metadata.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/powerpc/loader/start.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/powerpc/loader/version#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/sparc64/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/sparc64/Makefile.inc#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/sparc64/boot1/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/sparc64/boot1/_start.s#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/sparc64/boot1/boot1.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/sparc64/loader/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/sparc64/loader/help.sparc64#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/sparc64/loader/locore.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/sparc64/loader/main.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/sparc64/loader/metadata.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/boot/sparc64/loader/version#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/bsm/audit.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/bsm/audit_internal.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/bsm/audit_kevents.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/bsm/audit_record.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/cam/README.quirks#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/cam/cam.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/cam/cam.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/cam/cam_ccb.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/cam/cam_debug.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/cam/cam_periph.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/cam/cam_periph.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/cam/cam_queue.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/cam/cam_queue.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/cam/cam_sim.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/cam/cam_sim.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/cam/cam_xpt.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/cam/cam_xpt.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/cam/cam_xpt_periph.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/cam/cam_xpt_sim.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/cam/scsi/scsi_all.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/cam/scsi/scsi_all.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/cam/scsi/scsi_cd.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/cam/scsi/scsi_cd.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/cam/scsi/scsi_ch.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/cam/scsi/scsi_ch.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/cam/scsi/scsi_da.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/cam/scsi/scsi_da.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/cam/scsi/scsi_dvcfg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/cam/scsi/scsi_iu.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/cam/scsi/scsi_low.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/cam/scsi/scsi_low.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/cam/scsi/scsi_low_pisa.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/cam/scsi/scsi_low_pisa.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/cam/scsi/scsi_message.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/cam/scsi/scsi_pass.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/cam/scsi/scsi_pass.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/cam/scsi/scsi_pt.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/cam/scsi/scsi_pt.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/cam/scsi/scsi_sa.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/cam/scsi/scsi_sa.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/cam/scsi/scsi_ses.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/cam/scsi/scsi_ses.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/cam/scsi/scsi_sg.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/cam/scsi/scsi_sg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/cam/scsi/scsi_targ_bh.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/cam/scsi/scsi_target.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/cam/scsi/scsi_targetio.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/coda/00READ#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/coda/README#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/coda/TODO#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/coda/cnode.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/coda/coda.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/coda/coda_fbsd.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/coda/coda_io.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/coda/coda_kernel.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/coda/coda_namecache.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/coda/coda_namecache.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/coda/coda_opstats.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/coda/coda_pioctl.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/coda/coda_psdev.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/coda/coda_psdev.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/coda/coda_subr.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/coda/coda_subr.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/coda/coda_venus.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/coda/coda_venus.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/coda/coda_vfsops.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/coda/coda_vfsops.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/coda/coda_vnops.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/coda/coda_vnops.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/freebsd32/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/freebsd32/freebsd32.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/freebsd32/freebsd32_misc.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/freebsd32/freebsd32_proto.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/freebsd32/freebsd32_signal.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/freebsd32/freebsd32_syscall.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/freebsd32/freebsd32_syscalls.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/freebsd32/freebsd32_sysent.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/freebsd32/freebsd32_util.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/freebsd32/syscalls.conf#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/freebsd32/syscalls.master#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/ia32/ia32_genassym.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/ia32/ia32_reg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/ia32/ia32_signal.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/ia32/ia32_sysvec.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/ia32/ia32_util.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/linprocfs/linprocfs.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/linsysfs/linsysfs.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/linux/linux_emul.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/linux/linux_emul.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/linux/linux_file.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/linux/linux_futex.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/linux/linux_futex.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/linux/linux_getcwd.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/linux/linux_ioctl.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/linux/linux_ioctl.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/linux/linux_ipc.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/linux/linux_ipc.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/linux/linux_mib.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/linux/linux_mib.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/linux/linux_misc.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/linux/linux_misc.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/linux/linux_signal.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/linux/linux_signal.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/linux/linux_socket.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/linux/linux_socket.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/linux/linux_stats.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/linux/linux_sysctl.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/linux/linux_sysproto.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/linux/linux_time.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/linux/linux_uid16.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/linux/linux_util.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/linux/linux_util.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/ndis/cfg_var.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/ndis/hal_var.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/ndis/kern_ndis.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/ndis/kern_windrv.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/ndis/ndis_var.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/ndis/ntoskrnl_var.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/ndis/pe_var.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/ndis/resource_var.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/ndis/subr_hal.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/ndis/subr_ndis.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/ndis/subr_ntoskrnl.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/ndis/subr_pe.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/ndis/subr_usbd.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/ndis/usbd_var.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/ndis/winx32_wrap.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/ndis/winx64_wrap.S#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/netbsd/dvcfg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/netbsd/physio_proc.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/opensolaris/kern/opensolaris_atomic.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/opensolaris/kern/opensolaris_kmem.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/opensolaris/kern/opensolaris_kobj.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/opensolaris/kern/opensolaris_kstat.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/opensolaris/kern/opensolaris_misc.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/opensolaris/kern/opensolaris_policy.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/opensolaris/kern/opensolaris_string.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/opensolaris/kern/opensolaris_vfs.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/opensolaris/kern/opensolaris_zone.c#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/opensolaris/machine/endian.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/opensolaris/rpc/xdr.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/opensolaris/sys/acl.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/opensolaris/sys/atomic.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/opensolaris/sys/byteorder.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/opensolaris/sys/callb.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/opensolaris/sys/cmn_err.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/opensolaris/sys/cred.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/opensolaris/sys/debug.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/opensolaris/sys/dirent.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/opensolaris/sys/dkio.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/opensolaris/sys/dnlc.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/opensolaris/sys/kcondvar.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/opensolaris/sys/kmem.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/opensolaris/sys/kobj.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/opensolaris/sys/kstat.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/opensolaris/sys/lock.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/opensolaris/sys/misc.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/opensolaris/sys/mntent.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/opensolaris/sys/mnttab.h#1 branch .. //depot/projects/soc2007/chub-msdosfs/sys/compat/opensolaris/sys/mount.h#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jun 29 00:43:42 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1A09516A46B; Fri, 29 Jun 2007 00:43:42 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9FF7616A400 for ; Fri, 29 Jun 2007 00:43:41 +0000 (UTC) (envelope-from chub@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 8EB1D13C458 for ; Fri, 29 Jun 2007 00:43:41 +0000 (UTC) (envelope-from chub@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5T0hfpn009492 for ; Fri, 29 Jun 2007 00:43:41 GMT (envelope-from chub@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5T0hfj0009489 for perforce@freebsd.org; Fri, 29 Jun 2007 00:43:41 GMT (envelope-from chub@FreeBSD.org) Date: Fri, 29 Jun 2007 00:43:41 GMT Message-Id: <200706290043.l5T0hfj0009489@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to chub@FreeBSD.org using -f From: Brian Chu To: Perforce Change Reviews Cc: Subject: PERFORCE change 122506 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Jun 2007 00:43:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=122506 Change 122506 by chub@chub-msdosfs on 2007/06/29 00:42:42 freebsd import from vendor as the root. Affected files ... .. //depot/projects/soc2007/chub-msdosfs2/sbin/fsck/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sbin/fsck/fsck.8#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sbin/fsck/fsck.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sbin/fsck/fsutil.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sbin/fsck/fsutil.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sbin/fsck/preen.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sbin/fsck_msdosfs/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sbin/fsck_msdosfs/boot.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sbin/fsck_msdosfs/check.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sbin/fsck_msdosfs/dir.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sbin/fsck_msdosfs/dosfs.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sbin/fsck_msdosfs/ext.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sbin/fsck_msdosfs/fat.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sbin/fsck_msdosfs/fsck_msdosfs.8#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sbin/fsck_msdosfs/main.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sbin/mount_msdosfs/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sbin/mount_msdosfs/mount_msdosfs.8#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sbin/mount_msdosfs/mount_msdosfs.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/acpica/OsdEnvironment.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/acpica/acpi_machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/acpica/acpi_wakeup.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/acpica/madt.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/amd64/amd64_mem.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/amd64/apic_vector.S#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/amd64/atomic.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/amd64/autoconf.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/amd64/bios.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/amd64/bpf_jit_machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/amd64/bpf_jit_machdep.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/amd64/busdma_machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/amd64/cpu_switch.S#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/amd64/db_disasm.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/amd64/db_interface.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/amd64/db_trace.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/amd64/dump_machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/amd64/elf_machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/amd64/exception.S#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/amd64/fpu.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/amd64/gdb_machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/amd64/genassym.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/amd64/identcpu.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/amd64/in_cksum.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/amd64/initcpu.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/amd64/intr_machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/amd64/io.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/amd64/io_apic.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/amd64/legacy.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/amd64/local_apic.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/amd64/locore.S#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/amd64/machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/amd64/mem.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/amd64/minidump_machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/amd64/mp_machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/amd64/mp_watchdog.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/amd64/mpboot.S#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/amd64/mptable.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/amd64/mptable_pci.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/amd64/msi.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/amd64/nexus.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/amd64/pmap.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/amd64/prof_machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/amd64/sigtramp.S#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/amd64/support.S#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/amd64/sys_machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/amd64/trap.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/amd64/tsc.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/amd64/uio_machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/amd64/uma_machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/amd64/vm_machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/compile/.cvsignore#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/conf/.cvsignore#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/conf/DEFAULTS#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/conf/GENERIC#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/conf/GENERIC.hints#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/conf/MAC#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/conf/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/conf/NOTES#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/ia32/ia32_exception.S#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/ia32/ia32_reg.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/ia32/ia32_signal.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/ia32/ia32_sigtramp.S#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/ia32/ia32_syscall.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/include/_bus.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/include/_inttypes.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/include/_limits.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/include/_stdint.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/include/_types.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/include/acpica_machdep.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/include/apicreg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/include/apicvar.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/include/asm.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/include/asmacros.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/include/atomic.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/include/bus.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/include/bus_dma.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/include/clock.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/include/cpu.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/include/cpufunc.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/include/cputypes.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/include/db_machdep.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/include/elf.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/include/endian.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/include/exec.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/include/float.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/include/floatingpoint.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/include/fpu.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/include/frame.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/include/gdb_machdep.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/include/ieeefp.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/include/in_cksum.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/include/intr_machdep.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/include/iodev.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/include/kdb.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/include/legacyvar.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/include/limits.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/include/md_var.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/include/memdev.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/include/metadata.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/include/minidump.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/include/mp_watchdog.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/include/mptable.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/include/mutex.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/include/param.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/include/pc/bios.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/include/pc/display.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/include/pcb.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/include/pcb_ext.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/include/pci_cfgreg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/include/pcpu.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/include/pmap.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/include/pmc_mdep.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/include/ppireg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/include/proc.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/include/profile.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/include/psl.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/include/ptrace.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/include/reg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/include/reloc.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/include/resource.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/include/runq.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/include/segments.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/include/setjmp.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/include/sf_buf.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/include/sigframe.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/include/signal.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/include/smp.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/include/specialreg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/include/stdarg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/include/sysarch.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/include/timerreg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/include/trap.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/include/tss.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/include/ucontext.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/include/varargs.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/include/vmparam.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/isa/atpic.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/isa/atpic_vector.S#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/isa/clock.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/isa/elcr.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/isa/icu.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/isa/isa.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/isa/isa.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/isa/isa_dma.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/isa/nmi.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/linux32/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/linux32/linux.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/linux32/linux32_dummy.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/linux32/linux32_genassym.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/linux32/linux32_ipc64.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/linux32/linux32_locore.s#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/linux32/linux32_machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/linux32/linux32_proto.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/linux32/linux32_support.s#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/linux32/linux32_syscall.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/linux32/linux32_sysent.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/linux32/linux32_sysvec.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/linux32/syscalls.conf#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/linux32/syscalls.master#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/pci/pci_bus.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/amd64/pci/pci_cfgreg.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/arm/autoconf.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/arm/bcopy_page.S#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/arm/bcopyinout.S#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/arm/bcopyinout_xscale.S#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/arm/blockio.S#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/arm/bootconfig.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/arm/bus_space_asm_generic.S#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/arm/busdma_machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/arm/copystr.S#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/arm/cpufunc.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/arm/cpufunc_asm.S#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/arm/cpufunc_asm_arm10.S#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/arm/cpufunc_asm_arm7tdmi.S#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/arm/cpufunc_asm_arm8.S#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/arm/cpufunc_asm_arm9.S#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/arm/cpufunc_asm_armv4.S#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/arm/cpufunc_asm_ixp12x0.S#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/arm/cpufunc_asm_sa1.S#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/arm/cpufunc_asm_sa11x0.S#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/arm/cpufunc_asm_xscale.S#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/arm/db_disasm.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/arm/db_interface.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/arm/db_trace.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/arm/disassem.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/arm/dump_machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/arm/elf_machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/arm/elf_trampoline.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/arm/exception.S#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/arm/fiq.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/arm/fiq_subr.S#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/arm/fusu.S#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/arm/gdb_machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/arm/genassym.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/arm/identcpu.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/arm/in_cksum.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/arm/in_cksum_arm.S#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/arm/inckern.S#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/arm/intr.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/arm/irq_dispatch.S#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/arm/locore.S#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/arm/machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/arm/mem.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/arm/nexus.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/arm/nexus_io.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/arm/nexus_io_asm.S#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/arm/pmap.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/arm/setcpsr.S#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/arm/setstack.s#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/arm/support.S#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/arm/swtch.S#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/arm/sys_machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/arm/trap.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/arm/uio_machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/arm/undefined.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/arm/vectors.S#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/arm/vm_machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/at91/at91.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/at91/at91_mci.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/at91/at91_mcireg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/at91/at91_pdcreg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/at91/at91_pio.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/at91/at91_pio_rm9200.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/at91/at91_pioreg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/at91/at91_piovar.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/at91/at91_pmc.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/at91/at91_pmcreg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/at91/at91_pmcvar.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/at91/at91_rtc.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/at91/at91_rtcreg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/at91/at91_spi.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/at91/at91_spireg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/at91/at91_ssc.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/at91/at91_sscreg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/at91/at91_st.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/at91/at91_streg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/at91/at91_twi.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/at91/at91_twiio.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/at91/at91_twireg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/at91/at91_usartreg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/at91/at91rm92reg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/at91/at91var.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/at91/files.at91#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/at91/files.kb920x#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/at91/hints.at91rm9200#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/at91/hints.at91sam9261#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/at91/if_ate.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/at91/if_atereg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/at91/kb920x_machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/at91/ohci_atmelarm.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/at91/std.at91#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/at91/std.kb920x#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/at91/uart_bus_at91usart.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/at91/uart_cpu_at91rm9200usart.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/at91/uart_dev_at91usart.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/compile/.cvsignore#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/conf/.cvsignore#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/conf/AVILA#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/conf/AVILA.hints#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/conf/BWCT#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/conf/BWCT.hints#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/conf/EP80219#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/conf/IQ31244#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/conf/KB920X#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/conf/KB920X.hints#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/conf/SIMICS#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/conf/SKYEYE#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/include/_bus.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/include/_inttypes.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/include/_limits.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/include/_stdint.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/include/_types.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/include/armreg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/include/asm.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/include/asmacros.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/include/atomic.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/include/blockio.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/include/bootconfig.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/include/bus.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/include/bus_dma.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/include/clock.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/include/cpu.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/include/cpuconf.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/include/cpufunc.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/include/db_machdep.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/include/disassem.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/include/elf.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/include/endian.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/include/exec.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/include/fiq.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/include/float.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/include/floatingpoint.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/include/fp.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/include/frame.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/include/gdb_machdep.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/include/ieee.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/include/ieeefp.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/include/in_cksum.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/include/intr.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/include/katelib.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/include/kdb.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/include/limits.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/include/machdep.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/include/md_var.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/include/memdev.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/include/metadata.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/include/mutex.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/include/param.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/include/pcb.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/include/pcpu.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/include/pmap.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/include/pmc_mdep.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/include/proc.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/include/profile.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/include/psl.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/include/pte.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/include/ptrace.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/include/reg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/include/reloc.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/include/resource.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/include/runq.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/include/setjmp.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/include/sf_buf.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/include/sigframe.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/include/signal.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/include/smp.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/include/stdarg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/include/swi.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/include/sysarch.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/include/trap.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/include/ucontext.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/include/undefined.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/include/utrap.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/include/vmparam.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/sa11x0/assabet_machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/sa11x0/files.sa11x0#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/sa11x0/sa11x0.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/sa11x0/sa11x0_dmacreg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/sa11x0/sa11x0_gpioreg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/sa11x0/sa11x0_io.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/sa11x0/sa11x0_io_asm.S#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/sa11x0/sa11x0_irq.S#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/sa11x0/sa11x0_irqhandler.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/sa11x0/sa11x0_ost.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/sa11x0/sa11x0_ostreg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/sa11x0/sa11x0_ppcreg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/sa11x0/sa11x0_reg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/sa11x0/sa11x0_var.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/sa11x0/std.sa11x0#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/sa11x0/uart_bus_sa1110.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/sa11x0/uart_cpu_sa1110.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/sa11x0/uart_dev_sa1110.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/sa11x0/uart_dev_sa1110.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/xscale/i80321/ep80219_machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/xscale/i80321/files.ep80219#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/xscale/i80321/files.i80219#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/xscale/i80321/files.i80321#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/xscale/i80321/files.iq31244#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/xscale/i80321/i80321.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/xscale/i80321/i80321_aau.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/xscale/i80321/i80321_dma.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/xscale/i80321/i80321_intr.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/xscale/i80321/i80321_mcu.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/xscale/i80321/i80321_pci.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/xscale/i80321/i80321_space.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/xscale/i80321/i80321_timer.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/xscale/i80321/i80321_wdog.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/xscale/i80321/i80321reg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/xscale/i80321/i80321var.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/xscale/i80321/iq31244_7seg.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/xscale/i80321/iq31244_machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/xscale/i80321/iq80321.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/xscale/i80321/iq80321reg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/xscale/i80321/iq80321var.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/xscale/i80321/obio.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/xscale/i80321/obio_space.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/xscale/i80321/obiovar.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/xscale/i80321/std.ep80219#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/xscale/i80321/std.i80219#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/xscale/i80321/std.i80321#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/xscale/i80321/std.iq31244#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/xscale/i80321/uart_bus_i80321.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/xscale/i80321/uart_cpu_i80321.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/xscale/ixp425/avila_ata.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/xscale/ixp425/avila_led.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/xscale/ixp425/avila_machdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/xscale/ixp425/files.avila#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/xscale/ixp425/files.ixp425#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/xscale/ixp425/if_npe.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/xscale/ixp425/if_npereg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/xscale/ixp425/ixdp425_pci.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/xscale/ixp425/ixdp425reg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/xscale/ixp425/ixp425.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/xscale/ixp425/ixp425_a4x_io.S#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/xscale/ixp425/ixp425_a4x_space.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/xscale/ixp425/ixp425_iic.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/xscale/ixp425/ixp425_intr.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/xscale/ixp425/ixp425_mem.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/xscale/ixp425/ixp425_npe.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/xscale/ixp425/ixp425_npereg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/xscale/ixp425/ixp425_npevar.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/xscale/ixp425/ixp425_pci.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/xscale/ixp425/ixp425_pci_asm.S#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/xscale/ixp425/ixp425_pci_space.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/xscale/ixp425/ixp425_qmgr.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/xscale/ixp425/ixp425_qmgr.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/xscale/ixp425/ixp425_space.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/xscale/ixp425/ixp425_timer.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/xscale/ixp425/ixp425_wdog.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/xscale/ixp425/ixp425reg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/xscale/ixp425/ixp425var.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/xscale/ixp425/std.avila#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/xscale/ixp425/std.ixp425#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/xscale/ixp425/uart_bus_ixp425.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/xscale/ixp425/uart_cpu_ixp425.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/xscale/std.xscale#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/xscale/xscalereg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/arm/xscale/xscalevar.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/README#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/arm/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/arm/at91/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/arm/at91/Makefile.inc#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/arm/at91/boot0/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/arm/at91/boot0/README#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/arm/at91/boot0/linker.cfg#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/arm/at91/boot0/main.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/arm/at91/boot0iic/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/arm/at91/boot0iic/main.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/arm/at91/boot0spi/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/arm/at91/boot0spi/main.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/arm/at91/boot2/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/arm/at91/boot2/board.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/arm/at91/boot2/boot2.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/arm/at91/boot2/kb920x_board.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/arm/at91/bootiic/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/arm/at91/bootiic/README#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/arm/at91/bootiic/env_vars.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/arm/at91/bootiic/env_vars.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/arm/at91/bootiic/loader_prompt.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/arm/at91/bootiic/loader_prompt.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/arm/at91/bootiic/main.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/arm/at91/bootspi/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/arm/at91/bootspi/README#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/arm/at91/bootspi/ee.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/arm/at91/bootspi/ee.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/arm/at91/bootspi/env_vars.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/arm/at91/bootspi/env_vars.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/arm/at91/bootspi/loader_prompt.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/arm/at91/bootspi/loader_prompt.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/arm/at91/bootspi/main.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/arm/at91/libat91/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/arm/at91/libat91/arm_init.S#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/arm/at91/libat91/at91rm9200.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/arm/at91/libat91/delay.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/arm/at91/libat91/eeprom.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/arm/at91/libat91/emac.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/arm/at91/libat91/emac.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/arm/at91/libat91/emac_init.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/arm/at91/libat91/getc.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/arm/at91/libat91/lib.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/arm/at91/libat91/lib_AT91RM9200.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/arm/at91/libat91/mci_device.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/arm/at91/libat91/memcmp.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/arm/at91/libat91/memcpy.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/arm/at91/libat91/memset.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/arm/at91/libat91/p_string.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/arm/at91/libat91/printf.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/arm/at91/libat91/putchar.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/arm/at91/libat91/reset.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/arm/at91/libat91/sd-card.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/arm/at91/libat91/sd-card.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/arm/at91/libat91/spi_flash.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/arm/at91/libat91/spi_flash.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/arm/at91/libat91/strcmp.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/arm/at91/libat91/strcpy.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/arm/at91/libat91/strcvt.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/arm/at91/libat91/strlen.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/arm/at91/libat91/tag_list.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/arm/at91/libat91/tag_list.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/arm/at91/libat91/xmodem.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/arm/at91/linker.cfg#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/common/Makefile.inc#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/common/bcache.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/common/boot.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/common/bootstrap.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/common/commands.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/common/console.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/common/dev_net.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/common/dev_net.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/common/devopen.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/common/help.common#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/common/interp.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/common/interp_backslash.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/common/interp_forth.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/common/interp_parse.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/common/isapnp.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/common/isapnp.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/common/load.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/common/load_elf.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/common/load_elf32.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/common/load_elf32_obj.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/common/load_elf64.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/common/load_elf64_obj.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/common/load_elf_obj.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/common/loader.8#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/common/ls.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/common/merge_help.awk#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/common/misc.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/common/module.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/common/newvers.sh#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/common/panic.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/common/pnp.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/common/reloc_elf.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/common/reloc_elf32.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/common/reloc_elf64.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/common/ufsread.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/efi/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/efi/Makefile.inc#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/efi/include/README#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/efi/include/efi.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/efi/include/efi_nii.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/efi/include/efiapi.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/efi/include/eficon.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/efi/include/efidebug.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/efi/include/efidef.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/efi/include/efidevp.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/efi/include/efierr.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/efi/include/efifpswa.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/efi/include/efifs.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/efi/include/efilib.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/efi/include/efinet.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/efi/include/efipart.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/efi/include/efiprot.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/efi/include/efipxebc.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/efi/include/efiser.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/efi/include/efistdarg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/efi/include/i386/efibind.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/efi/include/i386/pe.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/efi/include/ia64/efibind.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/efi/include/ia64/pe.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/efi/libefi/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/efi/libefi/delay.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/efi/libefi/efi_console.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/efi/libefi/efifs.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/efi/libefi/efinet.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/efi/libefi/errno.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/efi/libefi/handles.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/efi/libefi/libefi.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/efi/libefi/time.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ficl/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ficl/arm/sysdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ficl/arm/sysdep.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ficl/dict.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ficl/ficl.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ficl/ficl.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ficl/fileaccess.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ficl/float.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ficl/i386/sysdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ficl/i386/sysdep.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ficl/ia64/sysdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ficl/ia64/sysdep.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ficl/loader.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ficl/math64.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ficl/math64.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ficl/powerpc/sysdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ficl/powerpc/sysdep.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ficl/prefix.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ficl/search.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ficl/softwords/classes.fr#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ficl/softwords/ficlclass.fr#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ficl/softwords/ficllocal.fr#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ficl/softwords/fileaccess.fr#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ficl/softwords/forml.fr#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ficl/softwords/freebsd.fr#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ficl/softwords/ifbrack.fr#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ficl/softwords/jhlocal.fr#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ficl/softwords/marker.fr#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ficl/softwords/oo.fr#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ficl/softwords/prefix.fr#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ficl/softwords/softcore.awk#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ficl/softwords/softcore.fr#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ficl/softwords/string.fr#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ficl/sparc64/sysdep.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ficl/sparc64/sysdep.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ficl/stack.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ficl/testmain.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ficl/tools.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ficl/unix.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ficl/vm.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ficl/words.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/forth/beastie.4th#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/forth/frames.4th#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/forth/loader.4th#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/forth/loader.4th.8#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/forth/loader.conf#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/forth/loader.conf.5#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/forth/loader.rc#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/forth/pnp.4th#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/forth/screen.4th#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/forth/support.4th#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/i386/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/i386/Makefile.inc#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/i386/boot0/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/i386/boot0/boot0.S#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/i386/boot0/boot0ext.S#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/i386/boot0ext/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/i386/boot0sio/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/i386/boot2/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/i386/boot2/boot1.S#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/i386/boot2/boot2.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/i386/boot2/lib.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/i386/boot2/sio.S#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/i386/btx/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/i386/btx/Makefile.inc#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/i386/btx/btx/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/i386/btx/btx/btx.S#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/i386/btx/btxldr/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/i386/btx/btxldr/btxldr.S#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/i386/btx/lib/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/i386/btx/lib/btxcsu.s#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/i386/btx/lib/btxsys.s#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/i386/btx/lib/btxv86.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/i386/btx/lib/btxv86.s#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/i386/cdboot/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/i386/cdboot/cdboot.s#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/i386/kgzldr/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/i386/kgzldr/boot.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/i386/kgzldr/crt.s#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/i386/kgzldr/kgzldr.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/i386/kgzldr/lib.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/i386/kgzldr/sio.s#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/i386/kgzldr/start.s#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/i386/libfirewire/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/i386/libfirewire/dconsole.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/i386/libfirewire/firewire.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/i386/libfirewire/fwohci.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/i386/libfirewire/fwohci.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/i386/libfirewire/fwohcireg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/i386/libi386/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/i386/libi386/amd64_tramp.S#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/i386/libi386/biosacpi.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/i386/libi386/bioscd.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/i386/libi386/biosdisk.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/i386/libi386/biosmem.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/i386/libi386/biospci.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/i386/libi386/biospnp.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/i386/libi386/biossmap.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/i386/libi386/bootinfo.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/i386/libi386/bootinfo32.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/i386/libi386/bootinfo64.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/i386/libi386/comconsole.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/i386/libi386/devicename.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/i386/libi386/elf32_freebsd.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/i386/libi386/elf64_freebsd.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/i386/libi386/i386_copy.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/i386/libi386/i386_module.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/i386/libi386/libi386.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/i386/libi386/nullconsole.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/i386/libi386/pread.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/i386/libi386/pxe.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/i386/libi386/pxe.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/i386/libi386/pxetramp.s#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/i386/libi386/smbios.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/i386/libi386/time.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/i386/libi386/vidconsole.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/i386/loader/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/i386/loader/conf.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/i386/loader/help.i386#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/i386/loader/loader.rc#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/i386/loader/main.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/i386/loader/version#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/i386/mbr/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/i386/mbr/mbr.s#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/i386/pxeldr/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/i386/pxeldr/pxeboot.8#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/i386/pxeldr/pxeldr.S#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ia64/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ia64/Makefile.inc#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ia64/common/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ia64/common/autoload.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ia64/common/bootinfo.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ia64/common/copy.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ia64/common/devicename.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ia64/common/exec.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ia64/common/libia64.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ia64/efi/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ia64/efi/conf.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ia64/efi/efimd.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ia64/efi/ldscript.ia64#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ia64/efi/main.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ia64/efi/start.S#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ia64/efi/version#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ia64/ski/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ia64/ski/acpi_stub.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ia64/ski/conf.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ia64/ski/delay.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ia64/ski/efi_stub.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ia64/ski/exit.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ia64/ski/ldscript.ia64#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ia64/ski/libski.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ia64/ski/main.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ia64/ski/pal_stub.S#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ia64/ski/sal_stub.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ia64/ski/skiconsole.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ia64/ski/skifs.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ia64/ski/skiload.cmd#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ia64/ski/skimd.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ia64/ski/ssc.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ia64/ski/start.S#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ia64/ski/time.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ia64/ski/version#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ofw/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ofw/common/Makefile.inc#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ofw/common/main.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ofw/libofw/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ofw/libofw/devicename.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ofw/libofw/elf_freebsd.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ofw/libofw/libofw.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ofw/libofw/ofw_console.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ofw/libofw/ofw_copy.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ofw/libofw/ofw_disk.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ofw/libofw/ofw_memory.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ofw/libofw/ofw_module.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ofw/libofw/ofw_net.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ofw/libofw/ofw_reboot.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ofw/libofw/ofw_time.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ofw/libofw/openfirm.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/ofw/libofw/openfirm.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/pc98/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/pc98/Makefile.inc#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/pc98/boot0.5/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/pc98/boot0.5/boot.s#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/pc98/boot0.5/boot0.5.s#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/pc98/boot0.5/disk.s#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/pc98/boot0.5/ldscript#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/pc98/boot0.5/putssjis.s#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/pc98/boot0.5/selector.s#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/pc98/boot0.5/start.s#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/pc98/boot0.5/support.s#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/pc98/boot0.5/syscons.s#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/pc98/boot0/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/pc98/boot0/boot0.s#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/pc98/boot2/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/pc98/boot2/README.serial.98#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/pc98/boot2/asm.S#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/pc98/boot2/asm.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/pc98/boot2/bios.S#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/pc98/boot2/boot.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/pc98/boot2/boot.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/pc98/boot2/boot2.S#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/pc98/boot2/dinode.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/pc98/boot2/disk.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/pc98/boot2/fs.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/pc98/boot2/inode.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/pc98/boot2/io.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/pc98/boot2/probe_keyboard.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/pc98/boot2/quota.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/pc98/boot2/serial.S#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/pc98/boot2/serial_16550.S#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/pc98/boot2/serial_8251.S#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/pc98/boot2/start.S#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/pc98/boot2/sys.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/pc98/boot2/table.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/pc98/btx/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/pc98/btx/Makefile.inc#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/pc98/btx/btx/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/pc98/btx/btx/btx.S#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/pc98/btx/btxldr/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/pc98/btx/btxldr/btxldr.S#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/pc98/btx/lib/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/pc98/btx/lib/btxcsu.s#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/pc98/btx/lib/btxsys.s#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/pc98/btx/lib/btxv86.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/pc98/btx/lib/btxv86.s#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/pc98/cdboot/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/pc98/cdboot/cdboot.s#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/pc98/kgzldr/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/pc98/kgzldr/crt.s#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/pc98/libpc98/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/pc98/libpc98/bioscd.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/pc98/libpc98/biosdisk.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/pc98/libpc98/biosmem.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/pc98/libpc98/biossmap.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/pc98/libpc98/comconsole.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/pc98/libpc98/i386_module.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/pc98/libpc98/time.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/pc98/libpc98/vidconsole.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/pc98/loader/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/pc98/loader/conf.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/pc98/loader/help.pc98#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/pc98/loader/main.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/powerpc/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/powerpc/loader/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/powerpc/loader/conf.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/powerpc/loader/help.ofw#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/powerpc/loader/ldscript.powerpc#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/powerpc/loader/metadata.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/powerpc/loader/start.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/powerpc/loader/version#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/sparc64/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/sparc64/Makefile.inc#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/sparc64/boot1/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/sparc64/boot1/_start.s#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/sparc64/boot1/boot1.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/sparc64/loader/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/sparc64/loader/help.sparc64#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/sparc64/loader/locore.S#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/sparc64/loader/main.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/sparc64/loader/metadata.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/boot/sparc64/loader/version#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/bsm/audit.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/bsm/audit_internal.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/bsm/audit_kevents.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/bsm/audit_record.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/cam/README.quirks#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/cam/cam.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/cam/cam.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/cam/cam_ccb.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/cam/cam_debug.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/cam/cam_periph.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/cam/cam_periph.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/cam/cam_queue.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/cam/cam_queue.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/cam/cam_sim.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/cam/cam_sim.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/cam/cam_xpt.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/cam/cam_xpt.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/cam/cam_xpt_periph.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/cam/cam_xpt_sim.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/cam/scsi/scsi_all.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/cam/scsi/scsi_all.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/cam/scsi/scsi_cd.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/cam/scsi/scsi_cd.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/cam/scsi/scsi_ch.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/cam/scsi/scsi_ch.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/cam/scsi/scsi_da.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/cam/scsi/scsi_da.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/cam/scsi/scsi_dvcfg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/cam/scsi/scsi_iu.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/cam/scsi/scsi_low.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/cam/scsi/scsi_low.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/cam/scsi/scsi_low_pisa.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/cam/scsi/scsi_low_pisa.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/cam/scsi/scsi_message.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/cam/scsi/scsi_pass.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/cam/scsi/scsi_pass.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/cam/scsi/scsi_pt.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/cam/scsi/scsi_pt.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/cam/scsi/scsi_sa.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/cam/scsi/scsi_sa.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/cam/scsi/scsi_ses.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/cam/scsi/scsi_ses.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/cam/scsi/scsi_sg.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/cam/scsi/scsi_sg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/cam/scsi/scsi_targ_bh.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/cam/scsi/scsi_target.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/cam/scsi/scsi_targetio.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/coda/00READ#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/coda/README#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/coda/TODO#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/coda/cnode.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/coda/coda.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/coda/coda_fbsd.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/coda/coda_io.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/coda/coda_kernel.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/coda/coda_namecache.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/coda/coda_namecache.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/coda/coda_opstats.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/coda/coda_pioctl.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/coda/coda_psdev.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/coda/coda_psdev.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/coda/coda_subr.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/coda/coda_subr.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/coda/coda_venus.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/coda/coda_venus.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/coda/coda_vfsops.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/coda/coda_vfsops.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/coda/coda_vnops.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/coda/coda_vnops.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/freebsd32/Makefile#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/freebsd32/freebsd32.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/freebsd32/freebsd32_misc.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/freebsd32/freebsd32_proto.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/freebsd32/freebsd32_signal.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/freebsd32/freebsd32_syscall.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/freebsd32/freebsd32_syscalls.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/freebsd32/freebsd32_sysent.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/freebsd32/freebsd32_util.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/freebsd32/syscalls.conf#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/freebsd32/syscalls.master#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/ia32/ia32_genassym.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/ia32/ia32_reg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/ia32/ia32_signal.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/ia32/ia32_sysvec.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/ia32/ia32_util.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/linprocfs/linprocfs.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/linsysfs/linsysfs.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/linux/linux_emul.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/linux/linux_emul.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/linux/linux_file.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/linux/linux_futex.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/linux/linux_futex.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/linux/linux_getcwd.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/linux/linux_ioctl.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/linux/linux_ioctl.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/linux/linux_ipc.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/linux/linux_ipc.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/linux/linux_mib.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/linux/linux_mib.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/linux/linux_misc.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/linux/linux_misc.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/linux/linux_signal.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/linux/linux_signal.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/linux/linux_socket.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/linux/linux_socket.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/linux/linux_stats.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/linux/linux_sysctl.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/linux/linux_sysproto.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/linux/linux_time.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/linux/linux_uid16.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/linux/linux_util.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/linux/linux_util.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/ndis/cfg_var.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/ndis/hal_var.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/ndis/kern_ndis.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/ndis/kern_windrv.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/ndis/ndis_var.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/ndis/ntoskrnl_var.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/ndis/pe_var.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/ndis/resource_var.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/ndis/subr_hal.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/ndis/subr_ndis.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/ndis/subr_ntoskrnl.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/ndis/subr_pe.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/ndis/subr_usbd.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/ndis/usbd_var.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/ndis/winx32_wrap.S#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/ndis/winx64_wrap.S#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/netbsd/dvcfg.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/netbsd/physio_proc.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/opensolaris/kern/opensolaris_atomic.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/opensolaris/kern/opensolaris_kmem.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/opensolaris/kern/opensolaris_kobj.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/opensolaris/kern/opensolaris_kstat.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/opensolaris/kern/opensolaris_misc.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/opensolaris/kern/opensolaris_policy.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/opensolaris/kern/opensolaris_string.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/opensolaris/kern/opensolaris_vfs.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/opensolaris/kern/opensolaris_zone.c#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/opensolaris/machine/endian.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/opensolaris/rpc/xdr.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/opensolaris/sys/acl.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/opensolaris/sys/atomic.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/opensolaris/sys/byteorder.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/opensolaris/sys/callb.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/opensolaris/sys/cmn_err.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/opensolaris/sys/cred.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/opensolaris/sys/debug.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/opensolaris/sys/dirent.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/opensolaris/sys/dkio.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/opensolaris/sys/dnlc.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/opensolaris/sys/kcondvar.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/opensolaris/sys/kmem.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/opensolaris/sys/kobj.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/opensolaris/sys/kstat.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/opensolaris/sys/lock.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/opensolaris/sys/misc.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/opensolaris/sys/mntent.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/opensolaris/sys/mnttab.h#1 branch .. //depot/projects/soc2007/chub-msdosfs2/sys/compat/opensolaris/sys/mount.h#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Jun 29 04:32:34 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E2FF016A469; Fri, 29 Jun 2007 04:32:33 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8C29E16A421 for ; Fri, 29 Jun 2007 04:32:33 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 7A14113C480 for ; Fri, 29 Jun 2007 04:32:33 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5T4WXT5043248 for ; Fri, 29 Jun 2007 04:32:33 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5T4WWG4043243 for perforce@freebsd.org; Fri, 29 Jun 2007 04:32:32 GMT (envelope-from thompsa@freebsd.org) Date: Fri, 29 Jun 2007 04:32:32 GMT Message-Id: <200706290432.l5T4WWG4043243@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 122514 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Jun 2007 04:32:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=122514 Change 122514 by thompsa@thompsa_heff on 2007/06/29 04:32:25 Sync all the files to HEAD, this is pretty much copyright headers and $Id$ tags. Makes merging much easier. Affected files ... .. //depot/projects/wifi/sys/net80211/_ieee80211.h#23 edit .. //depot/projects/wifi/sys/net80211/ieee80211.c#55 edit .. //depot/projects/wifi/sys/net80211/ieee80211.h#24 edit .. //depot/projects/wifi/sys/net80211/ieee80211_acl.c#10 edit .. //depot/projects/wifi/sys/net80211/ieee80211_amrr.c#5 edit .. //depot/projects/wifi/sys/net80211/ieee80211_amrr.h#2 edit .. //depot/projects/wifi/sys/net80211/ieee80211_crypto.c#25 edit .. //depot/projects/wifi/sys/net80211/ieee80211_crypto.h#18 edit .. //depot/projects/wifi/sys/net80211/ieee80211_crypto_ccmp.c#15 edit .. //depot/projects/wifi/sys/net80211/ieee80211_crypto_none.c#12 edit .. //depot/projects/wifi/sys/net80211/ieee80211_crypto_tkip.c#18 edit .. //depot/projects/wifi/sys/net80211/ieee80211_crypto_wep.c#15 edit .. //depot/projects/wifi/sys/net80211/ieee80211_freebsd.c#28 edit .. //depot/projects/wifi/sys/net80211/ieee80211_freebsd.h#31 edit .. //depot/projects/wifi/sys/net80211/ieee80211_ht.c#4 edit .. //depot/projects/wifi/sys/net80211/ieee80211_ht.h#3 edit .. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#82 edit .. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.h#43 edit .. //depot/projects/wifi/sys/net80211/ieee80211_node.c#96 edit .. //depot/projects/wifi/sys/net80211/ieee80211_node.h#48 edit .. //depot/projects/wifi/sys/net80211/ieee80211_output.c#77 edit .. //depot/projects/wifi/sys/net80211/ieee80211_power.c#8 edit .. //depot/projects/wifi/sys/net80211/ieee80211_power.h#2 edit .. //depot/projects/wifi/sys/net80211/ieee80211_proto.c#60 edit .. //depot/projects/wifi/sys/net80211/ieee80211_proto.h#39 edit .. //depot/projects/wifi/sys/net80211/ieee80211_radiotap.h#14 edit .. //depot/projects/wifi/sys/net80211/ieee80211_regdomain.c#5 edit .. //depot/projects/wifi/sys/net80211/ieee80211_regdomain.h#4 edit .. //depot/projects/wifi/sys/net80211/ieee80211_scan.c#15 edit .. //depot/projects/wifi/sys/net80211/ieee80211_scan.h#10 edit .. //depot/projects/wifi/sys/net80211/ieee80211_scan_ap.c#8 edit .. //depot/projects/wifi/sys/net80211/ieee80211_scan_sta.c#21 edit .. //depot/projects/wifi/sys/net80211/ieee80211_var.h#60 edit .. //depot/projects/wifi/sys/net80211/ieee80211_xauth.c#5 edit Differences ... ==== //depot/projects/wifi/sys/net80211/_ieee80211.h#23 (text+ko) ==== ==== //depot/projects/wifi/sys/net80211/ieee80211.c#55 (text+ko) ==== ==== //depot/projects/wifi/sys/net80211/ieee80211.h#24 (text+ko) ==== ==== //depot/projects/wifi/sys/net80211/ieee80211_acl.c#10 (text+ko) ==== ==== //depot/projects/wifi/sys/net80211/ieee80211_amrr.c#5 (text+ko) ==== ==== //depot/projects/wifi/sys/net80211/ieee80211_amrr.h#2 (text+ko) ==== ==== //depot/projects/wifi/sys/net80211/ieee80211_crypto.c#25 (text+ko) ==== ==== //depot/projects/wifi/sys/net80211/ieee80211_crypto.h#18 (text+ko) ==== ==== //depot/projects/wifi/sys/net80211/ieee80211_crypto_ccmp.c#15 (text+ko) ==== ==== //depot/projects/wifi/sys/net80211/ieee80211_crypto_none.c#12 (text+ko) ==== ==== //depot/projects/wifi/sys/net80211/ieee80211_crypto_tkip.c#18 (text+ko) ==== ==== //depot/projects/wifi/sys/net80211/ieee80211_crypto_wep.c#15 (text+ko) ==== ==== //depot/projects/wifi/sys/net80211/ieee80211_freebsd.c#28 (text+ko) ==== ==== //depot/projects/wifi/sys/net80211/ieee80211_freebsd.h#31 (text+ko) ==== @@ -22,7 +22,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/net80211/ieee80211_freebsd.h,v 1.13 2007/06/11 03:36:54 sam Exp $ + * $FreeBSD: src/sys/net80211/ieee80211_freebsd.h,v 1.14 2007/06/25 03:26:10 sam Exp $ */ #ifndef _NET80211_IEEE80211_FREEBSD_H_ #define _NET80211_IEEE80211_FREEBSD_H_ @@ -177,7 +177,7 @@ struct ifqueue; void ieee80211_drain_ifq(struct ifqueue *); -#define msecs_to_ticks(ms) ((ms)*1000/hz) +#define msecs_to_ticks(ms) (((ms)*hz)/1000) #define time_after(a,b) ((long)(b) - (long)(a) < 0) #define time_before(a,b) time_after(b,a) #define time_after_eq(a,b) ((long)(a) - (long)(b) >= 0) ==== //depot/projects/wifi/sys/net80211/ieee80211_ht.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ #include #ifdef __FreeBSD__ -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_ht.c,v 1.1 2007/06/11 03:36:54 sam Exp $"); #endif /* ==== //depot/projects/wifi/sys/net80211/ieee80211_ht.h#3 (text+ko) ==== @@ -22,7 +22,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD$ + * $FreeBSD: src/sys/net80211/ieee80211_ht.h,v 1.1 2007/06/11 03:36:54 sam Exp $ */ #ifndef _NET80211_IEEE80211_HT_H_ #define _NET80211_IEEE80211_HT_H_ ==== //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#82 (text+ko) ==== ==== //depot/projects/wifi/sys/net80211/ieee80211_ioctl.h#43 (text+ko) ==== ==== //depot/projects/wifi/sys/net80211/ieee80211_node.c#96 (text+ko) ==== ==== //depot/projects/wifi/sys/net80211/ieee80211_node.h#48 (text+ko) ==== ==== //depot/projects/wifi/sys/net80211/ieee80211_output.c#77 (text+ko) ==== ==== //depot/projects/wifi/sys/net80211/ieee80211_power.c#8 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting + * Copyright (c) 2002-2007 Sam Leffler, Errno Consulting * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -10,12 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * Alternatively, this software may be distributed under the terms of the - * GNU General Public License ("GPL") version 2 as published by the Free - * Software Foundation. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -30,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_power.c,v 1.1 2007/06/11 03:36:54 sam Exp $"); /* * IEEE 802.11 power save support. ==== //depot/projects/wifi/sys/net80211/ieee80211_power.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting + * Copyright (c) 2002-2007 Sam Leffler, Errno Consulting * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -10,12 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * Alternatively, this software may be distributed under the terms of the - * GNU General Public License ("GPL") version 2 as published by the Free - * Software Foundation. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -28,7 +22,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/net80211/ieee80211_node.h,v 1.15 2005/04/04 04:27:20 sam Exp $ + * $FreeBSD: src/sys/net80211/ieee80211_power.h,v 1.1 2007/06/11 03:36:54 sam Exp $ */ #ifndef _NET80211_IEEE80211_POWER_H_ #define _NET80211_IEEE80211_POWER_H_ ==== //depot/projects/wifi/sys/net80211/ieee80211_proto.c#60 (text+ko) ==== ==== //depot/projects/wifi/sys/net80211/ieee80211_proto.h#39 (text+ko) ==== ==== //depot/projects/wifi/sys/net80211/ieee80211_radiotap.h#14 (text+ko) ==== ==== //depot/projects/wifi/sys/net80211/ieee80211_regdomain.c#5 (text+ko) ==== @@ -10,12 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * Alternatively, this software may be distributed under the terms of the - * GNU General Public License ("GPL") version 2 as published by the Free - * Software Foundation. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -30,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/net80211/ieee80211.c,v 1.19 2005/01/27 17:39:17 sam Exp $"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_regdomain.c,v 1.1 2007/06/11 03:36:55 sam Exp $"); /* * IEEE 802.11 regdomain support. ==== //depot/projects/wifi/sys/net80211/ieee80211_regdomain.h#4 (text+ko) ==== @@ -10,12 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * Alternatively, this software may be distributed under the terms of the - * GNU General Public License ("GPL") version 2 as published by the Free - * Software Foundation. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -28,7 +22,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/net80211/ieee80211.h,v 1.8 2004/12/31 22:44:26 sam Exp $ + * $FreeBSD: src/sys/net80211/ieee80211_regdomain.h,v 1.1 2007/06/11 03:36:55 sam Exp $ */ #ifndef _NET80211_IEEE80211_REGDOMAIN_H_ #define _NET80211_IEEE80211_REGDOMAIN_H_ ==== //depot/projects/wifi/sys/net80211/ieee80211_scan.c#15 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting + * Copyright (c) 2002-2007 Sam Leffler, Errno Consulting * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -10,12 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * Alternatively, this software may be distributed under the terms of the - * GNU General Public License ("GPL") version 2 as published by the Free - * Software Foundation. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -30,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_scan.c,v 1.1 2007/06/11 03:36:55 sam Exp $"); /* * IEEE 802.11 scanning support. ==== //depot/projects/wifi/sys/net80211/ieee80211_scan.h#10 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2005 Sam Leffler, Errno Consulting + * Copyright (c) 2005-2007 Sam Leffler, Errno Consulting * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -10,12 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * Alternatively, this software may be distributed under the terms of the - * GNU General Public License ("GPL") version 2 as published by the Free - * Software Foundation. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -28,7 +22,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/net80211/ieee80211_var.h,v 1.18 2004/12/31 22:42:38 sam Exp $ + * $FreeBSD: src/sys/net80211/ieee80211_scan.h,v 1.1 2007/06/11 03:36:55 sam Exp $ */ #ifndef _NET80211_IEEE80211_SCAN_H_ #define _NET80211_IEEE80211_SCAN_H_ ==== //depot/projects/wifi/sys/net80211/ieee80211_scan_ap.c#8 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting + * Copyright (c) 2002-2007 Sam Leffler, Errno Consulting * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -10,12 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * Alternatively, this software may be distributed under the terms of the - * GNU General Public License ("GPL") version 2 as published by the Free - * Software Foundation. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -30,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_scan_ap.c,v 1.1 2007/06/11 03:36:55 sam Exp $"); /* * IEEE 802.11 ap scanning support. ==== //depot/projects/wifi/sys/net80211/ieee80211_scan_sta.c#21 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting + * Copyright (c) 2002-2007 Sam Leffler, Errno Consulting * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -10,12 +10,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * Alternatively, this software may be distributed under the terms of the - * GNU General Public License ("GPL") version 2 as published by the Free - * Software Foundation. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -30,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: src/sys/net80211/ieee80211_scan_sta.c,v 1.1 2007/06/11 03:36:55 sam Exp $"); /* * IEEE 802.11 station scanning support. ==== //depot/projects/wifi/sys/net80211/ieee80211_var.h#60 (text+ko) ==== ==== //depot/projects/wifi/sys/net80211/ieee80211_xauth.c#5 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Fri Jun 29 07:40:34 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5B47B16A46B; Fri, 29 Jun 2007 07:40:34 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 00BFC16A400 for ; Fri, 29 Jun 2007 07:40:34 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id E4F7913C45E for ; Fri, 29 Jun 2007 07:40:33 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5T7eXSr068768 for ; Fri, 29 Jun 2007 07:40:33 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5T7eXUM068765 for perforce@freebsd.org; Fri, 29 Jun 2007 07:40:33 GMT (envelope-from thompsa@freebsd.org) Date: Fri, 29 Jun 2007 07:40:33 GMT Message-Id: <200706290740.l5T7eXUM068765@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 122521 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Jun 2007 07:40:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=122521 Change 122521 by thompsa@thompsa_heff on 2007/06/29 07:39:58 - change bchan back to an integer - rename chan -> curchan This commit doesnt yet optimise the calls to ieee80211_chan2ieee. Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_input.c#108 edit .. //depot/projects/wifi/sys/net80211/ieee80211_scan.c#16 edit .. //depot/projects/wifi/sys/net80211/ieee80211_scan.h#11 edit .. //depot/projects/wifi/sys/net80211/ieee80211_scan_sta.c#22 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_input.c#108 (text+ko) ==== @@ -2090,8 +2090,8 @@ scan.tstamp = frm; frm += 8; scan.bintval = le16toh(*(uint16_t *)frm); frm += 2; scan.capinfo = le16toh(*(uint16_t *)frm); frm += 2; - scan.bchan = ic->ic_curchan; - scan.chan = scan.bchan; + scan.bchan = ieee80211_chan2ieee(ic, ic->ic_curchan); + scan.curchan = ic->ic_curchan; while (efrm - frm > 1) { IEEE80211_VERIFY_LENGTH(efrm - frm, frm[1] + 2, return); @@ -2108,7 +2108,7 @@ case IEEE80211_ELEMID_FHPARMS: if (ic->ic_phytype == IEEE80211_T_FH) { scan.fhdwell = LE_READ_2(&frm[2]); - scan.chan = IEEE80211_FH_CHAN(frm[4], frm[5]); + scan.bchan = IEEE80211_FH_CHAN(frm[4], frm[5]); scan.fhindex = frm[6]; } break; @@ -2118,7 +2118,7 @@ * is problematic for multi-mode devices. */ if (ic->ic_phytype != IEEE80211_T_FH) - scan.chan = frm[2]; + scan.bchan = frm[2]; break; case IEEE80211_ELEMID_TIM: /* XXX ATIM? */ @@ -2194,7 +2194,7 @@ return; } #endif - if (scan.chan != scan.bchan && + if (ieee80211_chan2ieee(ic, scan.curchan) != scan.bchan && ic->ic_phytype != IEEE80211_T_FH) { /* * Frame was received on a channel different from the @@ -2210,7 +2210,8 @@ IEEE80211_MSG_ELEMID | IEEE80211_MSG_INPUT, wh, ieee80211_mgt_subtype_name[subtype >> IEEE80211_FC0_SUBTYPE_SHIFT], - "for off-channel %u", scan.chan); + "for off-channel %u", + ieee80211_chan2ieee(ic, scan.curchan)); ic->ic_stats.is_rx_chanmismatch++; return; } ==== //depot/projects/wifi/sys/net80211/ieee80211_scan.c#16 (text+ko) ==== @@ -848,8 +848,7 @@ printf("[%s] %s%s on chan %u (bss chan %u) ", ether_sprintf(mac), isnew ? "new " : "", ieee80211_mgt_subtype_name[subtype >> IEEE80211_FC0_SUBTYPE_SHIFT], - ieee80211_chan2ieee(ic, sp->chan), - ieee80211_chan2ieee(ic, sp->bchan)); + ieee80211_chan2ieee(ic, sp->curchan), sp->bchan); ieee80211_print_essid(sp->ssid + 2, sp->ssid[1]); printf("\n"); ==== //depot/projects/wifi/sys/net80211/ieee80211_scan.h#11 (text+ko) ==== @@ -118,8 +118,8 @@ struct ieee80211_scanparams { uint16_t capinfo; /* 802.11 capabilities */ uint16_t fhdwell; /* FHSS dwell interval */ - struct ieee80211_channel *chan; - struct ieee80211_channel *bchan; + struct ieee80211_channel *curchan; + uint8_t bchan; /* channel# advertised inside beacon */ uint8_t fhindex; uint8_t erp; uint16_t bintval; ==== //depot/projects/wifi/sys/net80211/ieee80211_scan_sta.c#22 (text+ko) ==== @@ -257,7 +257,7 @@ memcpy(ise->se_tstamp.data, sp->tstamp, sizeof(ise->se_tstamp)); ise->se_intval = sp->bintval; ise->se_capinfo = sp->capinfo; - ise->se_chan = sp->chan; + ise->se_chan = sp->curchan; ise->se_fhdwell = sp->fhdwell; ise->se_fhindex = sp->fhindex; ise->se_erp = sp->erp; From owner-p4-projects@FreeBSD.ORG Fri Jun 29 07:49:46 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0427116A421; Fri, 29 Jun 2007 07:49:46 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C4DD616A400 for ; Fri, 29 Jun 2007 07:49:45 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id B486113C45D for ; Fri, 29 Jun 2007 07:49:45 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5T7njxu069450 for ; Fri, 29 Jun 2007 07:49:45 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5T7njeO069447 for perforce@freebsd.org; Fri, 29 Jun 2007 07:49:45 GMT (envelope-from thompsa@freebsd.org) Date: Fri, 29 Jun 2007 07:49:45 GMT Message-Id: <200706290749.l5T7njeO069447@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 122522 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Jun 2007 07:49:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=122522 Change 122522 by thompsa@thompsa_heff on 2007/06/29 07:49:08 - Remove temporary debugging - catch up with bchan/curchan Affected files ... .. //depot/projects/wifi/sys/dev/wi/if_wi.c#37 edit Differences ... ==== //depot/projects/wifi/sys/dev/wi/if_wi.c#37 (text+ko) ==== @@ -192,7 +192,7 @@ #define WI_DEBUG #ifdef WI_DEBUG -static int wi_debug = 100; +static int wi_debug = 0; SYSCTL_INT(_hw_wi, OID_AUTO, debug, CTLFLAG_RW, &wi_debug, 0, "control debugging printfs"); @@ -678,7 +678,6 @@ int error = 0, wasenabled; - DPRINTF(("%s\n", __func__)); if (sc->wi_gone) return; @@ -884,7 +883,6 @@ ieee80211_new_state(ic, IEEE80211_S_INIT, -1); - DPRINTF(("%s\n", __func__)); DELAY(100000); WI_LOCK(sc); if (sc->sc_enabled && !sc->wi_gone) { @@ -1059,7 +1057,6 @@ } sc->sc_txd[cur].d_len = off; if (sc->sc_txcur == cur) { - DPRINTF2(("%s: xmit frame, idx=%d\n", __func__, cur)); if (wi_cmd(sc, WI_CMD_TX | WI_RECLAIM, fid, 0, 0)) { if_printf(ifp, "xmit failed\n"); sc->sc_txd[cur].d_len = 0; @@ -1169,7 +1166,6 @@ int error = 0; int tries; - DPRINTF(("%s\n", __func__)); /* Symbol firmware cannot be initialized more than once */ if (sc->sc_firmware_type == WI_SYMBOL && sc->sc_reset) return (0); @@ -2558,7 +2554,6 @@ u_int16_t val; struct wi_key wkey[IEEE80211_WEP_NKID]; - DPRINTF(("%s\n", __func__)); switch (sc->sc_firmware_type) { case WI_LUCENT: val = (ic->ic_flags & IEEE80211_F_PRIVACY) ? 1 : 0; @@ -2669,8 +2664,6 @@ { int i, s = 0; - DPRINTF2(("%s: cmd=%d val0=%d val1=%d val2=%d\n", - __func__, cmd, val0, val1, val2)); if (sc->wi_gone) return (ENODEV); @@ -3017,7 +3010,6 @@ int error = 0; u_int16_t val[2]; - DPRINTF(("%s\n", __func__)); if (!sc->sc_enabled) return ENXIO; switch (sc->sc_firmware_type) { @@ -3060,7 +3052,6 @@ struct ieee80211com *ic; uint8_t ssid[2+IEEE80211_NWID_LEN]; - DPRINTF(("%s\n", __func__)); ic = &sc->sc_ic; rstamp++; memset(&sp, 0, sizeof(sp)); @@ -3128,11 +3119,12 @@ sp.ssid = (uint8_t *)&ssid[0]; memcpy(sp.ssid + 2, ap->name, ap->namelen); sp.ssid[1] = ap->namelen; - sp.chan = ieee80211_find_channel(ic, + sp.bchan = ap->channel; + sp.curchan = ieee80211_find_channel(ic, ieee80211_ieee2mhz(ap->channel, IEEE80211_CHAN_B), IEEE80211_CHAN_B); - if (sp.chan == NULL) - sp.chan = &ic->ic_channels[0]; + if (sp.curchan == NULL) + sp.curchan = &ic->ic_channels[0]; sp.rates = &rates[0]; sp.tstamp = (uint8_t *)&rstamp; DPRINTF(("calling add_scan, bssid %s chan %d signal %d\n", @@ -3543,7 +3535,6 @@ struct ifnet *ifp = ic->ic_ifp; struct wi_softc *sc = ifp->if_softc; - DPRINTF(("%s\n", __func__)); WI_LOCK(sc); sc->sc_flags |= WI_FLAGS_SCANNING; wi_scan_ap(sc, 0x3fff, 0x000f); From owner-p4-projects@FreeBSD.ORG Fri Jun 29 08:16:20 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4E1E416A46B; Fri, 29 Jun 2007 08:16:20 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id F234D16A468 for ; Fri, 29 Jun 2007 08:16:19 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id E1B0313C448 for ; Fri, 29 Jun 2007 08:16:19 +0000 (UTC) (envelope-from gabor@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5T8GJhb072565 for ; Fri, 29 Jun 2007 08:16:19 GMT (envelope-from gabor@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5T8GJuC072562 for perforce@freebsd.org; Fri, 29 Jun 2007 08:16:19 GMT (envelope-from gabor@freebsd.org) Date: Fri, 29 Jun 2007 08:16:19 GMT Message-Id: <200706290816.l5T8GJuC072562@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gabor@freebsd.org using -f From: Gabor Kovesdan To: Perforce Change Reviews Cc: Subject: PERFORCE change 122523 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Jun 2007 08:16:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=122523 Change 122523 by gabor@gabor_server on 2007/06/29 08:15:29 IFC Affected files ... .. //depot/projects/soc2006/gabor_destdir/GIDs#8 integrate .. //depot/projects/soc2006/gabor_destdir/MOVED#9 integrate .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.apache.mk#2 integrate .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.gnome.mk#6 integrate .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.gnustep.mk#4 integrate .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#31 integrate .. //depot/projects/soc2006/gabor_destdir/Mk/bsd.sites.mk#9 integrate .. //depot/projects/soc2006/gabor_destdir/UIDs#8 integrate Differences ... ==== //depot/projects/soc2006/gabor_destdir/GIDs#8 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: ports/GIDs,v 1.42 2007/06/10 13:33:05 dinoex Exp $ +$FreeBSD: ports/GIDs,v 1.43 2007/06/27 21:13:24 beech Exp $ # Please keep this file sorted by GID! smmsp:*:25: bind:*:53: @@ -74,6 +74,7 @@ sympa:*:200: dspam:*:202: bs:*:220: +postgrey:*:225: fcron:*:247: _tor:*:256: _dns-proxy-tor:*:257: ==== //depot/projects/soc2006/gabor_destdir/MOVED#9 (text+ko) ==== @@ -1,7 +1,7 @@ # # MOVED - a list of (recently) moved or removed ports # -# $FreeBSD: ports/MOVED,v 1.1397 2007/06/19 14:24:00 ahze Exp $ +# $FreeBSD: ports/MOVED,v 1.1399 2007/06/25 14:36:31 barner Exp $ # # Each entry consists of a single line containing the following four # fields in the order named, separated with the pipe (`|') character: @@ -2390,7 +2390,6 @@ japanese/phpgroupware||2006-04-10|removed at mainter request (because broken and vulnerabilities) www/p5-Catalyst|www/p5-Catalyst-Runtime|2006-07-10|follow CPAN split of package textproc/p5-JSON-Syck|textproc/p5-YAML-Syck|2006-07-12|The textproc/p5-YAML-Syck port now includes JSON functionality -sysutils/ledit||2006-07-14|Has expired: Does not build x11/settitle||2006-07-14|Has expired: Download unavailable anymore net-im/simicq|net-im/sim-im|2006-07-15|renamed cad/gschem|cad/geda-gschem|2006-07-16|renamed @@ -3073,3 +3072,13 @@ net/cacti|net-mgmt/cacti|2007-06-18|Move to net-mgmt category net/zabbix-agent|net-mgmt/zabbix-agent|2007-06-18|Move to net-mgmt category graphics/gpdf|graphics/evince|2007-06-19|Obsolete port +deskutils/mnemo|deskutils/horde-mnemo|2007-06-21|Port renamed for consistency +deskutils/nag|deskutils/horde-nag|2007-06-21|Port renamed for consistency +deskutils/kronolith|deskutils/horde-kronolith|2007-06-21|Port renamed for consistency +devel/chora|devel/horde-chora|2007-06-21|Port renamed for consistency +ftp/gollem|ftp/horde-gollem|2007-06-21|Port renamed for consistency +mail/imp|mail/horde-imp|2007-06-21|Port renamed for consistency +mail/ingo|mail/horde-ingo|2007-06-21|Port renamed for consistency +mail/mimp|mail/horde-mimp|2007-06-21|Port renamed for consistency +mail/turba|mail/horde-turba|2007-06-21|Port renamed for consistency +security/jeta|security/horde-jeta|2007-06-21|Port renamed for consistency ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.apache.mk#2 (text+ko) ==== @@ -1,7 +1,7 @@ #-*- mode: makefile; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: ports/Mk/bsd.apache.mk,v 1.13 2006/11/07 09:11:53 clement Exp $ +# $FreeBSD: ports/Mk/bsd.apache.mk,v 1.14 2007/06/28 15:50:53 pav Exp $ # # bsd.apache.mk - Apache related macros. # Author: Clement Laforet @@ -393,7 +393,7 @@ .if defined(AP_GENPLIST) . if !exists(${PLIST}) @${ECHO} "===> Generating apache plist" - @${ECHO} "@unexec %D/sbin/apxs -e -A -n %%AP_NAME%% %D/%%APACHEMODDIR%%/%%AP_MODULE%%" > ${PLIST} + @${ECHO} "@unexec ${SED} -i '' '/LoadModule %%AP_NAME%%_module/d' %D/%%APACHEETCDIR%%/httpd.conf" >> ${PLIST} @${ECHO} "%%APACHEMODDIR%%/%%AP_MODULE%%" >> ${PLIST} @${ECHO} "@exec %D/sbin/apxs -e -A -n %%AP_NAME%% %D/%F" >> ${PLIST} @${ECHO} "@unexec echo \"Don't forget to remove all ${MODULENAME}-related directives in your httpd.conf\"">> ${PLIST} ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.gnome.mk#6 (text+ko) ==== @@ -1,7 +1,7 @@ #-*- mode: Fundamental; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: ports/Mk/bsd.gnome.mk,v 1.140 2007/03/19 05:19:11 marcus Exp $ +# $FreeBSD: ports/Mk/bsd.gnome.mk,v 1.141 2007/06/28 16:02:48 pav Exp $ # $NetBSD: $ # $MCom: ports/Mk/bsd.gnome.mk,v 1.414 2007/03/13 01:24:54 marcus Exp $ # @@ -689,9 +689,9 @@ # Then traverse through all components, check which of them # exist in ${_USE_GNOME} and set variables accordingly +.ifdef _USE_GNOME . for component in ${_USE_GNOME_ALL} -_COMP_TEST= ${_USE_GNOME:M${component}} -. if ${_COMP_TEST:S/${component}//}!=${_COMP_TEST:S/ / /g} +. if ${_USE_GNOME:M${component}}!="" PATCH_DEPENDS+= ${${component}_PATCH_DEPENDS} FETCH_DEPENDS+= ${${component}_FETCH_DEPENDS} EXTRACT_DEPENDS+=${${component}_EXTRACT_DEPENDS} @@ -726,6 +726,7 @@ . endif . endfor .endif +.endif .if defined(GNOME_PRE_PATCH) ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.gnustep.mk#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: ports/Mk/bsd.gnustep.mk,v 1.43 2007/06/04 11:20:29 dinoex Exp $ +# $FreeBSD: ports/Mk/bsd.gnustep.mk,v 1.44 2007/06/26 16:58:33 dinoex Exp $ # # This file contains some variable definitions that are supposed to # make your life easier when dealing with ports related to the GNUstep. @@ -498,7 +498,7 @@ @(cd ${WRKSRC}; . ${GNUSTEP_MAKEFILES}/GNUstep.sh; \ ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${INSTALL_TARGET}) .endif -.if defined(PARALLEL_PACKAGE_BUILD) || defined(BATCH) || defined(CLEAN_ROOT) +.if defined(PACKAGE_BUILDING) || defined(BATCH) || defined(CLEAN_ROOT) rm -rf /root/GNUstep .endif ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.port.mk#31 (text+ko) ==== @@ -1,7 +1,7 @@ #-*- mode: makefile; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: ports/Mk/bsd.port.mk,v 1.569 2007/06/16 19:07:42 pav Exp $ +# $FreeBSD: ports/Mk/bsd.port.mk,v 1.572 2007/06/28 16:06:02 pav Exp $ # $NetBSD: $ # # bsd.port.mk - 940820 Jordan K. Hubbard. @@ -2760,7 +2760,7 @@ benchmarks biology cad chinese comms converters databases \ deskutils devel dns editors elisp emulators finance french ftp \ games geography german gnome gnustep graphics hamradio haskell hebrew hungarian \ - ipv6 irc japanese java kde korean lang linux lisp \ + ipv6 irc japanese java kde kld korean lang linux lisp \ mail math mbone misc multimedia net net-im net-mgmt net-p2p news \ palm parallel pear perl5 plan9 polish portuguese ports-mgmt \ print python ruby rubygems russian \ @@ -3154,10 +3154,14 @@ .endif .if !defined(DEPENDS_TARGET) +.if defined(DEPENDS_PRECLEAN) +DEPENDS_TARGET= clean +DEPENDS_ARGS= NOCLEANDEPENDS=yes +.endif .if make(reinstall) -DEPENDS_TARGET= reinstall +DEPENDS_TARGET+= reinstall .else -DEPENDS_TARGET= install +DEPENDS_TARGET+= install .endif .if defined(DEPENDS_CLEAN) DEPENDS_TARGET+= clean @@ -4301,7 +4305,7 @@ .if !target(clean) clean: .if !defined(NOCLEANDEPENDS) - @cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} clean-depends + @cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} limited-clean-depends .endif @${ECHO_MSG} "===> Cleaning for ${PKGNAME}" .if target(pre-clean) @@ -4762,6 +4766,14 @@ if ${EXPR} "$$dir" : '.*:' > /dev/null; then \ target=`${ECHO_CMD} $$dir | ${SED} -e 's/.*://'`; \ dir=`${ECHO_CMD} $$dir | ${SED} -e 's/:.*//'`; \ + if [ X${DEPENDS_PRECLEAN} != "X" ]; then \ + target="clean $$target"; \ + depends_args="$$depends_args NOCLEANDEPENDS=yes"; \ + fi; \ + if [ X${DEPENDS_CLEAN} != "X" ]; then \ + target="$$target clean"; \ + depends_args="$$depends_args NOCLEANDEPENDS=yes"; \ + fi; \ else \ target="${DEPENDS_TARGET}"; \ depends_args="${DEPENDS_ARGS}"; \ @@ -4926,9 +4938,95 @@ L=$$l; \ done +CLEAN-DEPENDS-FULL= \ + L="${_DEPEND_DIRS}"; \ + checked=""; \ + while [ -n "$$L" ]; do \ + l=""; \ + for d in $$L; do \ + case $$checked in \ + $$d\ *|*\ $$d\ *|*\ $$d) \ + continue;; \ + esac; \ + checked="$$checked $$d"; \ + if [ ! -d $$d ]; then \ + ${ECHO_MSG} "${PKGNAME}: \"$$d\" non-existent -- dependency list incomplete" >&2; \ + continue; \ + fi; \ + if ! children=$$(cd $$d && ${MAKE} -V WRKDIR -V _DEPEND_DIRS); then \ + ${ECHO_MSG} "${PKGNAME}: \"$$d\" erroneous -- dependency list incomplete" >&2; \ + continue; \ + fi; \ + state=0; \ + for child in $$children; do \ + case $$state in \ + 0) \ + if [ -d $child ]; then \ + ${ECHO_CMD} $$d; \ + fi; \ + state=1;; \ + 1) \ + case "$$checked $$l" in \ + $$child\ *|*\ $$child\ *|*\ $$child) \ + continue;; \ + esac; \ + l="$$l $$child";; \ + esac; \ + done; \ + done; \ + L=$$l; \ + done + +CLEAN-DEPENDS-LIMITED= \ + L="${_DEPEND_DIRS}"; \ + checked=""; \ + while [ -n "$$L" ]; do \ + l=""; \ + for d in $$L; do \ + case $$checked in \ + $$d\ *|*\ $$d\ *|*\ $$d) \ + continue;; \ + esac; \ + checked="$$checked $$d"; \ + if [ ! -d $$d ]; then \ + ${ECHO_MSG} "${PKGNAME}: \"$$d\" non-existent -- dependency list incomplete" >&2; \ + continue; \ + fi; \ + if ! children=$$(cd $$d && ${MAKE} -V WRKDIR -V _DEPEND_DIRS); then \ + ${ECHO_MSG} "${PKGNAME}: \"$$d\" erroneous -- dependency list incomplete" >&2; \ + continue; \ + fi; \ + state=0; \ + for child in $$children; do \ + case $$state in \ + 0) \ + if [ ! -d $child ]; then \ + break; \ + fi; \ + state=1; \ + ${ECHO_CMD} $$d;; \ + 1) \ + case "$$checked $$l" in \ + $$child\ *|*\ $$child\ *|*\ $$child) \ + continue;; \ + esac; \ + l="$$l $$child";; \ + esac; \ + done; \ + done; \ + L=$$l; \ + done + .if !target(clean-depends) clean-depends: - @for dir in $$(${ALL-DEPENDS-LIST}); do \ + @for dir in $$(${CLEAN-DEPENDS-FULL}); do \ + (cd $$dir; ${MAKE} NOCLEANDEPENDS=yes clean); \ + done +.endif + +.if !target(limited-clean-depends) +limited-clean-depends: + @for dir in $$(${CLEAN-DEPENDS-LIMITED}); do \ (cd $$dir; ${MAKE} NOCLEANDEPENDS=yes clean); \ done .endif @@ -5094,23 +5192,20 @@ ACTUAL-PACKAGE-DEPENDS?= \ if [ "${_LIB_RUN_DEPENDS}" != " " ]; then \ - for pkgname in ${PKG_DBDIR}/*; do \ + origins=$$(for pkgname in ${PKG_DBDIR}/*; do \ if [ -e $$pkgname/+CONTENTS ]; then \ - a=$${pkgname\#\#*/}; \ - b=`${SED} -n -e "s/@comment ORIGIN://p" $$pkgname/+CONTENTS`; \ - if [ ! -z $$b ]; then \ - origins="$$origins $$a $$b"; \ - fi; \ + ${ECHO_CMD} $${pkgname\#\#*/}; \ + ${SED} -n -e "s/@comment ORIGIN://p" $$pkgname/+CONTENTS; \ fi; \ - done; \ + done); \ for dir in ${_LIB_RUN_DEPENDS:C,[^:]*:([^:]*):?.*,\1,}; do \ tmp=$${dir%/*}; \ dir=$${tmp\#\#*/}/$${dir\#\#*/}; \ set -- $$origins; \ - while [ $$\# != 0 ]; do \ - if [ $$dir = $$2 ]; then \ + while [ $$\# -gt 1 ]; do \ + if [ "$$dir" = "$$2" ]; then \ ${ECHO_CMD} $$1:$$dir; \ - if [ -e ${PKG_DBDIR}/$$1/+CONTENTS ]; then \ + if [ -e ${PKG_DBDIR}/$$1/+CONTENTS -a -z "${EXPLICIT_PACKAGE_DEPENDS}" ]; then \ packagelist="$$packagelist ${PKG_DBDIR}/$$1/+CONTENTS"; \ fi; \ break; \ ==== //depot/projects/soc2006/gabor_destdir/Mk/bsd.sites.mk#9 (text+ko) ==== @@ -20,7 +20,7 @@ # # Note: all entries should terminate with a slash. # -# $FreeBSD: ports/Mk/bsd.sites.mk,v 1.421 2007/06/19 10:28:40 sat Exp $ +# $FreeBSD: ports/Mk/bsd.sites.mk,v 1.422 2007/06/26 11:39:12 edwin Exp $ # # Where to put distfiles that don't have any other master site @@ -1083,7 +1083,7 @@ MASTER_SITE_RUBYFORGE+= \ http://rubyforge.rubyuser.de/%SUBDIR%/ \ http://rubyforge.iasi.roedu.net/files/%SUBDIR%/ \ - http://rubyforge.halostatue.info/%SUBDIR%/ \ + http://files.rubyforge.mmmultiworks.com/%SUBDIR%/ \ http://files.rubyforge.vm.bytemark.co.uk/%SUBDIR%/ .endif ==== //depot/projects/soc2006/gabor_destdir/UIDs#8 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: ports/UIDs,v 1.46 2007/06/10 13:33:05 dinoex Exp $ +$FreeBSD: ports/UIDs,v 1.48 2007/06/27 21:13:24 beech Exp $ # Please keep this file sorted by UID! smmsp:*:25:25:Sendmail Submission User:/var/spool/clientmqueue:/usr/sbin/nologin bind:*:53:53:Bind Sandbox:/:/sbin/nologin @@ -62,6 +62,7 @@ mythtv:*:119:119:MythTV pseudo-user:/home/mythtv:/bin/sh pdns_recursor:*:120:120:pdns_recursor pseudo-user:/nonexistent:/sbin/nologin otrs:*:121:121:OTRS Administrator:/usr/local/otrs:/bin/csh +zabbix:*:122:122:Zabbix NMS:/nonexistent:/sbin/nologin _ntp:*:123:123:NTP Daemon:/var/empty:/sbin/nologin fetchmail:*:124:124:Fetchmail mail-retrieval daemon:/nonexistent:/sbin/nologin postfix:*:125:125:Postfix Mail System:/var/spool/postfix:/sbin/nologin @@ -84,6 +85,7 @@ dspam:*:202:202:Dspam:/nonexistent:/sbin/nologin shoutcast:*:210:210:Shoutcast sandbox:/nonexistent:/bin/sh bs:*:220:220:Big Sister:/usr/local/bigsister:/bin/sh +postgrey:*:225:225:Postgrey Owner:/nonexistent:/sbin/nologin fcron:*:247:247:fcron pseudo-user:/nonexistent:/sbin/nologin _tor:*:256:256:Tor anonymising router:/var/db/tor:/bin/sh _dns-proxy-tor:*:257:257:dns-proxy-tor user:/nonexistent:/sbin/nologin From owner-p4-projects@FreeBSD.ORG Fri Jun 29 09:19:40 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5313F16A421; Fri, 29 Jun 2007 09:19:40 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 09C5616A400 for ; Fri, 29 Jun 2007 09:19:40 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id EE50613C448 for ; Fri, 29 Jun 2007 09:19:39 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5T9JdCD002818 for ; Fri, 29 Jun 2007 09:19:39 GMT (envelope-from zhouzhouyi@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5T9Jd11002815 for perforce@freebsd.org; Fri, 29 Jun 2007 09:19:39 GMT (envelope-from zhouzhouyi@FreeBSD.org) Date: Fri, 29 Jun 2007 09:19:39 GMT Message-Id: <200706290919.l5T9Jd11002815@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zhouzhouyi@FreeBSD.org using -f From: Zhouyi ZHOU To: Perforce Change Reviews Cc: Subject: PERFORCE change 122524 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Jun 2007 09:19:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=122524 Change 122524 by zhouzhouyi@zhouzhouyi_mactest on 2007/06/29 09:19:07 The MAC check for mkdir system calls Affected files ... .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/mactest.c#5 edit .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/misc.sh#3 edit .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/open/00.t#1 add Differences ... ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/mactest.c#5 (text+ko) ==== @@ -758,7 +758,10 @@ } fprintf(stderr, " with labels:"); while (tmp2) { - fprintf(stderr, " %s", tmp2->labelstring); + if (!strcmp("*",tmp2->labelstring)) + fprintf(stderr, " any"); + else + fprintf(stderr, " %s", tmp2->labelstring); tmp2 = tmp2->prev; } fprintf(stderr, "\n"); ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/misc.sh#3 (text+ko) ==== @@ -4,7 +4,7 @@ pid=0 pid_file="`pwd`/pidfile" tmp_file="`pwd`/tmp" - +mactest_conf="`pwd`/mactest.conf" echo ${dir} | egrep '^/' >/dev/null 2>&1 if [ $? -eq 0 ]; then @@ -82,3 +82,9 @@ { pid=`cat ${pid_file}` } + + +namegen() +{ + echo "mactest_`dd if=/dev/random bs=1k count=1 2>/dev/null | openssl md5`" +} From owner-p4-projects@FreeBSD.ORG Fri Jun 29 09:38:04 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8A75916A46C; Fri, 29 Jun 2007 09:38:04 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 561CD16A468 for ; Fri, 29 Jun 2007 09:38:04 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 46EBE13C455 for ; Fri, 29 Jun 2007 09:38:04 +0000 (UTC) (envelope-from zhouzhouyi@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5T9c4iE004666 for ; Fri, 29 Jun 2007 09:38:04 GMT (envelope-from zhouzhouyi@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5T9c4tf004663 for perforce@freebsd.org; Fri, 29 Jun 2007 09:38:04 GMT (envelope-from zhouzhouyi@FreeBSD.org) Date: Fri, 29 Jun 2007 09:38:04 GMT Message-Id: <200706290938.l5T9c4tf004663@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zhouzhouyi@FreeBSD.org using -f From: Zhouyi ZHOU To: Perforce Change Reviews Cc: Subject: PERFORCE change 122525 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Jun 2007 09:38:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=122525 Change 122525 by zhouzhouyi@zhouzhouyi_mactest on 2007/06/29 09:37:06 Check the ordinary case for open with O_CREAT flag Affected files ... .. //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/open/00.t#2 edit Differences ... ==== //depot/projects/soc2007/zhouzhouyi_mactest_soc/regression/mactest/tests/open/00.t#2 (text+ko) ==== @@ -6,7 +6,7 @@ dir=`dirname $0` . ${dir}/../misc.sh -echo "1..1" +echo "1..2" n0=`namegen` n1=`namegen` @@ -31,13 +31,21 @@ echo "pid = -1 mac_test_init_vnode_label" >> ${mactest_conf} #associate the extattr of newly created vnode echo "pid = -1 mac_test_create_vnode_extattr: biba/high(low-high),mls/9(low-high) * ${dvplabel} biba/high,mls/9" >> ${mactest_conf} + mactestnotexpectanyerror -m "mls/9(low-high)" mkdir ${n1} 0755 + rm ${mactest_conf} - mactestnotexpectanyerror -m "mls/9(low-high)" mkdir ${n1} 0755 - cdir=`pwd` cd ${n1} + echo "pid = -1 mac_test_check_vnode_lookup with cr_label and dvplabel:biba/high(low-high),mls/9(low-high) biba/high,mls/9" > ${mactest_conf} + echo "pid = -1 mac_test_check_vnode_create with cr_label and dvplabel:biba/high(low-high),mls/9(low-high) biba/high,mls/9" >> ${mactest_conf} + echo "pid = -1 mac_test_init_vnode_label" >> ${mactest_conf} + echo "pid = -1 mac_test_create_vnode_extattr with cr_label mplabel dvplabel and vplabel:biba/high(low-high),mls/9(low-high) biba/high,mls/low biba/high,mls/9 biba/high,mls/9" >> ${mactest_conf} + echo "pid = -1 mac_test_check_vnode_open with acc_mode and cr_label and vplabel#VWRITE :biba/high(low-high),mls/9(low-high) biba/high,mls/9" >> ${mactest_conf} + mv ${mactest_conf} "mactest.conf" + mactestnotexpectanyerror -m "mls/9(low-high)" open ${n0} O_CREAT,O_WRONLY 0755 + rm "mactest.conf" + cd .. rm -fr ${n1} - rm ${mactest_conf} fi From owner-p4-projects@FreeBSD.ORG Fri Jun 29 15:15:07 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AB5FC16A46B; Fri, 29 Jun 2007 15:15:07 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 615B916A469 for ; Fri, 29 Jun 2007 15:15:07 +0000 (UTC) (envelope-from taleks@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 4A9E513C4B9 for ; Fri, 29 Jun 2007 15:15:07 +0000 (UTC) (envelope-from taleks@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5TFF7DO046416 for ; Fri, 29 Jun 2007 15:15:07 GMT (envelope-from taleks@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5TFF6rT046413 for perforce@freebsd.org; Fri, 29 Jun 2007 15:15:06 GMT (envelope-from taleks@FreeBSD.org) Date: Fri, 29 Jun 2007 15:15:06 GMT Message-Id: <200706291515.l5TFF6rT046413@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to taleks@FreeBSD.org using -f From: Alexey Tarasov To: Perforce Change Reviews Cc: Subject: PERFORCE change 122529 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Jun 2007 15:15:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=122529 Change 122529 by taleks@taleks_th on 2007/06/29 15:14:52 Updated segment resending code, added tcp_resend_update() to recalc checksum with latest ack value. Updated pxe_tcp_send() to use segments functions. Changed await function to be able perform resending during waiting. Affected files ... .. //depot/projects/soc2007/taleks-pxe_http/pxe_connection.c#2 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_segment.c#2 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_segment.h#2 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_tcp.c#4 edit Differences ... ==== //depot/projects/soc2007/taleks-pxe_http/pxe_connection.c#2 (text+ko) ==== @@ -104,6 +104,8 @@ case PXE_AWAIT_STARTTRY: /* nothing to do */ case PXE_AWAIT_FINISHTRY: + pxe_resend_check(wait_data->connection); + break; case PXE_AWAIT_END: default: break; @@ -143,12 +145,14 @@ connection->next_recv = 0; /* NOTE: need to make more correct initial number */ - connection->iss = (filter->src_ip ^ filter->dst_ip) + (uint32_t)pxe_get_secs(); + connection->iss = (filter->src_ip + filter->dst_ip) + (uint32_t)pxe_get_secs(); connection->next_send = connection->iss; connection->filter = filter; connection->recv = &sock->recv_buffer; connection->send = &sock->send_buffer; + + pxe_resend_init(connection); if (!pxe_tcp_send(connection, 0, PXE_TCP_SYN)) { printf("pxe_tcp_connect(): failed to send SYN.\n"); @@ -170,7 +174,7 @@ * connection will fell in this state in pxe_tcp_callback(), * after receiving SYN ACK and sending ACK to remote host */ - if (!pxe_await(tcp_await, 1, PXE_TCP_MSL, &wait_data)) { /* failed to get SYN/ACK */ + if (!pxe_await(tcp_await, 5, PXE_TCP_MSL / 5, &wait_data)) { /* failed to get SYN/ACK */ free_connection(connection); return (0); } @@ -233,13 +237,15 @@ /* await TIME_WITE state. * connection will fell in this state in pxe_tcp_callback(), - * after receiving SYN ACK and sending ACK to remote host + * TODO: add waiting of TCP_CLOSED also */ - if (!pxe_await(tcp_await, 1, PXE_TCP_MSL, &wait_data)) { /* failed to get SYN/ACK */ + if (!pxe_await(tcp_await, 5, PXE_TCP_MSL / 5, &wait_data)) { /* failed to get to TIME_WAIT state */ free_connection(connection); return (0); } + pxe_resend_free(connection); + #ifdef PXE_DEBUG printf("pxe_tcp_disconnect(): connection closed.\n"); #endif ==== //depot/projects/soc2007/taleks-pxe_http/pxe_segment.c#2 (text+ko) ==== @@ -23,6 +23,10 @@ * But in case it'll be redone to be more effective or just using other segment allocation * algorithm - this function may be needed. */ + +#ifdef PXE_DEBUG + tcp_resend_stats(connection); +#endif } /* pxe_resend_init() - initialize buffer map for connection @@ -62,7 +66,7 @@ /* tcp_segment_alloc() - allocates from send buffer memory for packet, * including segment data, IP & TCP headers * in: - * connection - connection, from which send byffer segment is allocated + * connection - connection, from which send buffer segment is allocated * allocBig - 1 if need big segment, 0 otherwise * out: * NULL - failed to allocate memory chunk(s) for segment @@ -177,8 +181,18 @@ /* block is used exclusevely by one "big" packet */ if (buf_blocks[block_index] == PXE_TCP_BLOCK_EXCLUSIVE) { + + if (segment->status != PXE_SEGMENT_SENT) + continue; /* it was not ever sent yet */ + if (cur_time >= segment->resend_at) { /* time to resend */ +#ifdef PXE_DEBUG + printf("pxe_resend_check(): %d:%d resending...\n", segment->resend_at, cur_time); +#endif + tcp_update_segment(connection, segment); pxe_tcp_send_segment(connection, segment); + segment->trys += 1; + segment->resend_at += PXE_RESEND_TIME * segment->trys; } continue; } @@ -188,15 +202,17 @@ for ( ; chunk_index < PXE_TCP_CHUNK_COUNT; ++chunk_index) { - if (segment->status != PXE_SEGMENT_FREE) { + if (segment->status == PXE_SEGMENT_SENT) { if (cur_time >= segment->resend_at) { /* time to resend */ - +#ifdef PXE_DEBUG + printf("pxe_resend_check(): %d:%d resending...\n", segment->resend_at, cur_time); +#endif + tcp_update_segment(connection, segment); pxe_tcp_send_segment(connection, segment); - - /* resend a minute later, if failed */ - segment->resend_at += 60; - segment->trys += 1; + /* resend later, with more delay with every try */ + segment->trys += 1; + segment->resend_at += PXE_RESEND_TIME * segment->trys; } } @@ -233,7 +249,14 @@ /* block is used exclusevely by one "big" packet */ if (connection->buf_blocks[block_index] == PXE_TCP_BLOCK_EXCLUSIVE) { - if (connection->una > segment->seq) { /* segment was acked, release it */ + + if (segment->status != PXE_SEGMENT_SENT) + continue; /* it was not ever sent yet */ + + if (connection->una >= segment->seq) { /* segment was acked, release it */ +#ifdef PXE_DEBUG + printf("pxe_resend_update(): block %d acked.\n", block_index); +#endif tcp_segment_free(connection, block_index, segment); } continue; @@ -244,8 +267,12 @@ for ( ; chunk_index < PXE_TCP_CHUNK_COUNT; ++chunk_index) { - if (segment->status != PXE_SEGMENT_FREE) { - if (connection->una > segment->seq) { /* segment was acked */ + if (segment->status == PXE_SEGMENT_SENT) { + + if (connection->una >= segment->seq) { /* segment was acked */ +#ifdef PXE_DEBUG + printf("pxe_resend_update(): chunk %d@%d acked.\n", chunk_index, block_index); +#endif tcp_segment_free(connection, block_index, segment); } } @@ -269,13 +296,12 @@ tcp_packet->tcphdr.dst_port = le2be16(connection->dst_port); tcp_packet->tcphdr.checksum = 0; tcp_packet->tcphdr.sequence = le2be32(connection->next_send); - - tcp_packet->tcphdr.data_off = (uint8_t)((sizeof(PXE_TCP_HDR)/4) << 4); + tcp_packet->tcphdr.data_off = sizeof(PXE_TCP_HDR); if (add_options == 1) { /* reserving 8 bytes for options */ length += 8; - tcp_packet->tcphdr.data_off += 2; + tcp_packet->tcphdr.data_off += 8; /* pointing to options, leading tcp_header */ PXE_TCP_DEFAULT_OPTIONS *options = (PXE_TCP_DEFAULT_OPTIONS *)(tcp_packet + 1); @@ -286,7 +312,13 @@ options->mss = le2be16(PXE_TCP_MSS); } + tcp_packet->tcphdr.data_off = (tcp_packet->tcphdr.data_off / 4) << 4; tcp_packet->tcphdr.urgent = 0; + + segment->trys = 0; + segment->resend_at = 0; + segment->size = length; + segment->seq = connection->next_send; } void @@ -331,39 +363,95 @@ if (tcp_packet->tcphdr.checksum == 0) tcp_packet->tcphdr.checksum = 0xffff; + /* setting sequence number next to the segment last byte + * when connection->una become this value we must remove packet + * from resend queue. + */ + segment->seq += (length - 4 * (tcp_packet->tcphdr.data_off >> 4) + 1); + #ifdef PXE_DEBUG_HELL printf("tcp_finish_segment(): checksum 0x%4x for %d bytes\n", tcp_packet->tcphdr.checksum, length); #endif } +void +tcp_update_segment(PXE_TCP_CONNECTION *connection, PXE_TCP_QUEUED_SEGMENT *segment) +{ + PXE_TCP_PACKET *tcp_packet = (PXE_TCP_PACKET *)(segment + 1); + + uint16_t length = segment->size - sizeof(PXE_IP_HDR); + + tcp_packet->tcphdr.ack_next = le2be32(connection->next_recv); + + PXE_BUFFER *recv_buffer = connection->recv; + + /* set window size to free buffer space size, or to zero if recv_buffer == NULL */ + tcp_packet->tcphdr.window_size = (recv_buffer != NULL) ? le2be16(recv_buffer->bufleft) : 0; + tcp_packet->tcphdr.checksum = 0; + + PXE_IP4_PSEUDO_HDR pseudo_hdr; + + pseudo_hdr.src_ip = pxe_get_ip32(PXE_IP_MY); + pseudo_hdr.dst_ip = connection->dst_ip; + pseudo_hdr.zero = 0; + pseudo_hdr.proto = PXE_TCP_PROTOCOL; + pseudo_hdr.length = le2be16(length); + + /* adding pseudo header checksum to checksum of tcp header with data + * and make it complimentary + */ + uint16_t part1 = pxe_ip_checksum(&pseudo_hdr, sizeof(PXE_IP4_PSEUDO_HDR)); + uint16_t part2 = pxe_ip_checksum(&tcp_packet->tcphdr, length); + + uint32_t tmp_sum = ((uint32_t)part1) + ((uint32_t)part2); + + if (tmp_sum & 0xf0000) { /* need carry out */ + tmp_sum -= 0xffff; + } + + tcp_packet->tcphdr.checksum = ~((uint16_t)(tmp_sum & 0xffff)); + + /* special case */ + if (tcp_packet->tcphdr.checksum == 0) + tcp_packet->tcphdr.checksum = 0xffff; + +#ifdef PXE_DEBUG_HELL + printf("tcp_update_segment(): checksum 0x%4x for %d bytes\n", tcp_packet->tcphdr.checksum, length); +#endif +} + /* pxe_tcp_send_segment() - send data segment via TCP protocol * in: + * connection - connection to which segment belongs * segment - segment to send * out: * 0 - failed * 1 - success */ int -pxe_tcp_send_segment(PXE_TCP_QUEUED_SEGMENT *segment) +pxe_tcp_send_segment(PXE_TCP_CONNECTION *connection, PXE_TCP_QUEUED_SEGMENT *segment) { PXE_TCP_PACKET *tcp_packet = (PXE_TCP_PACKET *)(segment + 1); - if (!pxe_ip_send(tcp_packet, tcp_packet->iphdr.dst_ip, PXE_TCP_PROTOCOL, segment->size, 1)) { - printf("pxe_tcp_send_send(): failed to send tcp packet to 0x%x\n", tcp_packet->iphdr.dst_ip); + if (!pxe_ip_send(tcp_packet, connection->dst_ip, PXE_TCP_PROTOCOL, segment->size, 1)) { + printf("pxe_tcp_send_send(): failed to send tcp packet to 0x%x\n", connection->dst_ip); return (0); } + /* mark segment to be checked in resend and update calls*/ + segment->status = PXE_SEGMENT_SENT; + #ifdef PXE_DEBUG PXE_IPADDR from; PXE_IPADDR to; - from.ip = tcp_packet->iphdr.src_ip; - to.ip = tcp_packet->iphdr.dst_ip; + from.ip = pxe_get_ip32(PXE_IP_MY); + to.ip = connection->dst_ip; - printf("pxe_tcp_send_segment(): tcp packet from %d.%d.%d.%d:%d to %d.%d.%d.%d:%d\n seq %d", - from.octet[0], from.octet[1], from.octet[2], from.octet[3], tcp_packet->tcphdr.src_port, - to.octet[0], to.octet[1], to.octet[2], to.octet[3], tcp_packet->tcphdr.dst_port, - segment->seq + printf("pxe_tcp_send_segment(): tcp packet from %d.%d.%d.%d:%d to %d.%d.%d.%d:%d\n next seq %d", + from.octet[0], from.octet[1], from.octet[2], from.octet[3], connection->src_port, + to.octet[0], to.octet[1], to.octet[2], to.octet[3], connection->dst_port, + segment->seq - connection->iss ); uint8_t flags = tcp_packet->tcphdr.flags; @@ -378,16 +466,65 @@ printf(" rst,"); if (flags & PXE_TCP_ACK) - printf(" ack %d,", be2le32(tcp_packet->tcphdr.ack_next)); + printf(" ack %d,", connection->next_recv - connection->irs); if (flags & PXE_TCP_URG) printf(" urg,"); if (flags & PXE_TCP_URG) printf(" psh,"); - - printf(" %d bytes.\n", segment->size); + + uint16_t length = segment->size - sizeof(PXE_IP_HDR) - 4 * (tcp_packet->tcphdr.data_off >> 4); + + printf(" %d bytes.\n", length); #endif return (1); } + +void +tcp_resend_stats(PXE_TCP_CONNECTION *connection) +{ + int block_index = 0; + PXE_BUFFER *buffer = connection->send; + uint8_t *buf_blocks = connection->buf_blocks; + void *data = NULL; + PXE_TCP_QUEUED_SEGMENT *segment = NULL; + + printf("pxe_resend_stats(): stats for connection 0x%x\n", connection); + + for ( ; block_index < PXE_TCP_BLOCK_COUNT; ++block_index) { + + /* start of block */ + data = buffer->data + PXE_TCP_CHUNK_COUNT * block_index * connection->chunk_size; + segment = (PXE_TCP_QUEUED_SEGMENT *)data; + + if (buf_blocks[block_index] != PXE_TCP_BLOCK_FREE) { + + if (buf_blocks[block_index] != PXE_TCP_BLOCK_EXCLUSIVE) { + /* search free chunk in block */ + int chunk_index = 0; + + for ( ; chunk_index < PXE_TCP_CHUNK_COUNT; ++chunk_index) { + + if (segment->status != PXE_SEGMENT_FREE) { + + printf("\tchunk %d@%d awaiting %d ack.\n", + chunk_index, block_index, segment->seq - connection->iss + ); + } + + /* next chunk in block */ + data += connection->chunk_size; + segment = (PXE_TCP_QUEUED_SEGMENT *)data; + } + + } else { + + printf("pxe_resend_stats(): block %d awaiting %d ack.\n", + block_index, segment->seq - connection->iss + ); + } + } + } +} ==== //depot/projects/soc2007/taleks-pxe_http/pxe_segment.h#2 (text+ko) ==== @@ -11,6 +11,8 @@ #define PXE_SEGMENT_USED 0x01 /* segment is filled with data, sent but not ACKed yet */ #define PXE_SEGMENT_SENT 0x02 +/* default resend time if not acked in seconds */ +#define PXE_RESEND_TIME 5 /* how much blocks in buffer */ #define PXE_TCP_BLOCK_COUNT 8 @@ -58,4 +60,25 @@ /* inits buffer map of connection */ void pxe_resend_init(PXE_TCP_CONNECTION *connection); +/* sends chhosed segment to adrressee */ +int pxe_tcp_send_segment(PXE_TCP_CONNECTION *connection, PXE_TCP_QUEUED_SEGMENT *segment); + +/* allocates in buffer space segment */ +PXE_TCP_QUEUED_SEGMENT * tcp_segment_alloc(PXE_TCP_CONNECTION *connection, int allocBig); + +/* releases memory used by segment */ +void tcp_segment_free(PXE_TCP_CONNECTION *connection, int block_index, PXE_TCP_QUEUED_SEGMENT *segment); + +/* fills most of fields of tcp header of segment */ +void tcp_start_segment(PXE_TCP_CONNECTION *connection, PXE_TCP_QUEUED_SEGMENT *segment, int add_options); + +/* finishes filling of tcp header, adds checksum */ +void tcp_finish_segment(PXE_TCP_CONNECTION *connection, PXE_TCP_QUEUED_SEGMENT *segment, uint8_t tcp_flags); + +/* when resending updates ack and checksum */ +void tcp_update_segment(PXE_TCP_CONNECTION *connection, PXE_TCP_QUEUED_SEGMENT *segment); + +/* when resending updates ack and checksum */ +void tcp_resend_stats(PXE_TCP_CONNECTION *connection); + #endif ==== //depot/projects/soc2007/taleks-pxe_http/pxe_tcp.c#4 (text+ko) ==== @@ -6,6 +6,7 @@ #include "pxe_core.h" #include "pxe_filter.h" #include "pxe_ip.h" +#include "pxe_segment.h" #include "pxe_tcp.h" /* state handle functions */ @@ -244,17 +245,16 @@ return (0); } -/* printf("tcp_check_5(): una = %d, ack = %d\n", connection->una, ack); - if ( connection->una < ack) { */ +/* printf("tcp_check_5(): una = %d, ack = %d\n", connection->una, ack); */ + if ( connection->una <= ack) { connection->una = ack; pxe_resend_update(connection); -/* } else { /* ignore dublicate packet */ -/* #ifdef PXE_DEBUG + } else { /* ignore dublicate packet */ +#ifdef PXE_DEBUG printf("tcp_check_5(): failed\n"); #endif return (0); } -*/ connection->remote_window = tcp_packet->tcphdr.window_size; @@ -274,7 +274,7 @@ if (tcp_packet->tcphdr.flags & PXE_TCP_URG) return (1); -#ifdef PXE_DEBUG +#ifdef PXE_DEBUG_HELL printf("tcp_check_6(): failed\n"); #endif return (0); @@ -296,10 +296,13 @@ if (seglen == 0 ) connection->next_recv += 1; - +/* #ifdef PXE_DEBUG - printf("tcp_process_7(): ack = %d, seq = %d, seglen = %d\n", connection->next_recv, connection->next_send, seglen); + printf("tcp_process_7(): ack = %d, seq = %d, seglen = %d\n", + connection->next_recv - connection->irs, connection->next_send - connection->iss, seglen + ); #endif +*/ if (seglen > 0) { /* write data to buffer */ void *data = ((void *)tcp_packet) + sizeof(PXE_IP_HDR) + 4 * (tcp_packet->tcphdr.data_off >> 4); @@ -322,7 +325,7 @@ { if (tcp_packet->tcphdr.flags & PXE_TCP_FIN) return (1); -#ifdef PXE_DEBUG +#ifdef PXE_DEBUG_HELL printf("tcp_check_8(): failed\n"); #endif return (0); @@ -505,8 +508,7 @@ connection->next_send = tcp_packet->tcphdr.ack_next; } - /* if acked FIN */ -/* if (tcp_check_8(tcp_packet)) { */ + /* if acked our FIN */ if (connection->state_out == PXE_TCP_FIN) { connection->state = PXE_TCP_FIN_WAIT2; #ifdef PXE_DEBUG @@ -809,8 +811,6 @@ uint16_t src_port = tcp_packet->tcphdr.src_port; uint16_t dst_port = tcp_packet->tcphdr.dst_port; -/* uint16_t data_size = pack->data_size - sizeof(PXE_IP_HDR) - 4 * (tcp_packet->tcphdr.data_off >> 4);*/ - PXE_IP_HDR *iphdr = pack->data; /* calculating data size from ip length minus headers length */ @@ -835,16 +835,13 @@ #ifdef PXE_DEBUG printf("pxe_tcp_callback(): packet filtered out, sending RST.\n"); #endif -/* if (flags & PXE_TCP_SYN) { /* this was hopeless attempt to connect */ + if (flags & PXE_TCP_ACK) { + tcp_send_rst_for(tcp_packet, 0, tcp_packet->tcphdr.ack_next, PXE_TCP_RST, data_size); + } else { + tcp_send_rst_for(tcp_packet, tcp_packet->tcphdr.ack_next + data_size, + 0, PXE_TCP_RST | PXE_TCP_ACK, data_size); + } - if (flags & PXE_TCP_ACK) { - tcp_send_rst_for(tcp_packet, 0, tcp_packet->tcphdr.ack_next, PXE_TCP_RST, data_size); - } else { - tcp_send_rst_for(tcp_packet, tcp_packet->tcphdr.ack_next + data_size, - 0, PXE_TCP_RST | PXE_TCP_ACK, data_size); - } -/* } /* otherwise just ignore this packet */ - return (0); } @@ -902,10 +899,10 @@ if (connection->state > PXE_TCP_SYN_SENT) { /* if we know sequence number, then check it */ if (seq != connection->next_recv) { /* not next in order, drop it, send ACK */ -/* tcp_send_ack_for(tcp_packet, connection->next_recv, /* with next needed sequence number */ -/* connection->next_send, sock); */ #ifdef PXE_DEBUG - printf("pxe_tcp_callback(): got %d != awaited %d\n", seq, connection->next_recv); + printf("pxe_tcp_callback(): got %d != awaited %d\n", + seq - connection->irs, connection->next_recv - connection->irs + ); #endif return (0); } @@ -913,10 +910,12 @@ /* in case of SYN_SENT state we don't know sequence number yet */ } + int result = 0; + /* calling appropriate state handler, if it's not NULL */ if (connection->state < PXE_TCP_ALL_STATES) { - int result = 0; + while (1) { #ifdef PXE_DEBUG printf("pxe_tcp_callback(): connection state = 0x%x\n", connection->state); @@ -927,14 +926,20 @@ if (result == 2) continue; - return (result); + break; } else { /* state handler not registered */ - return (0); + break; } } } - return (0); + /* check ACKed packets*/ + pxe_resend_update(connection); + + /* check if need to resend some segments */ + pxe_resend_check(connection); + + return (result); } /* pxe_tcp_init() - initialization of TCP module @@ -952,7 +957,7 @@ pxe_core_register(PXE_TCP_PROTOCOL, pxe_tcp_callback); } -/* pxe_tcp_send() - send data via TCP protocol +/* pxe_tcp_send() - send system packets via TCP protocol * in: * connection - connection to send to * size - data size @@ -964,5 +969,31 @@ int pxe_tcp_send(PXE_TCP_CONNECTION *connection, uint16_t size, uint8_t tcp_flags) { - return (0); + /* allocating smmall segment */ + PXE_TCP_QUEUED_SEGMENT *segment = tcp_segment_alloc(connection, 0); + + if (segment == NULL) { + printf("pxe_tcp_send(): failed to allocate segment.\n"); + return (0); + } + +/* segment->seq = connection->next_send; */ + /* here is simpliest ever in the world way to calculate resend time + * for more reliable resend time calculation need to implement RTT calculating. + */ + + + /* add to every system segment default options */ + tcp_start_segment(connection, segment, 1); + + /* finish segment */ + tcp_finish_segment(connection, segment, tcp_flags); + segment->resend_at = pxe_get_secs() + PXE_RESEND_TIME; + + if (!pxe_tcp_send_segment(connection, segment)) { + printf("pxe_tcp_send(): failed to send segment.\n"); + return (0); + } + + return (1); } From owner-p4-projects@FreeBSD.ORG Sat Jun 30 00:54:17 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 71A9016A46E; Sat, 30 Jun 2007 00:54:17 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4FB3116A46C for ; Sat, 30 Jun 2007 00:54:17 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (66-23-211-162.clients.speedfactory.net [66.23.211.162]) by mx1.freebsd.org (Postfix) with ESMTP id C1BCC13C44B for ; Sat, 30 Jun 2007 00:54:16 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from localhost.corp.yahoo.com (john@localhost [127.0.0.1]) (authenticated bits=0) by server.baldwin.cx (8.13.8/8.13.8) with ESMTP id l5U0sCfL070369; Fri, 29 Jun 2007 20:54:14 -0400 (EDT) (envelope-from jhb@freebsd.org) From: John Baldwin To: Roman Divacky Date: Fri, 29 Jun 2007 20:51:03 -0400 User-Agent: KMail/1.9.6 References: <200706281150.l5SBoAsk043177@repoman.freebsd.org> In-Reply-To: <200706281150.l5SBoAsk043177@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200706292051.03868.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH authentication, not delayed by milter-greylist-2.0.2 (server.baldwin.cx [127.0.0.1]); Fri, 29 Jun 2007 20:54:14 -0400 (EDT) X-Virus-Scanned: ClamAV 0.88.3/3559/Fri Jun 29 19:24:17 2007 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-4.4 required=4.2 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.1.3 X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on server.baldwin.cx Cc: Perforce Change Reviews Subject: Re: PERFORCE change 122478 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Jun 2007 00:54:17 -0000 On Thursday 28 June 2007 07:50:10 am Roman Divacky wrote: > http://perforce.freebsd.org/chv.cgi?CH=122478 > > Change 122478 by rdivacky@rdivacky_witten on 2007/06/28 11:49:10 > > Lock Giant in a case of non-MPSAFE fs. Put in some forgotten vrele(dvp)... Please use the existing VFS_LOCK_GIANT() and VFS_UNLOCK_GIANT() macros. > Affected files ... > > .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#39 edit > > Differences ... > > ==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#39 (text+ko) ==== > > @@ -994,6 +994,8 @@ > *dvpp = NULL; > return (ENOTDIR); > } > + if (VFS_NEEDSGIANT((*dvpp)->v_mount)) > + mtx_lock(&Giant); > } > > return (0); > @@ -1161,8 +1163,11 @@ > VFS_UNLOCK_GIANT(vfslocked); > fdclose(fdp, fp, indx, td); > fdrop(fp, td); > - if (dvp) > + if (dvp) { > vrele(dvp); > + if (VFS_NEEDSGIANT(dvp->v_mount)) > + mtx_unlock(&Giant); > + } > return (error); > } > > @@ -1266,8 +1271,11 @@ > if (error) > return (error); > restart: > - if (dvp) > + if (dvp) { > vrele(dvp); > + if (VFS_NEEDSGIANT(dvp->v_mount)) > + mtx_unlock(&Giant); > + } > error = kern_get_at(td, fd, &dvp); > if (error && !kern_absolute_path(path, pathseg)) > return (error); > @@ -1345,8 +1353,11 @@ > vput(nd.ni_vp); > } > } > - if (dvp) > + if (dvp) { > vrele(dvp); > + if (VFS_NEEDSGIANT(dvp->v_mount)) > + mtx_unlock(&Giant); > + } > NDFREE(&nd, NDF_ONLY_PNBUF); > vput(nd.ni_dvp); > vn_finished_write(mp); > @@ -1407,8 +1418,11 @@ > > AUDIT_ARG(mode, mode); > restart: > - if (dvp) > + if (dvp) { > vrele(dvp); > + if (VFS_NEEDSGIANT(dvp->v_mount)) > + mtx_unlock(&Giant); > + } > error = kern_get_at(td, fd, &dvp); > if (error && !kern_absolute_path(path, pathseg)) > return (error); > @@ -1462,8 +1476,11 @@ > #ifdef MAC > out: > #endif > - if (dvp) > + if (dvp) { > vrele(dvp); > + if (VFS_NEEDSGIANT(dvp->v_mount)) > + mtx_unlock(&Giant); > + } > vput(nd.ni_dvp); > vn_finished_write(mp); > VFS_UNLOCK_GIANT(vfslocked); > @@ -1584,7 +1601,10 @@ > > error = kern_get_at(td, fd2, &ldvp); > if (error && !kern_absolute_path(path2, segflg)) { > - if (pdvp) > + if (pdvp) { > + if (VFS_NEEDSGIANT(pdvp->v_mount)) > + mtx_unlock(&Giant); > + } > vrele(pdvp); > return (error); > } > @@ -1641,10 +1661,16 @@ > VFS_UNLOCK_GIANT(vfslocked); > > out: > - if (pdvp) > + if (pdvp) { > vrele(pdvp); > - if (ldvp) > + if (VFS_NEEDSGIANT(pdvp->v_mount)) > + mtx_unlock(&Giant); > + } > + if (ldvp) { > vrele(ldvp); > + if (VFS_NEEDSGIANT(ldvp->v_mount)) > + mtx_unlock(&Giant); > + } > return (error); > } > > @@ -1710,8 +1736,11 @@ > } > AUDIT_ARG(text, syspath); > restart: > - if (dvp) > + if (dvp) { > vrele(dvp); > + if (VFS_NEEDSGIANT(dvp->v_mount)) > + mtx_unlock(&Giant); > + } > error = kern_get_at(td, fd, &dvp); > if (error && !kern_absolute_path(path2, segflg)) > return (error); > @@ -1763,8 +1792,11 @@ > vn_finished_write(mp); > VFS_UNLOCK_GIANT(vfslocked); > out: > - if (dvp) > + if (dvp) { > vrele(dvp); > + if (VFS_NEEDSGIANT(dvp->v_mount)) > + mtx_unlock(&Giant); > + } > if (segflg != UIO_SYSSPACE) > uma_zfree(namei_zone, syspath); > return (error); > @@ -1878,8 +1910,11 @@ > int vfslocked; > > restart: > - if (dvp) > + if (dvp) { > vrele(dvp); > + if (VFS_NEEDSGIANT(dvp->v_mount)) > + mtx_unlock(&Giant); > + } > error = kern_get_at(td, fd, &dvp); > if (error && !kern_absolute_path(path, pathseg)) > return (error); > @@ -1936,8 +1971,11 @@ > } > NDFREE(&nd, NDF_ONLY_PNBUF); > vput(nd.ni_dvp); > - if (dvp) > + if (dvp) { > vrele(dvp); > + if (VFS_NEEDSGIANT(dvp->v_mount)) > + mtx_unlock(&Giant); > + } > if (vp == nd.ni_dvp) > vrele(vp); > else > @@ -2189,8 +2227,11 @@ > out: > td->td_ucred = cred; > crfree(tmpcred); > - if (dvp) > + if (dvp) { > vrele(dvp); > + if (VFS_NEEDSGIANT(dvp->v_mount)) > + mtx_unlock(&Giant); > + } > return (error); > } > > @@ -2405,8 +2446,11 @@ > if (error == 0) > *sbp = sb; > out: > - if (dvp) > + if (dvp) { > vrele(dvp); > + if (VFS_NEEDSGIANT(dvp->v_mount)) > + mtx_unlock(&Giant); > + } > return (error); > } > > @@ -2469,8 +2513,11 @@ > if (error == 0) > *sbp = sb; > out: > - if (dvp) > + if (dvp) { > vrele(dvp); > + if (VFS_NEEDSGIANT(dvp->v_mount)) > + mtx_unlock(&Giant); > + } > return (error); > } > > @@ -2695,8 +2742,11 @@ > VFS_UNLOCK_GIANT(vfslocked); > td->td_retval[0] = count - auio.uio_resid; > out: > - if (dvp) > + if (dvp) { > vrele(dvp); > + if (VFS_NEEDSGIANT(dvp->v_mount)) > + mtx_unlock(&Giant); > + } > return (error); > } > > @@ -2942,8 +2992,11 @@ > vrele(nd.ni_vp); > VFS_UNLOCK_GIANT(vfslocked); > out: > - if (dvp) > + if (dvp) { > vrele(dvp); > + if (VFS_NEEDSGIANT(dvp->v_mount)) > + mtx_unlock(&Giant); > + } > return (error); > } > > @@ -2991,6 +3044,12 @@ > error = setfmode(td, nd.ni_vp, mode); > vrele(nd.ni_vp); > VFS_UNLOCK_GIANT(vfslocked); > + if (dvp) { > + vrele(dvp); > + if (VFS_NEEDSGIANT(dvp->v_mount)) > + mtx_unlock(&Giant); > + } > + > return (error); > } > > @@ -3132,8 +3191,11 @@ > vrele(nd.ni_vp); > VFS_UNLOCK_GIANT(vfslocked); > out: > - if (dvp) > + if (dvp) { > vrele(dvp); > + if (VFS_NEEDSGIANT(dvp->v_mount)) > + mtx_unlock(&Giant); > + } > return (error); > } > > @@ -3190,8 +3252,11 @@ > vrele(nd.ni_vp); > VFS_UNLOCK_GIANT(vfslocked); > out: > - if (dvp) > + if (dvp) { > vrele(dvp); > + if (VFS_NEEDSGIANT(dvp->v_mount)) > + mtx_unlock(&Giant); > + } > return (error); > } > > @@ -3377,8 +3442,11 @@ > vrele(nd.ni_vp); > VFS_UNLOCK_GIANT(vfslocked); > out: > - if (dvp) > + if (dvp) { > vrele(dvp); > + if (VFS_NEEDSGIANT(dvp->v_mount)) > + mtx_unlock(&Giant); > + } > return (error); > } > > @@ -3766,7 +3834,10 @@ > > error = kern_get_at(td, newfd, &todvp); > if (error && !kern_absolute_path(new, pathseg)) { > - if (frdvp) > + if (frdvp) { > + if (VFS_NEEDSGIANT(frdvp->v_mount)) > + mtx_unlock(&Giant); > + } > vrele(frdvp); > return (error); > } > @@ -3875,11 +3946,16 @@ > if (error == -1) > return (0); > out2: > - if (frdvp) > + if (frdvp) { > vrele(frdvp); > - if (todvp) > + if (VFS_NEEDSGIANT(frdvp->v_mount)) > + mtx_unlock(&Giant); > + } > + if (todvp) { > vrele(todvp); > - > + if (VFS_NEEDSGIANT(todvp->v_mount)) > + mtx_unlock(&Giant); > + } > return (error); > } > > @@ -3936,8 +4012,11 @@ > > AUDIT_ARG(mode, mode); > restart: > - if (dvp) > + if (dvp) { > vrele(dvp); > + if (VFS_NEEDSGIANT(dvp->v_mount)) > + mtx_unlock(&Giant); > + } > error = kern_get_at(td, fd, &dvp); > if (error && !kern_absolute_path(path, segflg)) > return (error); > @@ -3996,8 +4075,11 @@ > #ifdef MAC > out: > #endif > - if (dvp) > + if (dvp) { > vrele(dvp); > + if (VFS_NEEDSGIANT(dvp->v_mount)) > + mtx_unlock(&Giant); > + } > NDFREE(&nd, NDF_ONLY_PNBUF); > vput(nd.ni_dvp); > if (!error) > @@ -4042,6 +4124,11 @@ > int vfslocked; > > restart: > + if (dvp) { > + vrele(dvp); > + if (VFS_NEEDSGIANT(dvp->v_mount)) > + mtx_unlock(&Giant); > + } > error = kern_get_at(td, fd, &dvp); > if (error && !kern_absolute_path(path, pathseg)) > return (error); > @@ -4095,6 +4182,11 @@ > out: > NDFREE(&nd, NDF_ONLY_PNBUF); > vput(vp); > + if (dvp) { > + vrele(dvp); > + if (VFS_NEEDSGIANT(dvp->v_mount)) > + mtx_unlock(&Giant); > + } > if (nd.ni_dvp == vp) > vrele(nd.ni_dvp); > else > -- John Baldwin From owner-p4-projects@FreeBSD.ORG Sat Jun 30 00:54:19 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 99BE916A46F; Sat, 30 Jun 2007 00:54:19 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5F75D16A46B for ; Sat, 30 Jun 2007 00:54:19 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (66-23-211-162.clients.speedfactory.net [66.23.211.162]) by mx1.freebsd.org (Postfix) with ESMTP id D764D13C457 for ; Sat, 30 Jun 2007 00:54:18 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from localhost.corp.yahoo.com (john@localhost [127.0.0.1]) (authenticated bits=0) by server.baldwin.cx (8.13.8/8.13.8) with ESMTP id l5U0sCfM070369; Fri, 29 Jun 2007 20:54:16 -0400 (EDT) (envelope-from jhb@freebsd.org) From: John Baldwin To: Roman Divacky Date: Fri, 29 Jun 2007 20:52:06 -0400 User-Agent: KMail/1.9.6 References: <200706281214.l5SCEhFq046327@repoman.freebsd.org> In-Reply-To: <200706281214.l5SCEhFq046327@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200706292052.06861.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH authentication, not delayed by milter-greylist-2.0.2 (server.baldwin.cx [127.0.0.1]); Fri, 29 Jun 2007 20:54:16 -0400 (EDT) X-Virus-Scanned: ClamAV 0.88.3/3559/Fri Jun 29 19:24:17 2007 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-4.4 required=4.2 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.1.3 X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on server.baldwin.cx Cc: Perforce Change Reviews Subject: Re: PERFORCE change 122480 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Jun 2007 00:54:20 -0000 On Thursday 28 June 2007 08:14:43 am Roman Divacky wrote: > http://perforce.freebsd.org/chv.cgi?CH=122480 > > Change 122480 by rdivacky@rdivacky_witten on 2007/06/28 12:14:14 > > vrele AFTER checking the vp for being on non-MPSAFE FS + some indentation > problems that caused bad scoping > > Noticed by: rwatson (again ;) ) Umm, no. You need Giant for the vrele(). The proper fix is to use the VFS_*_GIANT() macros and use int variables to know if you need to unlock Giant or not. > Affected files ... > > .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#41 edit > > Differences ... > > ==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/vfs_syscalls.c#41 (text+ko) ==== > > @@ -1164,9 +1164,9 @@ > fdclose(fdp, fp, indx, td); > fdrop(fp, td); > if (dvp) { > - vrele(dvp); > if (VFS_NEEDSGIANT(dvp->v_mount)) > mtx_unlock(&Giant); > + vrele(dvp); > } > return (error); > } > @@ -1272,9 +1272,9 @@ > return (error); > restart: > if (dvp) { > - vrele(dvp); > if (VFS_NEEDSGIANT(dvp->v_mount)) > mtx_unlock(&Giant); > + vrele(dvp); > } > error = kern_get_at(td, fd, &dvp); > if (error && !kern_absolute_path(path, pathseg)) > @@ -1354,9 +1354,9 @@ > } > } > if (dvp) { > - vrele(dvp); > if (VFS_NEEDSGIANT(dvp->v_mount)) > mtx_unlock(&Giant); > + vrele(dvp); > } > NDFREE(&nd, NDF_ONLY_PNBUF); > vput(nd.ni_dvp); > @@ -1419,9 +1419,9 @@ > AUDIT_ARG(mode, mode); > restart: > if (dvp) { > - vrele(dvp); > if (VFS_NEEDSGIANT(dvp->v_mount)) > mtx_unlock(&Giant); > + vrele(dvp); > } > error = kern_get_at(td, fd, &dvp); > if (error && !kern_absolute_path(path, pathseg)) > @@ -1477,9 +1477,9 @@ > out: > #endif > if (dvp) { > - vrele(dvp); > if (VFS_NEEDSGIANT(dvp->v_mount)) > mtx_unlock(&Giant); > + vrele(dvp); > } > vput(nd.ni_dvp); > vn_finished_write(mp); > @@ -1602,10 +1602,10 @@ > error = kern_get_at(td, fd2, &ldvp); > if (error && !kern_absolute_path(path2, segflg)) { > if (pdvp) { > - vrele(pdvp); > if (VFS_NEEDSGIANT(pdvp->v_mount)) > mtx_unlock(&Giant); > - } > + vrele(pdvp); > + } > return (error); > } > > @@ -1662,14 +1662,14 @@ > > out: > if (pdvp) { > - vrele(pdvp); > if (VFS_NEEDSGIANT(pdvp->v_mount)) > mtx_unlock(&Giant); > + vrele(pdvp); > } > if (ldvp) { > - vrele(ldvp); > if (VFS_NEEDSGIANT(ldvp->v_mount)) > mtx_unlock(&Giant); > + vrele(ldvp); > } > return (error); > } > @@ -1737,9 +1737,9 @@ > AUDIT_ARG(text, syspath); > restart: > if (dvp) { > - vrele(dvp); > if (VFS_NEEDSGIANT(dvp->v_mount)) > mtx_unlock(&Giant); > + vrele(dvp); > } > error = kern_get_at(td, fd, &dvp); > if (error && !kern_absolute_path(path2, segflg)) > @@ -1793,9 +1793,9 @@ > VFS_UNLOCK_GIANT(vfslocked); > out: > if (dvp) { > - vrele(dvp); > if (VFS_NEEDSGIANT(dvp->v_mount)) > mtx_unlock(&Giant); > + vrele(dvp); > } > if (segflg != UIO_SYSSPACE) > uma_zfree(namei_zone, syspath); > @@ -1911,9 +1911,9 @@ > > restart: > if (dvp) { > - vrele(dvp); > if (VFS_NEEDSGIANT(dvp->v_mount)) > mtx_unlock(&Giant); > + vrele(dvp); > } > error = kern_get_at(td, fd, &dvp); > if (error && !kern_absolute_path(path, pathseg)) > @@ -1972,9 +1972,9 @@ > NDFREE(&nd, NDF_ONLY_PNBUF); > vput(nd.ni_dvp); > if (dvp) { > - vrele(dvp); > if (VFS_NEEDSGIANT(dvp->v_mount)) > mtx_unlock(&Giant); > + vrele(dvp); > } > if (vp == nd.ni_dvp) > vrele(vp); > @@ -2228,9 +2228,9 @@ > td->td_ucred = cred; > crfree(tmpcred); > if (dvp) { > - vrele(dvp); > if (VFS_NEEDSGIANT(dvp->v_mount)) > mtx_unlock(&Giant); > + vrele(dvp); > } > return (error); > } > @@ -2447,9 +2447,9 @@ > *sbp = sb; > out: > if (dvp) { > - vrele(dvp); > if (VFS_NEEDSGIANT(dvp->v_mount)) > mtx_unlock(&Giant); > + vrele(dvp); > } > return (error); > } > @@ -2514,9 +2514,9 @@ > *sbp = sb; > out: > if (dvp) { > - vrele(dvp); > if (VFS_NEEDSGIANT(dvp->v_mount)) > mtx_unlock(&Giant); > + vrele(dvp); > } > return (error); > } > @@ -2743,9 +2743,9 @@ > td->td_retval[0] = count - auio.uio_resid; > out: > if (dvp) { > - vrele(dvp); > if (VFS_NEEDSGIANT(dvp->v_mount)) > mtx_unlock(&Giant); > + vrele(dvp); > } > return (error); > } > @@ -2993,9 +2993,9 @@ > VFS_UNLOCK_GIANT(vfslocked); > out: > if (dvp) { > - vrele(dvp); > if (VFS_NEEDSGIANT(dvp->v_mount)) > mtx_unlock(&Giant); > + vrele(dvp); > } > return (error); > } > @@ -3045,9 +3045,9 @@ > vrele(nd.ni_vp); > VFS_UNLOCK_GIANT(vfslocked); > if (dvp) { > - vrele(dvp); > if (VFS_NEEDSGIANT(dvp->v_mount)) > mtx_unlock(&Giant); > + vrele(dvp); > } > > return (error); > @@ -3192,9 +3192,9 @@ > VFS_UNLOCK_GIANT(vfslocked); > out: > if (dvp) { > - vrele(dvp); > if (VFS_NEEDSGIANT(dvp->v_mount)) > mtx_unlock(&Giant); > + vrele(dvp); > } > return (error); > } > @@ -3253,9 +3253,9 @@ > VFS_UNLOCK_GIANT(vfslocked); > out: > if (dvp) { > - vrele(dvp); > if (VFS_NEEDSGIANT(dvp->v_mount)) > mtx_unlock(&Giant); > + vrele(dvp); > } > return (error); > } > @@ -3443,9 +3443,9 @@ > VFS_UNLOCK_GIANT(vfslocked); > out: > if (dvp) { > - vrele(dvp); > if (VFS_NEEDSGIANT(dvp->v_mount)) > mtx_unlock(&Giant); > + vrele(dvp); > } > return (error); > } > @@ -3835,10 +3835,10 @@ > error = kern_get_at(td, newfd, &todvp); > if (error && !kern_absolute_path(new, pathseg)) { > if (frdvp) { > - vrele(frdvp); > if (VFS_NEEDSGIANT(frdvp->v_mount)) > mtx_unlock(&Giant); > - } > + vrele(frdvp); > + } > return (error); > } > > @@ -3947,14 +3947,14 @@ > return (0); > out2: > if (frdvp) { > - vrele(frdvp); > if (VFS_NEEDSGIANT(frdvp->v_mount)) > mtx_unlock(&Giant); > + vrele(frdvp); > } > if (todvp) { > - vrele(todvp); > if (VFS_NEEDSGIANT(todvp->v_mount)) > mtx_unlock(&Giant); > + vrele(todvp); > } > return (error); > } > @@ -4013,9 +4013,9 @@ > AUDIT_ARG(mode, mode); > restart: > if (dvp) { > - vrele(dvp); > if (VFS_NEEDSGIANT(dvp->v_mount)) > mtx_unlock(&Giant); > + vrele(dvp); > } > error = kern_get_at(td, fd, &dvp); > if (error && !kern_absolute_path(path, segflg)) > @@ -4076,9 +4076,9 @@ > out: > #endif > if (dvp) { > - vrele(dvp); > if (VFS_NEEDSGIANT(dvp->v_mount)) > mtx_unlock(&Giant); > + vrele(dvp); > } > NDFREE(&nd, NDF_ONLY_PNBUF); > vput(nd.ni_dvp); > @@ -4125,9 +4125,9 @@ > > restart: > if (dvp) { > - vrele(dvp); > if (VFS_NEEDSGIANT(dvp->v_mount)) > mtx_unlock(&Giant); > + vrele(dvp); > } > error = kern_get_at(td, fd, &dvp); > if (error && !kern_absolute_path(path, pathseg)) > @@ -4183,9 +4183,9 @@ > NDFREE(&nd, NDF_ONLY_PNBUF); > vput(vp); > if (dvp) { > - vrele(dvp); > if (VFS_NEEDSGIANT(dvp->v_mount)) > mtx_unlock(&Giant); > + vrele(dvp); > } > if (nd.ni_dvp == vp) > vrele(nd.ni_dvp); > -- John Baldwin From owner-p4-projects@FreeBSD.ORG Sat Jun 30 00:54:21 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D9E7416A5B7; Sat, 30 Jun 2007 00:54:20 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B826A16A5B5 for ; Sat, 30 Jun 2007 00:54:20 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (66-23-211-162.clients.speedfactory.net [66.23.211.162]) by mx1.freebsd.org (Postfix) with ESMTP id 62B3A13C458 for ; Sat, 30 Jun 2007 00:54:20 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from localhost.corp.yahoo.com (john@localhost [127.0.0.1]) (authenticated bits=0) by server.baldwin.cx (8.13.8/8.13.8) with ESMTP id l5U0sCfN070369; Fri, 29 Jun 2007 20:54:18 -0400 (EDT) (envelope-from jhb@freebsd.org) From: John Baldwin To: Roman Divacky Date: Fri, 29 Jun 2007 20:53:24 -0400 User-Agent: KMail/1.9.6 References: <200706281301.l5SD1jhl064451@repoman.freebsd.org> In-Reply-To: <200706281301.l5SD1jhl064451@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200706292053.24548.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH authentication, not delayed by milter-greylist-2.0.2 (server.baldwin.cx [127.0.0.1]); Fri, 29 Jun 2007 20:54:18 -0400 (EDT) X-Virus-Scanned: ClamAV 0.88.3/3559/Fri Jun 29 19:24:17 2007 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-4.4 required=4.2 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.1.3 X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on server.baldwin.cx Cc: Perforce Change Reviews Subject: Re: PERFORCE change 122487 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Jun 2007 00:54:21 -0000 On Thursday 28 June 2007 09:01:45 am Roman Divacky wrote: > http://perforce.freebsd.org/chv.cgi?CH=122487 > > Change 122487 by rdivacky@rdivacky_witten on 2007/06/28 13:01:09 > > Use vn_fullpath to get the name of the binary and stuff that into p_comm. > > Affected files ... > > .. //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_exec.c#6 edit > > Differences ... > > ==== //depot/projects/soc2007/rdivacky/linux_at/sys/kern/kern_exec.c#6 (text+ko) ==== > > @@ -304,7 +304,7 @@ > struct ucred *newcred = NULL, *oldcred; > struct uidinfo *euip; > register_t *stack_base; > - int error, len, i; > + int error, len = 0, i; > struct image_params image_params, *imgp; > struct vattr attr; > int (*img_first)(struct image_params *); > @@ -560,8 +560,16 @@ > len = min(ndp->ni_cnd.cn_namelen,MAXCOMLEN); > bcopy(ndp->ni_cnd.cn_nameptr, p->p_comm, len); > } else { > - len = 10; > - bcopy("fexec neco", p->p_comm, 10); > + char *freepath; > + char *fullpath = NULL; > + > + error = vn_fullpath(td, binvp, &fullpath, &freepath); > + if (error == 0) { > + len = min(strlen(fullpath), MAXCOMLEN); > + bcopy(fullpath, p->p_comm, len); > + if (freepath) > + free(freepath, M_TEMP); > + } > } What if vn_fullpath() fails? What does p_comm[] contain then? -- John Baldwin From owner-p4-projects@FreeBSD.ORG Sat Jun 30 10:01:53 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1757F16A484; Sat, 30 Jun 2007 10:01:53 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D6E2A16A400 for ; Sat, 30 Jun 2007 10:01:52 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id C5F8613C483 for ; Sat, 30 Jun 2007 10:01:52 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5UA1qvN006356 for ; Sat, 30 Jun 2007 10:01:52 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5UA1qw9006352 for perforce@freebsd.org; Sat, 30 Jun 2007 10:01:52 GMT (envelope-from thompsa@freebsd.org) Date: Sat, 30 Jun 2007 10:01:52 GMT Message-Id: <200706301001.l5UA1qw9006352@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thompsa@freebsd.org using -f From: Andrew Thompson To: Perforce Change Reviews Cc: Subject: PERFORCE change 122568 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Jun 2007 10:01:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=122568 Change 122568 by thompsa@thompsa_heff on 2007/06/30 10:01:50 Provide a macro which directly dereferences ic_ieee from the channel. This can only be used in places where the channel is always valid. Suggested by: sam Affected files ... .. //depot/projects/wifi/sys/net80211/_ieee80211.h#24 edit .. //depot/projects/wifi/sys/net80211/ieee80211_input.c#109 edit .. //depot/projects/wifi/sys/net80211/ieee80211_scan.c#17 edit Differences ... ==== //depot/projects/wifi/sys/net80211/_ieee80211.h#24 (text+ko) ==== @@ -229,6 +229,8 @@ (IEEE80211_IS_CHAN_2GHZ(_c) && \ ((_c)->ic_flags & IEEE80211_CHAN_HT) != 0) +#define IEEE80211_CHAN2IEEE(_c) (_c)->ic_ieee + /* ni_chan encoding for FH phy */ #define IEEE80211_FH_CHANMOD 80 #define IEEE80211_FH_CHAN(set,pat) (((set)-1)*IEEE80211_FH_CHANMOD+(pat)) ==== //depot/projects/wifi/sys/net80211/ieee80211_input.c#109 (text+ko) ==== @@ -2090,7 +2090,7 @@ scan.tstamp = frm; frm += 8; scan.bintval = le16toh(*(uint16_t *)frm); frm += 2; scan.capinfo = le16toh(*(uint16_t *)frm); frm += 2; - scan.bchan = ieee80211_chan2ieee(ic, ic->ic_curchan); + scan.bchan = IEEE80211_CHAN2IEEE(ic->ic_curchan); scan.curchan = ic->ic_curchan; while (efrm - frm > 1) { @@ -2194,7 +2194,7 @@ return; } #endif - if (ieee80211_chan2ieee(ic, scan.curchan) != scan.bchan && + if (IEEE80211_CHAN2IEEE(scan.curchan) != scan.bchan && ic->ic_phytype != IEEE80211_T_FH) { /* * Frame was received on a channel different from the @@ -2211,7 +2211,7 @@ wh, ieee80211_mgt_subtype_name[subtype >> IEEE80211_FC0_SUBTYPE_SHIFT], "for off-channel %u", - ieee80211_chan2ieee(ic, scan.curchan)); + IEEE80211_CHAN2IEEE(scan.curchan)); ic->ic_stats.is_rx_chanmismatch++; return; } ==== //depot/projects/wifi/sys/net80211/ieee80211_scan.c#17 (text+ko) ==== @@ -840,7 +840,7 @@ #ifdef IEEE80211_DEBUG static void -dump_probe_beacon(struct ieee80211com *ic, uint8_t subtype, int isnew, +dump_probe_beacon(uint8_t subtype, int isnew, const uint8_t mac[IEEE80211_ADDR_LEN], const struct ieee80211_scanparams *sp) { @@ -848,7 +848,7 @@ printf("[%s] %s%s on chan %u (bss chan %u) ", ether_sprintf(mac), isnew ? "new " : "", ieee80211_mgt_subtype_name[subtype >> IEEE80211_FC0_SUBTYPE_SHIFT], - ieee80211_chan2ieee(ic, sp->curchan), sp->bchan); + IEEE80211_CHAN2IEEE(sp->curchan), sp->bchan); ieee80211_print_essid(sp->ssid + 2, sp->ssid[1]); printf("\n"); @@ -894,7 +894,7 @@ return; #ifdef IEEE80211_DEBUG if (ieee80211_msg_scan(ic) && (ic->ic_flags & IEEE80211_F_SCAN)) - dump_probe_beacon(ic, subtype, 1, wh->i_addr2, sp); + dump_probe_beacon(subtype, 1, wh->i_addr2, sp); #endif if (ss->ss_ops != NULL && ss->ss_ops->scan_add(ss, sp, wh, subtype, rssi, noise, rstamp)) { From owner-p4-projects@FreeBSD.ORG Sat Jun 30 10:02:55 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 653B916A46F; Sat, 30 Jun 2007 10:02:55 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 12CE116A46D for ; Sat, 30 Jun 2007 10:02:55 +0000 (UTC) (envelope-from avatar@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id DEAFC13C46C for ; Sat, 30 Jun 2007 10:02:54 +0000 (UTC) (envelope-from avatar@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5UA2soo006475 for ; Sat, 30 Jun 2007 10:02:54 GMT (envelope-from avatar@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5UA2sl0006472 for perforce@freebsd.org; Sat, 30 Jun 2007 10:02:54 GMT (envelope-from avatar@freebsd.org) Date: Sat, 30 Jun 2007 10:02:54 GMT Message-Id: <200706301002.l5UA2sl0006472@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to avatar@freebsd.org using -f From: Tai-hwa Liang To: Perforce Change Reviews Cc: Subject: PERFORCE change 122569 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Jun 2007 10:02:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=122569 Change 122569 by avatar@avatar_t40 on 2007/06/30 10:02:49 Fixing IPW_DEBUG build. Reviewed by: sam MFP4 after: 3 days Affected files ... .. //depot/projects/wifi/sys/dev/ipw/if_ipw.c#16 edit Differences ... ==== //depot/projects/wifi/sys/dev/ipw/if_ipw.c#16 (text+ko) ==== @@ -1847,7 +1847,8 @@ #ifdef IPW_DEBUG if (ipw_debug > 0) { printf("Setting ESSID to "); - ieee80211_print_essid(ic->ic_des_essid, ic->ic_des_esslen); + ieee80211_print_essid(ic->ic_des_ssid[0].ssid, + ic->ic_des_ssid[0].len); printf("\n"); } #endif From owner-p4-projects@FreeBSD.ORG Sat Jun 30 16:55:29 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9A29016A46B; Sat, 30 Jun 2007 16:55:29 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 23BFC16A469 for ; Sat, 30 Jun 2007 16:55:29 +0000 (UTC) (envelope-from thioretic@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 144FF13C4B9 for ; Sat, 30 Jun 2007 16:55:29 +0000 (UTC) (envelope-from thioretic@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5UGtSsC060679 for ; Sat, 30 Jun 2007 16:55:28 GMT (envelope-from thioretic@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5UGtSID060676 for perforce@freebsd.org; Sat, 30 Jun 2007 16:55:28 GMT (envelope-from thioretic@FreeBSD.org) Date: Sat, 30 Jun 2007 16:55:28 GMT Message-Id: <200706301655.l5UGtSID060676@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to thioretic@FreeBSD.org using -f From: Maxim Zhuravlev To: Perforce Change Reviews Cc: Subject: PERFORCE change 122576 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Jun 2007 16:55:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=122576 Change 122576 by thioretic@thioretic on 2007/06/30 16:55:21 Just thinking about how to distinguish old and new drivers.. Affected files ... .. //depot/projects/soc2007/thioretic_gidl/sys/bus.h#2 edit Differences ... ==== //depot/projects/soc2007/thioretic_gidl/sys/bus.h#2 (text+ko) ==== @@ -486,6 +486,7 @@ const char *dmd_busname; kobj_class_t dmd_driver; devclass_t *dmd_devclass; + int stackaware; }; #define DRIVER_MODULE(name, busname, driver, devclass, evh, arg) \ @@ -494,7 +495,8 @@ evh, arg, \ #busname, \ (kobj_class_t) &driver, \ - &devclass \ + &devclass, \ + 0 \ }; \ \ static moduledata_t name##_##busname##_mod = { \ From owner-p4-projects@FreeBSD.ORG Sat Jun 30 21:45:38 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A4DF916A468; Sat, 30 Jun 2007 21:45:38 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6D45E16A475 for ; Sat, 30 Jun 2007 21:45:38 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 5BFCE13C44B for ; Sat, 30 Jun 2007 21:45:38 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5ULjchn097030 for ; Sat, 30 Jun 2007 21:45:38 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5ULjZde097025 for perforce@freebsd.org; Sat, 30 Jun 2007 21:45:35 GMT (envelope-from peter@freebsd.org) Date: Sat, 30 Jun 2007 21:45:35 GMT Message-Id: <200706302145.l5ULjZde097025@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 122586 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Jun 2007 21:45:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=122586 Change 122586 by peter@peter_overcee on 2007/06/30 21:44:42 IFC @122585 Affected files ... .. //depot/projects/hammer/ObsoleteFiles.inc#28 integrate .. //depot/projects/hammer/contrib/ipfilter/tools/ipfstat.c#5 integrate .. //depot/projects/hammer/contrib/less/main.c#6 integrate .. //depot/projects/hammer/contrib/less/screen.c#6 integrate .. //depot/projects/hammer/etc/mtree/BSD.include.dist#44 integrate .. //depot/projects/hammer/include/Makefile#62 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_open_fd.c#9 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_open_file.c#12 integrate .. //depot/projects/hammer/lib/libarchive/archive_read_open_filename.c#4 integrate .. //depot/projects/hammer/lib/libc/arm/sys/sbrk.S#3 integrate .. //depot/projects/hammer/lib/libc/net/sctp_sys_calls.c#6 integrate .. //depot/projects/hammer/lib/libgssapi/gss_accept_sec_context.c#3 integrate .. //depot/projects/hammer/lib/libgssapi/gss_display_status.c#2 integrate .. //depot/projects/hammer/lib/libgssapi/gss_export_name.c#2 integrate .. //depot/projects/hammer/lib/libgssapi/gss_indicate_mechs.c#2 integrate .. //depot/projects/hammer/lib/libgssapi/gss_init_sec_context.c#4 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/article.sgml#3 integrate .. //depot/projects/hammer/release/doc/share/misc/dev.archlist.txt#44 integrate .. //depot/projects/hammer/release/scripts/src-install.sh#4 integrate .. //depot/projects/hammer/rescue/rescue/Makefile#33 integrate .. //depot/projects/hammer/sbin/Makefile#45 integrate .. //depot/projects/hammer/sbin/mount/mount.8#22 integrate .. //depot/projects/hammer/sbin/mount/mount.c#30 integrate .. //depot/projects/hammer/sbin/mount_umapfs/Makefile#3 delete .. //depot/projects/hammer/sbin/mount_umapfs/mount_umapfs.8#7 delete .. //depot/projects/hammer/sbin/mount_umapfs/mount_umapfs.c#6 delete .. //depot/projects/hammer/sbin/mount_umapfs/sample.group.mapfile#2 delete .. //depot/projects/hammer/sbin/mount_umapfs/sample.user.mapfile#2 delete .. //depot/projects/hammer/sbin/mount_umapfs/umap_manual#2 delete .. //depot/projects/hammer/share/Makefile#10 integrate .. //depot/projects/hammer/share/man/man4/Makefile#92 integrate .. //depot/projects/hammer/share/man/man4/bce.4#4 integrate .. //depot/projects/hammer/share/man/man4/mac.4#6 integrate .. //depot/projects/hammer/share/man/man4/nxge.4#1 branch .. //depot/projects/hammer/share/man/man4/pcm.4#20 integrate .. //depot/projects/hammer/share/man/man4/tty.4#6 integrate .. //depot/projects/hammer/share/man/man4/ucom.4#7 integrate .. //depot/projects/hammer/share/man/man4/uhid.4#6 integrate .. //depot/projects/hammer/share/man/man7/hier.7#34 integrate .. //depot/projects/hammer/share/man/man9/priv.9#4 integrate .. //depot/projects/hammer/share/man/man9/suser.9#12 integrate .. //depot/projects/hammer/share/misc/committers-src.dot#3 integrate .. //depot/projects/hammer/share/mk/bsd.own.mk#18 integrate .. //depot/projects/hammer/share/mk/sys.mk#22 integrate .. //depot/projects/hammer/sys/boot/forth/loader.conf#34 integrate .. //depot/projects/hammer/sys/cam/cam_xpt.c#33 integrate .. //depot/projects/hammer/sys/cam/scsi/scsi_da.c#42 integrate .. //depot/projects/hammer/sys/conf/NOTES#120 integrate .. //depot/projects/hammer/sys/conf/files#152 integrate .. //depot/projects/hammer/sys/conf/options#107 integrate .. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#4 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi.c#77 integrate .. //depot/projects/hammer/sys/dev/ata/ata-all.h#44 integrate .. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#78 integrate .. //depot/projects/hammer/sys/dev/ata/ata-disk.c#44 integrate .. //depot/projects/hammer/sys/dev/ata/ata-pci.h#47 integrate .. //depot/projects/hammer/sys/dev/ata/ata-usb.c#6 integrate .. //depot/projects/hammer/sys/dev/ath/if_ath.c#53 integrate .. //depot/projects/hammer/sys/dev/ipw/if_ipw.c#18 integrate .. //depot/projects/hammer/sys/dev/isp/isp.c#25 integrate .. //depot/projects/hammer/sys/dev/isp/isp_pci.c#31 integrate .. //depot/projects/hammer/sys/dev/iwi/if_iwi.c#24 integrate .. //depot/projects/hammer/sys/dev/nxge/if_nxge.c#1 branch .. //depot/projects/hammer/sys/dev/nxge/if_nxge.h#1 branch .. //depot/projects/hammer/sys/dev/nxge/include/build-version.h#1 branch .. //depot/projects/hammer/sys/dev/nxge/include/version.h#1 branch .. //depot/projects/hammer/sys/dev/nxge/include/xge-debug.h#1 branch .. //depot/projects/hammer/sys/dev/nxge/include/xge-defs.h#1 branch .. //depot/projects/hammer/sys/dev/nxge/include/xge-list.h#1 branch .. //depot/projects/hammer/sys/dev/nxge/include/xge-os-pal.h#1 branch .. //depot/projects/hammer/sys/dev/nxge/include/xge-os-template.h#1 branch .. //depot/projects/hammer/sys/dev/nxge/include/xge-queue.h#1 branch .. //depot/projects/hammer/sys/dev/nxge/include/xgehal-channel.h#1 branch .. //depot/projects/hammer/sys/dev/nxge/include/xgehal-config.h#1 branch .. //depot/projects/hammer/sys/dev/nxge/include/xgehal-device.h#1 branch .. //depot/projects/hammer/sys/dev/nxge/include/xgehal-driver.h#1 branch .. //depot/projects/hammer/sys/dev/nxge/include/xgehal-event.h#1 branch .. //depot/projects/hammer/sys/dev/nxge/include/xgehal-fifo.h#1 branch .. //depot/projects/hammer/sys/dev/nxge/include/xgehal-mgmt.h#1 branch .. //depot/projects/hammer/sys/dev/nxge/include/xgehal-mgmtaux.h#1 branch .. //depot/projects/hammer/sys/dev/nxge/include/xgehal-mm.h#1 branch .. //depot/projects/hammer/sys/dev/nxge/include/xgehal-regs.h#1 branch .. //depot/projects/hammer/sys/dev/nxge/include/xgehal-ring.h#1 branch .. //depot/projects/hammer/sys/dev/nxge/include/xgehal-stats.h#1 branch .. //depot/projects/hammer/sys/dev/nxge/include/xgehal-types.h#1 branch .. //depot/projects/hammer/sys/dev/nxge/include/xgehal.h#1 branch .. //depot/projects/hammer/sys/dev/nxge/xge-osdep.h#1 branch .. //depot/projects/hammer/sys/dev/nxge/xgehal/xge-queue.c#1 branch .. //depot/projects/hammer/sys/dev/nxge/xgehal/xgehal-channel-fp.c#1 branch .. //depot/projects/hammer/sys/dev/nxge/xgehal/xgehal-channel.c#1 branch .. //depot/projects/hammer/sys/dev/nxge/xgehal/xgehal-config.c#1 branch .. //depot/projects/hammer/sys/dev/nxge/xgehal/xgehal-device-fp.c#1 branch .. //depot/projects/hammer/sys/dev/nxge/xgehal/xgehal-device.c#1 branch .. //depot/projects/hammer/sys/dev/nxge/xgehal/xgehal-driver.c#1 branch .. //depot/projects/hammer/sys/dev/nxge/xgehal/xgehal-fifo-fp.c#1 branch .. //depot/projects/hammer/sys/dev/nxge/xgehal/xgehal-fifo.c#1 branch .. //depot/projects/hammer/sys/dev/nxge/xgehal/xgehal-mgmt.c#1 branch .. //depot/projects/hammer/sys/dev/nxge/xgehal/xgehal-mgmtaux.c#1 branch .. //depot/projects/hammer/sys/dev/nxge/xgehal/xgehal-mm.c#1 branch .. //depot/projects/hammer/sys/dev/nxge/xgehal/xgehal-ring-fp.c#1 branch .. //depot/projects/hammer/sys/dev/nxge/xgehal/xgehal-ring.c#1 branch .. //depot/projects/hammer/sys/dev/nxge/xgehal/xgehal-stats.c#1 branch .. //depot/projects/hammer/sys/dev/nxge/xgell-version.h#1 branch .. //depot/projects/hammer/sys/dev/ral/rt2560.c#8 integrate .. //depot/projects/hammer/sys/dev/ral/rt2661.c#7 integrate .. //depot/projects/hammer/sys/dev/rp/rp.c#22 integrate .. //depot/projects/hammer/sys/dev/sym/sym_hipd.c#25 integrate .. //depot/projects/hammer/sys/dev/usb/if_aue.c#35 integrate .. //depot/projects/hammer/sys/dev/usb/if_axe.c#34 integrate .. //depot/projects/hammer/sys/dev/usb/if_axereg.h#11 integrate .. //depot/projects/hammer/sys/dev/usb/if_cdce.c#10 integrate .. //depot/projects/hammer/sys/dev/usb/if_cue.c#30 integrate .. //depot/projects/hammer/sys/dev/usb/if_kue.c#26 integrate .. //depot/projects/hammer/sys/dev/usb/if_ural.c#23 integrate .. //depot/projects/hammer/sys/dev/usb/uark.c#3 integrate .. //depot/projects/hammer/sys/dev/usb/ucom.c#25 integrate .. //depot/projects/hammer/sys/dev/usb/ugen.c#30 integrate .. //depot/projects/hammer/sys/dev/usb/uhub.c#21 integrate .. //depot/projects/hammer/sys/dev/usb/ukbd.c#18 integrate .. //depot/projects/hammer/sys/dev/usb/umass.c#44 integrate .. //depot/projects/hammer/sys/dev/usb/umodem.c#14 integrate .. //depot/projects/hammer/sys/dev/usb/ums.c#22 integrate .. //depot/projects/hammer/sys/dev/usb/usb.h#9 integrate .. //depot/projects/hammer/sys/dev/usb/usb_port.h#20 integrate .. //depot/projects/hammer/sys/dev/usb/usb_quirks.c#18 integrate .. //depot/projects/hammer/sys/dev/usb/usb_quirks.h#9 integrate .. //depot/projects/hammer/sys/dev/usb/usb_subr.c#32 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#80 integrate .. //depot/projects/hammer/sys/dev/usb/usbdi.c#17 integrate .. //depot/projects/hammer/sys/dev/usb/usbdi.h#14 integrate .. //depot/projects/hammer/sys/dev/wi/if_wi.c#51 integrate .. //depot/projects/hammer/sys/fs/tmpfs/tmpfs.h#2 integrate .. //depot/projects/hammer/sys/fs/tmpfs/tmpfs_fifoops.c#2 integrate .. //depot/projects/hammer/sys/fs/tmpfs/tmpfs_fifoops.h#2 integrate .. //depot/projects/hammer/sys/fs/tmpfs/tmpfs_subr.c#2 integrate .. //depot/projects/hammer/sys/fs/tmpfs/tmpfs_uma.c#2 delete .. //depot/projects/hammer/sys/fs/tmpfs/tmpfs_uma.h#2 delete .. //depot/projects/hammer/sys/fs/tmpfs/tmpfs_vfsops.c#2 integrate .. //depot/projects/hammer/sys/fs/tmpfs/tmpfs_vnops.c#2 integrate .. //depot/projects/hammer/sys/fs/tmpfs/tmpfs_vnops.h#2 integrate .. //depot/projects/hammer/sys/fs/umapfs/umap.h#5 delete .. //depot/projects/hammer/sys/fs/umapfs/umap_subr.c#8 delete .. //depot/projects/hammer/sys/fs/umapfs/umap_vfsops.c#18 delete .. //depot/projects/hammer/sys/fs/umapfs/umap_vnops.c#14 delete .. //depot/projects/hammer/sys/kern/Make.tags.inc#6 integrate .. //depot/projects/hammer/sys/kern/Makefile#5 integrate .. //depot/projects/hammer/sys/kern/kern_malloc.c#35 integrate .. //depot/projects/hammer/sys/kern/kern_rwlock.c#10 integrate .. //depot/projects/hammer/sys/kern/kern_timeout.c#24 integrate .. //depot/projects/hammer/sys/modules/Makefile#109 integrate .. //depot/projects/hammer/sys/modules/acpi/acpi_video/Makefile#7 integrate .. //depot/projects/hammer/sys/modules/ath_rate_amrr/Makefile#4 integrate .. //depot/projects/hammer/sys/modules/ath_rate_onoe/Makefile#4 integrate .. //depot/projects/hammer/sys/modules/i2c/controllers/alpm/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/i2c/controllers/viapm/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/nxge/Makefile#1 branch .. //depot/projects/hammer/sys/modules/tmpfs/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/umapfs/Makefile#2 delete .. //depot/projects/hammer/sys/net/bridgestp.c#14 integrate .. //depot/projects/hammer/sys/net/if_gre.c#34 integrate .. //depot/projects/hammer/sys/net80211/_ieee80211.h#10 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_freebsd.h#11 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_input.c#38 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_scan.c#2 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_scan.h#2 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_scan_sta.c#2 integrate .. //depot/projects/hammer/sys/netatalk/aarp.h#4 integrate .. //depot/projects/hammer/sys/netatalk/ddp.h#4 integrate .. //depot/projects/hammer/sys/netatm/atm_cm.c#12 integrate .. //depot/projects/hammer/sys/netatm/ipatm/ipatm_event.c#4 integrate .. //depot/projects/hammer/sys/netatm/spans/spans_proto.c#6 integrate .. //depot/projects/hammer/sys/netatm/uni/sscf_uni_lower.c#6 integrate .. //depot/projects/hammer/sys/netatm/uni/uniarp.c#10 integrate .. //depot/projects/hammer/sys/netatm/uni/uniarp_timer.c#4 integrate .. //depot/projects/hammer/sys/netatm/uni/unisig_decode.h#3 integrate .. //depot/projects/hammer/sys/netatm/uni/unisig_proto.c#5 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#22 integrate .. //depot/projects/hammer/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#12 integrate .. //depot/projects/hammer/sys/netgraph/ng_parse.c#12 integrate .. //depot/projects/hammer/sys/netinet/sctp_indata.c#9 integrate .. //depot/projects/hammer/sys/netinet/sctputil.c#10 integrate .. //depot/projects/hammer/sys/security/audit/audit.h#8 integrate .. //depot/projects/hammer/sys/security/audit/audit_arg.c#9 integrate .. //depot/projects/hammer/sys/security/audit/audit_bsm.c#8 integrate .. //depot/projects/hammer/sys/security/audit/audit_bsm_token.c#6 integrate .. //depot/projects/hammer/sys/security/audit/audit_syscalls.c#9 integrate .. //depot/projects/hammer/sys/security/mac/mac_audit.c#2 integrate .. //depot/projects/hammer/sys/security/mac/mac_framework.h#4 integrate .. //depot/projects/hammer/sys/security/mac/mac_policy.h#4 integrate .. //depot/projects/hammer/sys/security/mac_stub/mac_stub.c#23 integrate .. //depot/projects/hammer/sys/security/mac_test/mac_test.c#41 integrate .. //depot/projects/hammer/sys/sys/_rwlock.h#4 integrate .. //depot/projects/hammer/sys/sys/rwlock.h#8 integrate .. //depot/projects/hammer/sys/vm/swap_pager.c#52 integrate .. //depot/projects/hammer/sys/vm/vm_pageout.c#43 integrate .. //depot/projects/hammer/tools/regression/fsx/fsx.c#5 integrate .. //depot/projects/hammer/tools/regression/lib/libc/nss/test-gethostby.c#2 integrate .. //depot/projects/hammer/tools/regression/lib/libc/nss/test-gethostby.t#2 integrate .. //depot/projects/hammer/tools/regression/tmpfs/Makefile#2 integrate .. //depot/projects/hammer/tools/regression/tmpfs/t_id_gen#2 delete .. //depot/projects/hammer/tools/tools/README#25 integrate .. //depot/projects/hammer/tools/tools/nxge/Makefile#1 branch .. //depot/projects/hammer/tools/tools/nxge/xge_cmn.h#1 branch .. //depot/projects/hammer/tools/tools/nxge/xge_info.c#1 branch .. //depot/projects/hammer/tools/tools/nxge/xge_info.h#1 branch .. //depot/projects/hammer/tools/tools/nxge/xge_log.c#1 branch .. //depot/projects/hammer/tools/tools/nxge/xge_log.h#1 branch .. //depot/projects/hammer/tools/tools/tinybsd/conf/bridge/tinybsd.basefiles#2 integrate .. //depot/projects/hammer/tools/tools/tinybsd/conf/default/tinybsd.basefiles#2 integrate .. //depot/projects/hammer/tools/tools/tinybsd/conf/firewall/tinybsd.basefiles#2 integrate .. //depot/projects/hammer/tools/tools/tinybsd/conf/minimal/tinybsd.basefiles#2 integrate .. //depot/projects/hammer/tools/tools/tinybsd/conf/vpn/tinybsd.basefiles#2 integrate .. //depot/projects/hammer/tools/tools/tinybsd/conf/wireless/tinybsd.basefiles#2 integrate .. //depot/projects/hammer/tools/tools/tinybsd/conf/wrap/tinybsd.basefiles#2 integrate .. //depot/projects/hammer/usr.bin/calendar/calendars/calendar.freebsd#54 integrate .. //depot/projects/hammer/usr.bin/truss/amd64-fbsd.c#6 integrate .. //depot/projects/hammer/usr.bin/truss/i386-fbsd.c#12 integrate .. //depot/projects/hammer/usr.bin/truss/i386-linux.c#9 integrate .. //depot/projects/hammer/usr.bin/truss/ia64-fbsd.c#11 integrate .. //depot/projects/hammer/usr.bin/truss/main.c#13 integrate .. //depot/projects/hammer/usr.bin/truss/powerpc-fbsd.c#3 integrate .. //depot/projects/hammer/usr.bin/truss/setup.c#7 integrate .. //depot/projects/hammer/usr.bin/truss/sparc64-fbsd.c#9 integrate .. //depot/projects/hammer/usr.bin/usbhidaction/usbhidaction.1#3 integrate .. //depot/projects/hammer/usr.bin/usbhidaction/usbhidaction.c#3 integrate .. //depot/projects/hammer/usr.sbin/portsnap/phttpget/phttpget.c#8 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/dist.c#30 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/dist.h#11 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/help/distributions.hlp#4 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/help/fixit.hlp#3 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/help/media.hlp#2 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/help/network_device.hlp#2 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/help/options.hlp#3 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/help/securelevel.hlp#4 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/help/shortcuts.hlp#3 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/index.c#14 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/install.c#29 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/menus.c#43 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/sysinstall.8#17 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/sysinstall.h#27 integrate .. //depot/projects/hammer/usr.sbin/sysinstall/system.c#9 integrate Differences ... ==== //depot/projects/hammer/ObsoleteFiles.inc#28 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.96 2007/06/18 18:50:59 rafan Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.97 2007/06/25 05:06:52 rafan 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,12 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20070625: umapfs removal +OLD_FILES+=rescue/mount_umapfs +OLD_FILES+=sbin/mount_umapfs +OLD_FILES+=usr/include/fs/umapfs/umap.h +OLD_FILES+=usr/share/man/man8/mount_umapfs.8.gz +OLD_DIRS+=usr/include/fs/umapfs # 20070618: shared library version bump OLD_LIBS+=lib/libalias.so.5 OLD_LIBS+=lib/libbsnmp.so.3 ==== //depot/projects/hammer/contrib/ipfilter/tools/ipfstat.c#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/ipfilter/tools/ipfstat.c,v 1.5 2007/06/04 02:54:34 darrenr Exp $ */ +/* $FreeBSD: src/contrib/ipfilter/tools/ipfstat.c,v 1.6 2007/06/24 16:39:12 darrenr Exp $ */ /* * Copyright (C) 2002-2006 by Darren Reed. @@ -1811,7 +1811,7 @@ *port = -1; } else if (!sscanf(comma + 1, "%d", port) || (*port < 0) || (*port > 65535)) { - fprintf(stderr, "Invalid port specfication in %s\n", + fprintf(stderr, "Invalid port specification in %s\n", argument); free(s); exit(-2); @@ -1823,6 +1823,7 @@ /* get ip address */ if (!strcasecmp(s, "any")) { ip->in4.s_addr = INADDR_ANY; + ok = 1; #ifdef USE_INET6 ip->in6 = in6addr_any; } else if (use_inet6 && inet_pton(AF_INET6, s, &ip->in6)) { ==== //depot/projects/hammer/contrib/less/main.c#6 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/less/main.c,v 1.8 2007/06/21 10:39:24 delphij Exp $ */ +/* $FreeBSD: src/contrib/less/main.c,v 1.9 2007/06/23 15:28:00 delphij Exp $ */ /* * Copyright (C) 1984-2007 Mark Nudelman * @@ -59,6 +59,7 @@ extern int missing_cap; extern int know_dumb; extern int quit_if_one_screen; +extern int no_init; extern int pr_type; @@ -165,7 +166,7 @@ } if (less_is_more && get_quit_at_eof()) - quit_if_one_screen = TRUE; + no_init = quit_if_one_screen = TRUE; #if EDITOR editor = lgetenv("VISUAL"); ==== //depot/projects/hammer/contrib/less/screen.c#6 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/less/screen.c,v 1.7 2007/06/21 10:44:50 delphij Exp $ */ +/* $FreeBSD: src/contrib/less/screen.c,v 1.8 2007/06/23 15:28:00 delphij Exp $ */ /* * Copyright (C) 1984-2007 Mark Nudelman * @@ -228,8 +228,6 @@ extern int no_back_scroll; extern int swindow; extern int no_init; -extern int quit_at_eof; -extern int less_is_more; extern int no_keypad; extern int sigs; extern int wscroll; @@ -1211,19 +1209,11 @@ if (sc_e_keypad == NULL) sc_e_keypad = ""; - /* - * This loses for terminals with termcap entries with ti/te strings - * that switch to/from an alternate screen, and we're in quit_at_eof - * (eg, more(1)). - */ - if (!quit_at_eof && !less_is_more) { - sc_init = ltgetstr("ti", &sp); - sc_deinit = ltgetstr("te", &sp); - } - + sc_init = ltgetstr("ti", &sp); if (sc_init == NULL) sc_init = ""; + sc_deinit= ltgetstr("te", &sp); if (sc_deinit == NULL) sc_deinit = ""; ==== //depot/projects/hammer/etc/mtree/BSD.include.dist#44 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.114 2007/06/01 18:53:36 ru Exp $ +# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.115 2007/06/25 05:06:53 rafan Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -146,8 +146,6 @@ .. udf .. - umapfs - .. unionfs .. .. ==== //depot/projects/hammer/include/Makefile#62 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.270 2007/04/13 01:39:33 pjd Exp $ +# $FreeBSD: src/include/Makefile,v 1.271 2007/06/25 05:06:53 rafan Exp $ # # Doing a "make install" builds /usr/include. @@ -42,8 +42,7 @@ dev/ic dev/iicbus ${_dev_ieee488} dev/lmc dev/ofw \ dev/pbio ${_dev_powermac_nvram} dev/ppbus dev/smbus dev/speaker dev/usb dev/utopia dev/vkbd dev/wi \ fs/devfs fs/fdescfs fs/fifofs fs/msdosfs fs/ntfs fs/nullfs \ - ${_fs_nwfs} fs/portalfs fs/procfs fs/smbfs fs/udf fs/umapfs \ - fs/unionfs \ + ${_fs_nwfs} fs/portalfs fs/procfs fs/smbfs fs/udf fs/unionfs \ geom/cache geom/concat geom/eli geom/gate geom/journal geom/label \ geom/mirror geom/nop geom/raid3 geom/shsec geom/stripe \ netatm/ipatm netatm/sigpvc netatm/spans netatm/uni \ ==== //depot/projects/hammer/lib/libarchive/archive_read_open_fd.c#9 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_open_fd.c,v 1.12 2007/06/18 00:36:54 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_open_fd.c,v 1.13 2007/06/26 03:06:48 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include @@ -78,7 +78,8 @@ return (ARCHIVE_FATAL); } mine->fd = fd; - mine->can_skip = 1; + /* lseek() hardly ever works, so disable it by default. See below. */ + mine->can_skip = 0; return (archive_read_open2(a, mine, file_open, file_read, file_skip, file_close)); } @@ -93,8 +94,18 @@ return (ARCHIVE_FATAL); } - if (S_ISREG(st.st_mode)) + if (S_ISREG(st.st_mode)) { archive_read_extract_set_skip_file(a, st.st_dev, st.st_ino); + /* + * Enabling skip here is a performance optimization for + * anything that supports lseek(). On FreeBSD, only + * regular files and raw disk devices support lseek() and + * there's no portable way to determine if a device is + * a raw disk device, so we only enable this optimization + * for regular files. + */ + mine->can_skip = 1; + } return (ARCHIVE_OK); } ==== //depot/projects/hammer/lib/libarchive/archive_read_open_file.c#12 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_open_file.c,v 1.19 2007/01/09 08:05:55 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_open_file.c,v 1.20 2007/06/26 03:06:48 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include @@ -51,6 +51,7 @@ FILE *f; size_t block_size; void *buffer; + char can_skip; }; static int file_close(struct archive *, void *); @@ -80,6 +81,8 @@ return (ARCHIVE_FATAL); } mine->f = f; + /* Suppress skip by default. See below. */ + mine->can_skip = 0; return (archive_read_open2(a, mine, file_open, file_read, file_skip, file_close)); } @@ -95,8 +98,11 @@ * it's not a file. (FILE * objects can wrap many kinds * of I/O streams.) */ - if (fstat(fileno(mine->f), &st) == 0 && S_ISREG(st.st_mode)) + if (fstat(fileno(mine->f), &st) == 0 && S_ISREG(st.st_mode)) { archive_read_extract_set_skip_file(a, st.st_dev, st.st_ino); + /* Enable the seek optimization for regular files. */ + mine->can_skip = 1; + } return (ARCHIVE_OK); } @@ -125,21 +131,25 @@ { struct read_FILE_data *mine = (struct read_FILE_data *)client_data; + (void)a; /* UNUSED */ + /* - * Note: the 'fd' and 'filename' versions round the request - * down to a multiple of the block size to ensure proper - * operation on block-oriented media such as tapes. But stdio - * doesn't work with such media (it doesn't ensure blocking), - * so we don't need to bother. + * If we can't skip, return 0 as the amount we did step and + * the caller will work around by reading and discarding. */ + if (!mine->can_skip) + return (0); + if (request == 0) + return (0); + #if HAVE_FSEEKO if (fseeko(mine->f, request, SEEK_CUR) != 0) #else if (fseek(mine->f, request, SEEK_CUR) != 0) #endif { - archive_set_error(a, errno, "Error skipping forward"); - return (ARCHIVE_FATAL); + mine->can_skip = 0; + return (0); } return (request); } ==== //depot/projects/hammer/lib/libarchive/archive_read_open_filename.c#4 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_open_filename.c,v 1.19 2007/06/18 00:36:54 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_open_filename.c,v 1.20 2007/06/26 03:06:48 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include @@ -96,7 +96,8 @@ mine->block_size = block_size; mine->buffer = NULL; mine->fd = -1; - mine->can_skip = 1; + /* lseek() almost never works; disable it by default. See below. */ + mine->can_skip = 0; return (archive_read_open2(a, mine, file_open, file_read, file_skip, file_close)); } @@ -123,8 +124,19 @@ if (fstat(mine->fd, &st) == 0) { /* If we're reading a file from disk, ensure that we don't overwrite it with an extracted file. */ - if (S_ISREG(st.st_mode)) + if (S_ISREG(st.st_mode)) { archive_read_extract_set_skip_file(a, st.st_dev, st.st_ino); + /* + * Enabling skip here is a performance + * optimization for anything that supports + * lseek(). On FreeBSD, only regular files + * and raw disk devices support lseek() and + * there's no portable way to determine if a + * device is a raw disk device, so we only + * enable this optimization for regular files. + */ + mine->can_skip = 1; + } /* Remember mode so close can decide whether to flush. */ mine->st_mode = st.st_mode; } else { ==== //depot/projects/hammer/lib/libc/arm/sys/sbrk.S#3 (text+ko) ==== @@ -32,10 +32,10 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/arm/sys/sbrk.S,v 1.2 2004/11/09 16:49:14 cognet Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/arm/sys/sbrk.S,v 1.3 2007/06/27 02:45:37 kan Exp $"); #include "SYS.h" - .globl _C_LABEL(end) + .globl _C_LABEL(_end) #ifdef WEAK_ALIAS WEAK_ALIAS(sbrk, _sbrk) @@ -46,7 +46,7 @@ .globl CURBRK .type CURBRK,#object CURBRK: - .word _C_LABEL(end) + .word _C_LABEL(_end) /* * Change the data segment size ==== //depot/projects/hammer/lib/libc/net/sctp_sys_calls.c#6 (text+ko) ==== @@ -29,7 +29,7 @@ * SUCH DAMAGE. */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/sctp_sys_calls.c,v 1.9 2007/06/22 13:59:54 rrs Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/sctp_sys_calls.c,v 1.11 2007/06/26 02:07:47 mjacob Exp $"); #include #include #include @@ -185,10 +185,18 @@ /* validate all the addresses and get the size */ for (i = 0; i < addrcnt; i++) { if (at->sa_family == AF_INET) { + if (at->sa_len != sizeof(struct sockaddr_in)) { + errno = EINVAL; + return (-1); + } memcpy(cpto, at, at->sa_len); cpto = ((caddr_t)cpto + at->sa_len); len += at->sa_len; } else if (at->sa_family == AF_INET6) { + if (at->sa_len != sizeof(struct sockaddr_in6)) { + errno = EINVAL; + return (-1); + } if (IN6_IS_ADDR_V4MAPPED(&((struct sockaddr_in6 *)at)->sin6_addr)) { len += sizeof(struct sockaddr_in); in6_sin6_2_sin((struct sockaddr_in *)cpto, (struct sockaddr_in6 *)at); @@ -205,7 +213,8 @@ } if (len > (sizeof(buf) - sizeof(int))) { /* Never enough memory */ - return (E2BIG); + errno = E2BIG; + return (-1); } at = (struct sockaddr *)((caddr_t)at + at->sa_len); cnt++; @@ -231,7 +240,7 @@ { struct sctp_getaddresses *gaddrs; struct sockaddr *sa; - int i, sz, fam, argsz; + int i, sz, argsz; /* validate the flags */ if ((flags != SCTP_BINDX_ADD_ADDR) && @@ -251,23 +260,30 @@ errno = ENOMEM; return (-1); } - gaddrs->sget_assoc_id = 0; sa = addrs; for (i = 0; i < addrcnt; i++) { sz = sa->sa_len; - fam = sa->sa_family; - if ((fam != AF_INET) && (fam != AF_INET6)) { + if (sa->sa_family == AF_INET) { + if (sa->sa_len != sizeof(struct sockaddr_in)) + goto out_error; + } else if (sa->sa_family == AF_INET6) { + if (sa->sa_len != sizeof(struct sockaddr_in6)) + goto out_error; + } else { + /* invalid address family specified */ + out_error: free(gaddrs); errno = EINVAL; return (-1); } + memset(gaddrs, 0, argsz); + gaddrs->sget_assoc_id = 0; memcpy(gaddrs->addr, sa, sz); - if (setsockopt(sd, IPPROTO_SCTP, flags, - gaddrs, (socklen_t) argsz) != 0) { + if (setsockopt(sd, IPPROTO_SCTP, flags, gaddrs, + (socklen_t) argsz) != 0) { free(gaddrs); return (-1); } - memset(gaddrs, 0, argsz); sa = (struct sockaddr *)((caddr_t)sa + sz); } free(gaddrs); @@ -315,7 +331,6 @@ errno = ENOMEM; return (-1); } - memset(addrs, 0, siz); addrs->sget_assoc_id = id; /* Now lets get the array of addresses */ if (getsockopt(sd, IPPROTO_SCTP, SCTP_GET_PEER_ADDRESSES, @@ -380,7 +395,6 @@ errno = ENOMEM; return (-1); } - memset(addrs, 0, siz); addrs->sget_assoc_id = id; /* Now lets get the array of addresses */ if (getsockopt(sd, IPPROTO_SCTP, SCTP_GET_LOCAL_ADDRESSES, addrs, ==== //depot/projects/hammer/lib/libgssapi/gss_accept_sec_context.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libgssapi/gss_accept_sec_context.c,v 1.2 2007/04/04 02:40:59 kan Exp $ + * $FreeBSD: src/lib/libgssapi/gss_accept_sec_context.c,v 1.3 2007/06/30 07:47:45 dfr Exp $ */ #include @@ -48,7 +48,7 @@ OM_uint32 *time_rec, gss_cred_id_t *delegated_cred_handle) { - OM_uint32 major_status; + OM_uint32 major_status, mech_ret_flags; struct _gss_mech_switch *m; struct _gss_context *ctx = (struct _gss_context *) *context_handle; struct _gss_cred *cred = (struct _gss_cred *) acceptor_cred_handle; @@ -165,7 +165,7 @@ &src_mn, mech_type, output_token, - ret_flags, + &mech_ret_flags, time_rec, &delegated_mc); if (major_status != GSS_S_COMPLETE && @@ -187,7 +187,7 @@ *src_name = (gss_name_t) name; } - if (*ret_flags & GSS_C_DELEG_FLAG) { + if (mech_ret_flags & GSS_C_DELEG_FLAG) { if (!delegated_cred_handle) { m->gm_release_cred(minor_status, &delegated_mc); *ret_flags &= ~GSS_C_DELEG_FLAG; @@ -217,6 +217,8 @@ } } + if (ret_flags) + *ret_flags = mech_ret_flags; *context_handle = (gss_ctx_id_t) ctx; return (major_status); } ==== //depot/projects/hammer/lib/libgssapi/gss_display_status.c#2 (text+ko) ==== @@ -23,46 +23,122 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libgssapi/gss_display_status.c,v 1.1 2005/12/29 14:40:20 dfr Exp $ + * $FreeBSD: src/lib/libgssapi/gss_display_status.c,v 1.2 2007/06/30 07:47:45 dfr Exp $ + */ +/* + * Copyright (c) 1998 - 2005 Kungliga Tekniska Högskolan + * (Royal Institute of Technology, Stockholm, Sweden). + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * 3. Neither the name of the Institute nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. */ #include #include +#include #include "mech_switch.h" -struct _gss_status_desc { - OM_uint32 gs_status; - const char* gs_desc; -}; +static const char * +calling_error(OM_uint32 v) +{ + static const char *msgs[] = { + NULL, /* 0 */ + "A required input parameter could not be read.", /* */ + "A required output parameter could not be written.", /* */ + "A parameter was malformed" + }; + + v >>= GSS_C_CALLING_ERROR_OFFSET; + + if (v == 0) + return ""; + else if (v >= sizeof(msgs)/sizeof(*msgs)) + return "unknown calling error"; + else + return msgs[v]; +} + +static const char * +routine_error(OM_uint32 v) +{ + static const char *msgs[] = { + NULL, /* 0 */ + "An unsupported mechanism was requested", + "An invalid name was supplied", + "A supplied name was of an unsupported type", + "Incorrect channel bindings were supplied", + "An invalid status code was supplied", + "A token had an invalid MIC", + "No credentials were supplied, " + "or the credentials were unavailable or inaccessible.", + "No context has been established", + "A token was invalid", + "A credential was invalid", + "The referenced credentials have expired", + "The context has expired", + "Miscellaneous failure (see text)", + "The quality-of-protection requested could not be provide", + "The operation is forbidden by local security policy", + "The operation or option is not available", + "The requested credential element already exists", + "The provided name was not a mechanism name.", + }; + + v >>= GSS_C_ROUTINE_ERROR_OFFSET; + + if (v == 0) + return ""; + else if (v >= sizeof(msgs)/sizeof(*msgs)) + return "unknown routine error"; + else + return msgs[v]; +} + +static const char * +supplementary_error(OM_uint32 v) +{ + static const char *msgs[] = { + "normal completion", + "continuation call to routine required", + "duplicate per-message token detected", + "timed-out per-message token detected", + "reordered (early) per-message token detected", + "skipped predecessor token(s) detected" + }; -static struct _gss_status_desc _gss_status_descs[] = { - GSS_S_BAD_MECH, "An unsupported mechanism was requested", - GSS_S_BAD_NAME, "An invalid name was supplied", - GSS_S_BAD_NAMETYPE, "A supplied name was of an unsupported type", - GSS_S_BAD_BINDINGS, "Incorrect channel bindings were supplied", - GSS_S_BAD_STATUS, "An invalid status code was supplied", - GSS_S_BAD_MIC, "A token had an invalid MIC", - GSS_S_NO_CRED, "No credentials were supplied, or the " - "credentials were unavailable or inaccessible", - GSS_S_NO_CONTEXT, "No context has been established", - GSS_S_DEFECTIVE_TOKEN, "A token was invalid", - GSS_S_DEFECTIVE_CREDENTIAL, "A credential was invalid", - GSS_S_CREDENTIALS_EXPIRED, "The referenced credentials have expired", - GSS_S_CONTEXT_EXPIRED, "The context has expired", - GSS_S_FAILURE, "Miscellaneous failure", - GSS_S_BAD_QOP, "The quality-of-protection requested could " - "not be provided", - GSS_S_UNAUTHORIZED, "The operation is forbidden by local security " - "policy", - GSS_S_UNAVAILABLE, "The operation or option is unavailable", - GSS_S_DUPLICATE_ELEMENT, "The requested credential element already " - "exists", - GSS_S_NAME_NOT_MN, "The provided name was not a mechanism name" -}; -#define _gss_status_desc_count \ - sizeof(_gss_status_descs) / sizeof(_gss_status_descs[0]) + v >>= GSS_C_SUPPLEMENTARY_OFFSET; + if (v >= sizeof(msgs)/sizeof(*msgs)) + return "unknown routine error"; + else + return msgs[v]; +} OM_uint32 gss_display_status(OM_uint32 *minor_status, @@ -73,31 +149,29 @@ gss_buffer_t status_string) { OM_uint32 major_status; - struct _gss_mech_switch *m; - int i; - const char *message; *minor_status = 0; switch (status_type) { - case GSS_C_GSS_CODE: - for (i = 0; i < _gss_status_desc_count; i++) { - if (_gss_status_descs[i].gs_status == status_value) { - message = _gss_status_descs[i].gs_desc; - status_string->length = strlen(message); - status_string->value = strdup(message); - return (GSS_S_COMPLETE); - } - } + case GSS_C_GSS_CODE: { + char *buf; + + if (GSS_SUPPLEMENTARY_INFO(status_value)) + asprintf(&buf, "%s", supplementary_error( + GSS_SUPPLEMENTARY_INFO(status_value))); + else + asprintf (&buf, "%s %s", + calling_error(GSS_CALLING_ERROR(status_value)), + routine_error(GSS_ROUTINE_ERROR(status_value))); + + status_string->length = strlen(buf); + status_string->value = buf; - /* - * Fall through to attempt to get some underlying - * implementation to describe the value. - */ - case GSS_C_MECH_CODE: - SLIST_FOREACH(m, &_gss_mechs, gm_link) { - if (mech_type && - !_gss_oid_equal(&m->gm_mech_oid, mech_type)) - continue; + return GSS_S_COMPLETE; + } + case GSS_C_MECH_CODE: { + struct _gss_mech_switch *m; + m = _gss_find_mech_switch(mech_type); + if (m) { major_status = m->gm_display_status(minor_status, status_value, status_type, mech_type, message_content, status_string); @@ -105,6 +179,8 @@ return (GSS_S_COMPLETE); } } - + } + status_string->value = NULL; + status_string->length = 0; return (GSS_S_BAD_STATUS); } ==== //depot/projects/hammer/lib/libgssapi/gss_export_name.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/lib/libgssapi/gss_export_name.c,v 1.1 2005/12/29 14:40:20 dfr Exp $ + * $FreeBSD: src/lib/libgssapi/gss_export_name.c,v 1.2 2007/06/30 07:47:45 dfr Exp $ */ #include @@ -39,6 +39,9 @@ struct _gss_name *name = (struct _gss_name *) input_name; struct _gss_mechanism_name *mn; + exported_name->value = NULL; + exported_name->length = 0; + /* * If this name already has any attached MNs, export the first * one, otherwise export based on the first mechanism in our ==== //depot/projects/hammer/lib/libgssapi/gss_indicate_mechs.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/lib/libgssapi/gss_indicate_mechs.c,v 1.1 2005/12/29 14:40:20 dfr Exp $ + * $FreeBSD: src/lib/libgssapi/gss_indicate_mechs.c,v 1.2 2007/06/30 07:47:45 dfr Exp $ */ #include @@ -46,13 +46,18 @@ return (major_status); SLIST_FOREACH(m, &_gss_mechs, gm_link) { - major_status = m->gm_indicate_mechs(minor_status, &set); - if (major_status) - continue; - for (i = 0; i < set->count; i++) - major_status = gss_add_oid_set_member(minor_status, - &set->elements[i], mech_set); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Jun 30 22:13:16 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4F79B16A469; Sat, 30 Jun 2007 22:13:16 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 057AC16A421 for ; Sat, 30 Jun 2007 22:13:16 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id EA7AC13C45D for ; Sat, 30 Jun 2007 22:13:15 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5UMDFRS001052 for ; Sat, 30 Jun 2007 22:13:15 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5UMDFQm001049 for perforce@freebsd.org; Sat, 30 Jun 2007 22:13:15 GMT (envelope-from peter@freebsd.org) Date: Sat, 30 Jun 2007 22:13:15 GMT Message-Id: <200706302213.l5UMDFQm001049@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 122589 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Jun 2007 22:13:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=122589 Change 122589 by peter@peter_overcee on 2007/06/30 22:12:54 getosreldate(3) says that the prototype is in osreldate.h. It was missing and isn't actually anywhere. Add it. Affected files ... .. //depot/projects/hammer/include/Makefile#63 edit Differences ... ==== //depot/projects/hammer/include/Makefile#63 (text+ko) ==== @@ -99,11 +99,15 @@ PARAMFILE=${.CURDIR}/../sys/sys/param.h; \ . ${.CURDIR}/../sys/conf/newvers.sh; \ echo "$$COPYRIGHT" > osreldate.h; \ + echo "#include " >> osreldate.h echo "#ifdef _KERNEL" >> osreldate.h; \ echo "#error \" cannot be used in the kernel, use \"" >> osreldate.h; \ echo "#else" >> osreldate.h; \ echo "#undef __FreeBSD_version" >> osreldate.h; \ echo "#define __FreeBSD_version $$RELDATE" >> osreldate.h; \ + echo "__BEGIN_DECLS" >> osreldate.h + echo "extern int getosreldate(void);" >> osreldate.h + echo "__END_DECLS" >> osreldate.h echo "#endif" >> osreldate.h .for i in ${LHDRS} From owner-p4-projects@FreeBSD.ORG Sat Jun 30 22:24:31 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EA2B716A46D; Sat, 30 Jun 2007 22:24:30 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id BC56216A46B for ; Sat, 30 Jun 2007 22:24:30 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id AD18013C46E for ; Sat, 30 Jun 2007 22:24:30 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5UMOUvm002111 for ; Sat, 30 Jun 2007 22:24:30 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5UMOU6Q002106 for perforce@freebsd.org; Sat, 30 Jun 2007 22:24:30 GMT (envelope-from peter@freebsd.org) Date: Sat, 30 Jun 2007 22:24:30 GMT Message-Id: <200706302224.l5UMOU6Q002106@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 122590 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Jun 2007 22:24:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=122590 Change 122590 by peter@peter_overcee on 2007/06/30 22:24:23 Add a cache to getosreldate(3) Affected files ... .. //depot/projects/hammer/lib/libc/gen/getosreldate.c#5 edit Differences ... ==== //depot/projects/hammer/lib/libc/gen/getosreldate.c#5 (text+ko) ==== @@ -45,9 +45,11 @@ int mib[2]; size_t size; int value; - + static int osreldate = -1; char *temp; + if (osreldate != -1) + return (osreldate); mib[0] = CTL_KERN; mib[1] = KERN_OSRELDATE; size = sizeof value; @@ -55,5 +57,6 @@ return (-1); if ((temp = getenv("OSVERSION"))) value = atoi(temp); + osreldate = value; return (value); } From owner-p4-projects@FreeBSD.ORG Sat Jun 30 22:25:33 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1E0FB16A46B; Sat, 30 Jun 2007 22:25:33 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id F10EE16A41F for ; Sat, 30 Jun 2007 22:25:32 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id C984713C458 for ; Sat, 30 Jun 2007 22:25:32 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5UMPWkR002209 for ; Sat, 30 Jun 2007 22:25:32 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5UMPWZF002206 for perforce@freebsd.org; Sat, 30 Jun 2007 22:25:32 GMT (envelope-from peter@freebsd.org) Date: Sat, 30 Jun 2007 22:25:32 GMT Message-Id: <200706302225.l5UMPWZF002206@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 122591 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Jun 2007 22:25:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=122591 Change 122591 by peter@peter_overcee on 2007/06/30 22:25:09 bump osreldate to test for __new_mmap() etc Affected files ... .. //depot/projects/hammer/sys/sys/param.h#87 edit Differences ... ==== //depot/projects/hammer/sys/sys/param.h#87 (text+ko) ==== @@ -57,7 +57,7 @@ * is created, otherwise 1. */ #undef __FreeBSD_version -#define __FreeBSD_version 700048 /* Master, propagated to newvers */ +#define __FreeBSD_version 700049 /* Master, propagated to newvers */ #ifndef LOCORE #include From owner-p4-projects@FreeBSD.ORG Sat Jun 30 22:26:34 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AAC5616A46C; Sat, 30 Jun 2007 22:26:34 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8209E16A468 for ; Sat, 30 Jun 2007 22:26:34 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 725B913C457 for ; Sat, 30 Jun 2007 22:26:34 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5UMQY21002252 for ; Sat, 30 Jun 2007 22:26:34 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5UMQXfP002249 for perforce@freebsd.org; Sat, 30 Jun 2007 22:26:33 GMT (envelope-from peter@freebsd.org) Date: Sat, 30 Jun 2007 22:26:33 GMT Message-Id: <200706302226.l5UMQXfP002249@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 122592 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Jun 2007 22:26:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=122592 Change 122592 by peter@peter_overcee on 2007/06/30 22:25:38 Use getosreldate() to test for __new_* syscalls. Affected files ... .. //depot/projects/hammer/lib/libc/sys/ftruncate.c#3 edit .. //depot/projects/hammer/lib/libc/sys/lseek.c#3 edit .. //depot/projects/hammer/lib/libc/sys/mmap.c#4 edit .. //depot/projects/hammer/lib/libc/sys/pread.c#3 edit .. //depot/projects/hammer/lib/libc/sys/pwrite.c#3 edit .. //depot/projects/hammer/lib/libc/sys/truncate.c#3 edit Differences ... ==== //depot/projects/hammer/lib/libc/sys/ftruncate.c#3 (text+ko) ==== @@ -36,6 +36,7 @@ #include #include #include +#include /* * This function provides 64-bit offset padding that @@ -47,5 +48,8 @@ off_t length; { - return(__syscall((quad_t)SYS_ftruncate, fd, 0, length)); + if (getosreldate() >= 700049) + return(__new_ftruncate(fd, length)); + else + return(__syscall((quad_t)SYS_ftruncate, fd, 0, length)); } ==== //depot/projects/hammer/lib/libc/sys/lseek.c#3 (text+ko) ==== @@ -36,6 +36,7 @@ #include #include #include +#include /* * This function provides 64-bit offset padding that @@ -47,5 +48,9 @@ off_t offset; int whence; { - return(__syscall((quad_t)SYS_lseek, fd, 0, offset, whence)); + + if (getosreldate() >= 700049) + return(__new_lseek(fd, offset, whence)); + else + return(__syscall((quad_t)SYS_lseek, fd, 0, offset, whence)); } ==== //depot/projects/hammer/lib/libc/sys/mmap.c#4 (text+ko) ==== @@ -37,6 +37,7 @@ #include #include #include +#include /* * This function provides 64-bit offset padding that @@ -52,6 +53,10 @@ off_t offset; { - return ((void *)(intptr_t)__syscall((quad_t)SYS_mmap, addr, len, prot, - flags, fd, 0, offset)); + if (getosreldate() >= 700049) + return (__new_mmap(addr, len, prot, flags, fd, offset)); + else + + return ((void *)(intptr_t)__syscall((quad_t)SYS_mmap, addr, len, prot, + flags, fd, 0, offset)); } ==== //depot/projects/hammer/lib/libc/sys/pread.c#3 (text+ko) ==== @@ -36,6 +36,7 @@ #include #include #include +#include /* * This function provides 64-bit offset padding that @@ -48,5 +49,9 @@ size_t nbyte; off_t offset; { - return ((ssize_t)__syscall((quad_t)SYS_pread, fd, buf, nbyte, 0, offset)); + + if (getosreldate() >= 700049) + return (__new_pread(fd, buf, nbyte, offset)); + else + return ((ssize_t)__syscall((quad_t)SYS_pread, fd, buf, nbyte, 0, offset)); } ==== //depot/projects/hammer/lib/libc/sys/pwrite.c#3 (text+ko) ==== @@ -36,6 +36,7 @@ #include #include #include +#include /* * This function provides 64-bit offset padding that @@ -48,5 +49,8 @@ size_t nbyte; off_t offset; { - return ((ssize_t)__syscall((quad_t)SYS_pwrite, fd, buf, nbyte, 0, offset)); + if (getosreldate() >= 700049) + return (__new_pwrite(fd, buf, nbyte, offset)); + else + return ((ssize_t)__syscall((quad_t)SYS_pwrite, fd, buf, nbyte, 0, offset)); } ==== //depot/projects/hammer/lib/libc/sys/truncate.c#3 (text+ko) ==== @@ -35,8 +35,8 @@ #include #include - #include +#include /* * This function provides 64-bit offset padding that @@ -48,5 +48,8 @@ off_t length; { - return(__syscall((quad_t)SYS_truncate, path, 0, length)); + if (getosreldate() >= 700049) + return(__new_truncate(path, length)); + else + return(__syscall((quad_t)SYS_truncate, path, 0, length)); } From owner-p4-projects@FreeBSD.ORG Sat Jun 30 22:27:36 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A9CA416A469; Sat, 30 Jun 2007 22:27:36 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6CA0E16A468 for ; Sat, 30 Jun 2007 22:27:36 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 5D4DA13C4BE for ; Sat, 30 Jun 2007 22:27:36 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5UMRaN7002323 for ; Sat, 30 Jun 2007 22:27:36 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5UMRZHZ002320 for perforce@freebsd.org; Sat, 30 Jun 2007 22:27:35 GMT (envelope-from peter@freebsd.org) Date: Sat, 30 Jun 2007 22:27:35 GMT Message-Id: <200706302227.l5UMRZHZ002320@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 122593 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Jun 2007 22:27:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=122593 Change 122593 by peter@peter_overcee on 2007/06/30 22:27:01 I may remove this later depending on whether it turns out safe to use getosreldate() or not. A caching lookup of kern.osreldate that ignores $OSVERSION. Affected files ... .. //depot/projects/hammer/lib/libc/gen/Makefile.inc#28 edit .. //depot/projects/hammer/lib/libc/gen/__getosreldate.c#1 add .. //depot/projects/hammer/lib/libc/include/libc_private.h#10 edit Differences ... ==== //depot/projects/hammer/lib/libc/gen/Makefile.inc#28 (text+ko) ==== @@ -4,7 +4,8 @@ # machine-independent gen sources .PATH: ${.CURDIR}/${MACHINE_ARCH}/gen ${.CURDIR}/gen -SRCS+= __xuname.c _pthread_stubs.c _rand48.c _spinlock_stub.c _thread_init.c \ +SRCS+= __getosreldate.c __xuname.c \ + _pthread_stubs.c _rand48.c _spinlock_stub.c _thread_init.c \ alarm.c arc4random.c assert.c basename.c check_utility_compat.c \ clock.c closedir.c confstr.c \ crypt.c ctermid.c daemon.c devname.c dirname.c disklabel.c \ ==== //depot/projects/hammer/lib/libc/include/libc_private.h#10 (text+ko) ==== @@ -169,4 +169,10 @@ */ extern void (*__cleanup)(void); +/* + * Get kern.osreldate to detect ABI revisions. Explicitly + * ignores value of $OSVERSION and caches result. + */ +extern int __getosreldate(void); + #endif /* _LIBC_PRIVATE_H_ */ From owner-p4-projects@FreeBSD.ORG Sat Jun 30 22:40:54 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B5F6E16A477; Sat, 30 Jun 2007 22:40:53 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6729B16A400 for ; Sat, 30 Jun 2007 22:40:53 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 517F213C44C for ; Sat, 30 Jun 2007 22:40:53 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5UMerNm004226 for ; Sat, 30 Jun 2007 22:40:53 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5UMeq78004215 for perforce@freebsd.org; Sat, 30 Jun 2007 22:40:52 GMT (envelope-from peter@freebsd.org) Date: Sat, 30 Jun 2007 22:40:52 GMT Message-Id: <200706302240.l5UMeq78004215@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 122594 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Jun 2007 22:40:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=122594 Change 122594 by peter@peter_melody on 2007/06/30 22:40:20 Fix install location of ldd32 and gcore32 Affected files ... .. //depot/projects/hammer/Makefile.inc1#124 edit Differences ... ==== //depot/projects/hammer/Makefile.inc1#124 (text+ko) ==== @@ -480,8 +480,8 @@ cd ${.CURDIR}/secure/lib; ${LIB32IMAKE} ${.TARGET:S/32$//} .endif cd ${.CURDIR}/libexec/rtld-elf; PROG=ld-elf32.so.1 ${LIB32IMAKE} ${.TARGET:S/32$//} - cd ${.CURDIR}/usr.bin/ldd; PROG=ldd32 ${LIB32WMAKE} ${.TARGET:S/32$//} - cd ${.CURDIR}/usr.bin/gcore; PROG=gcore32 ${LIB32WMAKE} ${.TARGET:S/32$//} + cd ${.CURDIR}/usr.bin/ldd; PROG=ldd32 ${LIB32IMAKE} ${.TARGET:S/32$//} + cd ${.CURDIR}/usr.bin/gcore; PROG=gcore32 ${LIB32IMAKE} ${.TARGET:S/32$//} .endif From owner-p4-projects@FreeBSD.ORG Sat Jun 30 23:46:15 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D0EBE16A46E; Sat, 30 Jun 2007 23:46:14 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 76B3716A46C for ; Sat, 30 Jun 2007 23:46:14 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6653913C4CE for ; Sat, 30 Jun 2007 23:46:14 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5UNkEb8012469 for ; Sat, 30 Jun 2007 23:46:14 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5UNkEn8012466 for perforce@freebsd.org; Sat, 30 Jun 2007 23:46:14 GMT (envelope-from peter@freebsd.org) Date: Sat, 30 Jun 2007 23:46:14 GMT Message-Id: <200706302346.l5UNkEn8012466@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 122595 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Jun 2007 23:46:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=122595 Change 122595 by peter@peter_overcee on 2007/06/30 23:45:14 Oops. Can't use getenv() in super-early ld-elf.so.1 startup. KABLAM! Switch back to __getosreldate() like I originally intended. While here, add the missing prototypes. I hope the types are in scope... (compile untested) Affected files ... .. //depot/projects/hammer/lib/libc/include/libc_private.h#11 edit .. //depot/projects/hammer/lib/libc/sys/ftruncate.c#4 edit .. //depot/projects/hammer/lib/libc/sys/lseek.c#4 edit .. //depot/projects/hammer/lib/libc/sys/mmap.c#5 edit .. //depot/projects/hammer/lib/libc/sys/pread.c#4 edit .. //depot/projects/hammer/lib/libc/sys/pwrite.c#4 edit .. //depot/projects/hammer/lib/libc/sys/truncate.c#4 edit Differences ... ==== //depot/projects/hammer/lib/libc/include/libc_private.h#11 (text+ko) ==== @@ -171,8 +171,15 @@ /* * Get kern.osreldate to detect ABI revisions. Explicitly - * ignores value of $OSVERSION and caches result. + * ignores value of $OSVERSION and caches result. Prototypes + * for the wrapped "new" pad-less syscalls are here for now. */ extern int __getosreldate(void); +extern off_t __new_lseek(int, off_t, int); +extern int __new_ftruncate(int, off_t); +extern int __new_truncate(const char *, off_t); +extern ssize_t __new_pread(int, void *, size_t, off_t); +extern ssize_t __new_pwrite(int, void *, size_t, off_t); +extern void * __new_mmap(void *, size_t, int, int, int, off_t); #endif /* _LIBC_PRIVATE_H_ */ ==== //depot/projects/hammer/lib/libc/sys/ftruncate.c#4 (text+ko) ==== @@ -36,7 +36,7 @@ #include #include #include -#include +#include "libc-private.h" /* * This function provides 64-bit offset padding that @@ -48,7 +48,7 @@ off_t length; { - if (getosreldate() >= 700049) + if (__getosreldate() >= 700049) return(__new_ftruncate(fd, length)); else return(__syscall((quad_t)SYS_ftruncate, fd, 0, length)); ==== //depot/projects/hammer/lib/libc/sys/lseek.c#4 (text+ko) ==== @@ -36,7 +36,7 @@ #include #include #include -#include +#include "libc-private.h" /* * This function provides 64-bit offset padding that @@ -49,7 +49,7 @@ int whence; { - if (getosreldate() >= 700049) + if (__getosreldate() >= 700049) return(__new_lseek(fd, offset, whence)); else return(__syscall((quad_t)SYS_lseek, fd, 0, offset, whence)); ==== //depot/projects/hammer/lib/libc/sys/mmap.c#5 (text+ko) ==== @@ -37,7 +37,7 @@ #include #include #include -#include +#include "libc-private.h" /* * This function provides 64-bit offset padding that @@ -53,7 +53,7 @@ off_t offset; { - if (getosreldate() >= 700049) + if (__getosreldate() >= 700049) return (__new_mmap(addr, len, prot, flags, fd, offset)); else ==== //depot/projects/hammer/lib/libc/sys/pread.c#4 (text+ko) ==== @@ -36,7 +36,7 @@ #include #include #include -#include +#include "libc-private.h" /* * This function provides 64-bit offset padding that @@ -50,7 +50,7 @@ off_t offset; { - if (getosreldate() >= 700049) + if (__getosreldate() >= 700049) return (__new_pread(fd, buf, nbyte, offset)); else return ((ssize_t)__syscall((quad_t)SYS_pread, fd, buf, nbyte, 0, offset)); ==== //depot/projects/hammer/lib/libc/sys/pwrite.c#4 (text+ko) ==== @@ -36,7 +36,7 @@ #include #include #include -#include +#include "libc-private.h" /* * This function provides 64-bit offset padding that @@ -49,7 +49,7 @@ size_t nbyte; off_t offset; { - if (getosreldate() >= 700049) + if (__getosreldate() >= 700049) return (__new_pwrite(fd, buf, nbyte, offset)); else return ((ssize_t)__syscall((quad_t)SYS_pwrite, fd, buf, nbyte, 0, offset)); ==== //depot/projects/hammer/lib/libc/sys/truncate.c#4 (text+ko) ==== @@ -36,7 +36,7 @@ #include #include #include -#include +#include "libc-private.h" /* * This function provides 64-bit offset padding that @@ -48,7 +48,7 @@ off_t length; { - if (getosreldate() >= 700049) + if (__getosreldate() >= 700049) return(__new_truncate(path, length)); else return(__syscall((quad_t)SYS_truncate, path, 0, length)); From owner-p4-projects@FreeBSD.ORG Sat Jun 30 23:49:19 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 61B5616A46C; Sat, 30 Jun 2007 23:49:19 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2623E16A400 for ; Sat, 30 Jun 2007 23:49:19 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 16A0813C44C for ; Sat, 30 Jun 2007 23:49:19 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5UNnIDC012590 for ; Sat, 30 Jun 2007 23:49:18 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5UNnI60012587 for perforce@freebsd.org; Sat, 30 Jun 2007 23:49:18 GMT (envelope-from peter@freebsd.org) Date: Sat, 30 Jun 2007 23:49:18 GMT Message-Id: <200706302349.l5UNnI60012587@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 122596 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Jun 2007 23:49:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=122596 Change 122596 by peter@peter_melody on 2007/06/30 23:48:50 Use "special" types Affected files ... .. //depot/projects/hammer/lib/libc/include/libc_private.h#12 edit Differences ... ==== //depot/projects/hammer/lib/libc/include/libc_private.h#12 (text+ko) ==== @@ -175,11 +175,11 @@ * for the wrapped "new" pad-less syscalls are here for now. */ extern int __getosreldate(void); -extern off_t __new_lseek(int, off_t, int); -extern int __new_ftruncate(int, off_t); -extern int __new_truncate(const char *, off_t); -extern ssize_t __new_pread(int, void *, size_t, off_t); -extern ssize_t __new_pwrite(int, void *, size_t, off_t); -extern void * __new_mmap(void *, size_t, int, int, int, off_t); +extern __off_t __new_lseek(int, __off_t, int); +extern int __new_ftruncate(int, __off_t); +extern int __new_truncate(const char *, __off_t); +extern __ssize_t __new_pread(int, void *, __size_t, __off_t); +extern __ssize_t __new_pwrite(int, void *, __size_t, __off_t); +extern void * __new_mmap(void *, __size_t, int, int, int, __off_t); #endif /* _LIBC_PRIVATE_H_ */ From owner-p4-projects@FreeBSD.ORG Sat Jun 30 23:50:21 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3CB1B16A468; Sat, 30 Jun 2007 23:50:21 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 027BB16A41F for ; Sat, 30 Jun 2007 23:50:21 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id E700513C48A for ; Sat, 30 Jun 2007 23:50:20 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5UNoKqn012729 for ; Sat, 30 Jun 2007 23:50:20 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5UNoK3P012726 for perforce@freebsd.org; Sat, 30 Jun 2007 23:50:20 GMT (envelope-from peter@freebsd.org) Date: Sat, 30 Jun 2007 23:50:20 GMT Message-Id: <200706302350.l5UNoK3P012726@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 122597 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Jun 2007 23:50:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=122597 Change 122597 by peter@peter_overcee on 2007/06/30 23:50:01 Spell libc_private.h correctly. Affected files ... .. //depot/projects/hammer/lib/libc/sys/ftruncate.c#5 edit .. //depot/projects/hammer/lib/libc/sys/lseek.c#5 edit .. //depot/projects/hammer/lib/libc/sys/mmap.c#6 edit .. //depot/projects/hammer/lib/libc/sys/pread.c#5 edit .. //depot/projects/hammer/lib/libc/sys/pwrite.c#5 edit .. //depot/projects/hammer/lib/libc/sys/truncate.c#5 edit Differences ... ==== //depot/projects/hammer/lib/libc/sys/ftruncate.c#5 (text+ko) ==== @@ -36,7 +36,7 @@ #include #include #include -#include "libc-private.h" +#include "libc_private.h" /* * This function provides 64-bit offset padding that ==== //depot/projects/hammer/lib/libc/sys/lseek.c#5 (text+ko) ==== @@ -36,7 +36,7 @@ #include #include #include -#include "libc-private.h" +#include "libc_private.h" /* * This function provides 64-bit offset padding that ==== //depot/projects/hammer/lib/libc/sys/mmap.c#6 (text+ko) ==== @@ -37,7 +37,7 @@ #include #include #include -#include "libc-private.h" +#include "libc_private.h" /* * This function provides 64-bit offset padding that ==== //depot/projects/hammer/lib/libc/sys/pread.c#5 (text+ko) ==== @@ -36,7 +36,7 @@ #include #include #include -#include "libc-private.h" +#include "libc_private.h" /* * This function provides 64-bit offset padding that ==== //depot/projects/hammer/lib/libc/sys/pwrite.c#5 (text+ko) ==== @@ -36,7 +36,7 @@ #include #include #include -#include "libc-private.h" +#include "libc_private.h" /* * This function provides 64-bit offset padding that ==== //depot/projects/hammer/lib/libc/sys/truncate.c#5 (text+ko) ==== @@ -36,7 +36,7 @@ #include #include #include -#include "libc-private.h" +#include "libc_private.h" /* * This function provides 64-bit offset padding that From owner-p4-projects@FreeBSD.ORG Sat Jun 30 23:54:28 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6062B16A41F; Sat, 30 Jun 2007 23:54:28 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1351316A474 for ; Sat, 30 Jun 2007 23:54:28 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id DF92513C4C6 for ; Sat, 30 Jun 2007 23:54:27 +0000 (UTC) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5UNsRhr013125 for ; Sat, 30 Jun 2007 23:54:27 GMT (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5UNsR5b013121 for perforce@freebsd.org; Sat, 30 Jun 2007 23:54:27 GMT (envelope-from peter@freebsd.org) Date: Sat, 30 Jun 2007 23:54:27 GMT Message-Id: <200706302354.l5UNsR5b013121@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 122598 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Jun 2007 23:54:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=122598 Change 122598 by peter@peter_overcee on 2007/06/30 23:53:28 hack. malloc.c doesn't have _types.h in scope somehow. Affected files ... .. //depot/projects/hammer/lib/libc/include/libc_private.h#13 edit Differences ... ==== //depot/projects/hammer/lib/libc/include/libc_private.h#13 (text+ko) ==== @@ -175,6 +175,7 @@ * for the wrapped "new" pad-less syscalls are here for now. */ extern int __getosreldate(void); +#include extern __off_t __new_lseek(int, __off_t, int); extern int __new_ftruncate(int, __off_t); extern int __new_truncate(const char *, __off_t);