From owner-p4-projects@FreeBSD.ORG Sun Dec 20 14:43:40 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 040231065670; Sun, 20 Dec 2009 14:43:40 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 954C3106568F for ; Sun, 20 Dec 2009 14:43:39 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 825808FC1E for ; Sun, 20 Dec 2009 14:43:39 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nBKEhdfs093390 for ; Sun, 20 Dec 2009 14:43:39 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nBKEhdxK093388 for perforce@freebsd.org; Sun, 20 Dec 2009 14:43:39 GMT (envelope-from trasz@freebsd.org) Date: Sun, 20 Dec 2009 14:43:39 GMT Message-Id: <200912201443.nBKEhdxK093388@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 171981 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Dec 2009 14:43:40 -0000 http://p4web.freebsd.org/chv.cgi?CH=171981 Change 171981 by trasz@trasz_victim on 2009/12/20 14:43:21 NFSv4 is generally spelled with 'v', so s/nfs4acls/nfsv4acls/. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/sbin/dumpfs/dumpfs.c#5 edit .. //depot/projects/soc2008/trasz_nfs4acl/sbin/mount/mntopts.h#3 edit .. //depot/projects/soc2008/trasz_nfs4acl/sbin/mount/mount.8#10 edit .. //depot/projects/soc2008/trasz_nfs4acl/sbin/mount/mount.c#11 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ffs/ffs_vfsops.c#26 edit .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/02.t#6 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/sbin/dumpfs/dumpfs.c#5 (text+ko) ==== @@ -252,7 +252,7 @@ if (fsflags & FS_FLAGS_UPDATED) printf("fs_flags expanded "); if (fsflags & FS_NFS4ACLS) - printf("nfs4acls "); + printf("nfsv4acls "); fsflags &= ~(FS_UNCLEAN | FS_DOSOFTDEP | FS_NEEDSFSCK | FS_INDEXDIRS | FS_ACLS | FS_MULTILABEL | FS_GJOURNAL | FS_FLAGS_UPDATED | FS_NFS4ACLS); ==== //depot/projects/soc2008/trasz_nfs4acl/sbin/mount/mntopts.h#3 (text+ko) ==== @@ -54,7 +54,7 @@ #define MOPT_SNAPSHOT { "snapshot", 0, MNT_SNAPSHOT, 0 } #define MOPT_MULTILABEL { "multilabel", 0, MNT_MULTILABEL, 0 } #define MOPT_ACLS { "acls", 0, MNT_ACLS, 0 } -#define MOPT_NFS4ACLS { "nfs4acls", 0, MNT_NFS4ACLS, 0 } +#define MOPT_NFS4ACLS { "nfsv4acls", 0, MNT_NFS4ACLS, 0 } /* Control flags. */ #define MOPT_FORCE { "force", 0, MNT_FORCE, 0 } ==== //depot/projects/soc2008/trasz_nfs4acl/sbin/mount/mount.8#10 (text+ko) ==== @@ -126,7 +126,7 @@ .Xr getfacl 1 commands. This flag is mutually exclusive with -.Cm nfs4acls +.Cm nfsv4acls flag. .It Cm async All @@ -189,7 +189,7 @@ .Xr mac 4 for more information, which cause the multilabel mount flag to be set automatically at mount-time. -.It Cm nfs4acls +.It Cm nfsv4acls Enable NFSv4 ACLs, which can be customized via the .Xr setfacl 1 and ==== //depot/projects/soc2008/trasz_nfs4acl/sbin/mount/mount.c#11 (text+ko) ==== @@ -111,7 +111,7 @@ { MNT_SOFTDEP, "soft-updates" }, { MNT_MULTILABEL, "multilabel" }, { MNT_ACLS, "acls" }, - { MNT_NFS4ACLS, "nfs4acls" }, + { MNT_NFS4ACLS, "nfsv4acls" }, { MNT_GJOURNAL, "gjournal" }, { 0, NULL } }; @@ -919,7 +919,7 @@ if (flags & MNT_SUIDDIR) res = catopt(res, "suiddir"); if (flags & MNT_MULTILABEL) res = catopt(res, "multilabel"); if (flags & MNT_ACLS) res = catopt(res, "acls"); - if (flags & MNT_NFS4ACLS) res = catopt(res, "nfs4acls"); + if (flags & MNT_NFS4ACLS) res = catopt(res, "nfsv4acls"); return (res); } ==== //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ffs/ffs_vfsops.c#26 (text+ko) ==== @@ -128,7 +128,7 @@ static const char *ffs_opts[] = { "acls", "async", "noatime", "noclusterr", "noclusterw", "noexec", "export", "force", "from", "multilabel", "snapshot", "nosuid", "suiddir", "nosymfollow", "sync", - "union", "nfs4acls", NULL }; + "union", "nfsv4acls", NULL }; static int ffs_mount(struct mount *mp) @@ -177,9 +177,9 @@ vfs_deleteopt(mp->mnt_opt, "snapshot"); } - if (vfs_getopt(mp->mnt_optnew, "nfs4acls", NULL, NULL) == 0) { + if (vfs_getopt(mp->mnt_optnew, "nfsv4acls", NULL, NULL) == 0) { if (mntorflags & MNT_ACLS) { - printf("WARNING: \"acls\" and \"nfs4acls\" " + printf("WARNING: \"acls\" and \"nfsv4acls\" " "options are mutually exclusive\n"); return (EINVAL); } @@ -853,7 +853,7 @@ if (mp->mnt_flag & MNT_NFS4ACLS) printf("WARNING: ACLs flag on fs conflicts with " - "\"nfs4acls\" mount option; option ignored\n"); + "\"nfsv4acls\" mount option; option ignored\n"); mp->mnt_flag &= ~MNT_NFS4ACLS; mp->mnt_flag |= MNT_ACLS; ==== //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/02.t#6 (text+ko) ==== @@ -23,7 +23,7 @@ MD=`mdconfig -at swap -s 10m` MNT=`mktemp -dt acltools` newfs /dev/$MD > /dev/null -mount -o nfs4acls /dev/$MD $MNT +mount -o nfsv4acls /dev/$MD $MNT if [ $? -ne 0 ]; then echo "not ok 1 - mount failed." exit 1 From owner-p4-projects@FreeBSD.ORG Sun Dec 20 17:19:16 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0A6C81065676; Sun, 20 Dec 2009 17:19:16 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C269B106566B for ; Sun, 20 Dec 2009 17:19:15 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AF4048FC14 for ; Sun, 20 Dec 2009 17:19:15 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nBKHJFto018187 for ; Sun, 20 Dec 2009 17:19:15 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nBKHJFWN018185 for perforce@freebsd.org; Sun, 20 Dec 2009 17:19:15 GMT (envelope-from rene@FreeBSD.org) Date: Sun, 20 Dec 2009 17:19:15 GMT Message-Id: <200912201719.nBKHJFWN018185@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 171986 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Dec 2009 17:19:16 -0000 http://p4web.freebsd.org/chv.cgi?CH=171986 Change 171986 by rene@rene_self on 2009/12/20 17:18:14 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#23 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#62 integrate .. //depot/projects/docproj_nl/www/en/releases/8.0R/errata.html#2 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml#23 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -363,7 +363,8 @@ (pserver (use cvs login and enter any password when prompted), ssh (no password)) - SSH2 HostKey: 1024 e8:3b:29:7b:ca:9f:ac:e9:45:cb:c8:17:ae:9b:eb:55 /etc/ssh/ssh_host_dsa_key.pub + SSH2 HostKey: 1024 02:ed:1b:17:d6:97:2b:58:5e:5c:e2:da:3b:89:88:26 /etc/ssh/ssh_host_rsa_key.pub +SSH2 HostKey: 1024 e8:3b:29:7b:ca:9f:ac:e9:45:cb:c8:17:ae:9b:eb:55 /etc/ssh/ssh_host_dsa_key.pub ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/porters-handbook/book.sgml#62 (text+ko) ==== @@ -1,7 +1,7 @@ 9.0-CURRENT after addition of libulog and its libutempter compatibility interface. + + 900005 + December 12, 2009 + 9.0-CURRENT after addition of + sleepq_sleepcnt(), which can be used to + query the number of waiters on a specific waiting queue. + ==== //depot/projects/docproj_nl/www/en/releases/8.0R/errata.html#2 (text+ko) ==== @@ -16,12 +16,10 @@

The FreeBSD Project

- + -

$FreeBSD: -release/8.0.0/release/doc/en_US.ISO8859-1/errata/article.sgml 145264 2005-04-19 09:42:25Z -hrs $
+

$FreeBSD: stable/8/release/doc/en_US.ISO8859-1/errata/article.sgml +200588 2009-12-15 20:47:51Z delphij $

@@ -45,7 +43,7 @@
-
+

This document lists errata items for FreeBSD 8.0-RELEASE, containing significant information discovered after the release or too late in the release cycle to be otherwise included in the release documentation. This information includes security advisories, as @@ -75,8 +73,8 @@ target="_top">http://www.FreeBSD.org/releases/, plus any sites which keep up-to-date mirrors of this location.

-

Source and binary snapshots of FreeBSD 8.0-STABLE also contain up-to-date copies of -this document (as of the time of the snapshot).

+

Source and binary snapshots of FreeBSD 8-STABLE also contain up-to-date copies of this +document (as of the time of the snapshot).

For a list of all FreeBSD CERT security advisories, see

2 Security Advisories

-

No advisories.

+

The following security advisories pertain to FreeBSD 8.0-RELEASE. For more +information, consult the individual advisories available from http://security.FreeBSD.org/.

+ +
+ ++++ + + + + + + + + + + + + + + + + + + + + + + + + + + +
AdvisoryDateTopic
SA-09:17.freebsd-update03 December 2009 +

Inappropriate directory permissions in freebsd-update(8)

+
SA-09:16.rtld03 December 2009 +

Improper environment sanitization in rtld(1)

+
SA-09:15.ssl03 December 2009 +

SSL protocol flaw

+
+
@@ -101,7 +145,8 @@ @@ -109,8 +154,7 @@

This file, and other release-related documents, can be -downloaded from http://www.FreeBSD.org/.

+downloaded from ftp://ftp.FreeBSD.org/.

For questions about FreeBSD, read the documentation before contacting < Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6F3921065679; Sun, 20 Dec 2009 17:37:34 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 33966106566C for ; Sun, 20 Dec 2009 17:37:34 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 21AC08FC0C for ; Sun, 20 Dec 2009 17:37:34 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nBKHbYrO019578 for ; Sun, 20 Dec 2009 17:37:34 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nBKHbYAo019576 for perforce@freebsd.org; Sun, 20 Dec 2009 17:37:34 GMT (envelope-from rene@FreeBSD.org) Date: Sun, 20 Dec 2009 17:37:34 GMT Message-Id: <200912201737.nBKHbYAo019576@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 171987 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 20 Dec 2009 17:37:34 -0000 http://p4web.freebsd.org/chv.cgi?CH=171987 Change 171987 by rene@rene_self on 2009/12/20 17:36:49 MFen handbook/mirrors 1.473 -> 1.474 Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml#40 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mirrors/chapter.sgml#40 (text+ko) ==== @@ -5,7 +5,7 @@ Vertaald door: Siebrand Mazeland / Rene Ladan %SOURCE% en_US.ISO8859-1/books/handbook/mirrors/chapter.sgml - %SRCID% 1.473 + %SRCID% 1.474 --> @@ -386,7 +386,8 @@ vul een willekeurig wachtwoord in wanneer daarom gevraagd wordt), ssh (geen wachtwoord)) - SSH2 HostKey: 1024 e8:3b:29:7b:ca:9f:ac:e9:45:cb:c8:17:ae:9b:eb:55 /etc/ssh/ssh_host_dsa_key.pub + SSH2 HostKey: 1024 02:ed:1b:17:d6:97:2b:58:5e:5c:e2:da:3b:89:88:26 /etc/ssh/ssh_host_rsa_key.pub +SSH2 HostKey: 1024 e8:3b:29:7b:ca:9f:ac:e9:45:cb:c8:17:ae:9b:eb:55 /etc/ssh/ssh_host_dsa_key.pub From owner-p4-projects@FreeBSD.ORG Mon Dec 21 13:30:37 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 270291065670; Mon, 21 Dec 2009 13:30:37 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DE5ED106566B for ; Mon, 21 Dec 2009 13:30:36 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CA31D8FC12 for ; Mon, 21 Dec 2009 13:30:36 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nBLDUaGb018454 for ; Mon, 21 Dec 2009 13:30:36 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nBLDURmV018445 for perforce@freebsd.org; Mon, 21 Dec 2009 13:30:27 GMT (envelope-from mav@freebsd.org) Date: Mon, 21 Dec 2009 13:30:27 GMT Message-Id: <200912211330.nBLDURmV018445@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 172008 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Dec 2009 13:30:37 -0000 http://p4web.freebsd.org/chv.cgi?CH=172008 Change 172008 by mav@mav_mavbook on 2009/12/21 13:30:14 IFC Affected files ... .. //depot/projects/scottl-camlock/src/Makefile.inc1#11 integrate .. //depot/projects/scottl-camlock/src/UPDATING#24 integrate .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/zdb/zdb_il.c#2 integrate .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c#2 integrate .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h#2 integrate .. //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c#3 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/COPYRIGHT#3 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/ChangeLog#3 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/CommitLog#2 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/Makefile.in#3 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/NEWS#3 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/README#3 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/README.bk#3 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/README.patches#3 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/WHERE-TO-START#3 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/aclocal.m4#3 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/adjtimed/Makefile.in#3 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/arlib/Makefile.in#3 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/arlib/aclocal.m4#3 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/arlib/configure#3 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/build#3 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/clockstuff/Makefile.in#3 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/config.h.in#3 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/configure#3 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/configure.ac#2 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/flock-build#3 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/html/build/hints/solaris.xtra.4095849#1 branch .. //depot/projects/scottl-camlock/src/contrib/ntp/html/copyright.html#3 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/html/drivers/driver40.html#3 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/include/Makefile.in#3 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/include/copyright.def#2 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/include/isc/Makefile.in#3 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/include/ntp_debug.h#2 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/include/version.def#2 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/kernel/Makefile.in#3 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/kernel/sys/Makefile.in#3 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/libntp/Makefile.in#3 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/libopts/Makefile.in#2 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/libparse/Makefile.am#3 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/libparse/Makefile.in#3 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/libparse/clk_rawdcf.c#3 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/ntpd/Makefile.in#3 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/ntpd/cmd_args.c#3 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/ntpd/ntp_crypto.c#4 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/ntpd/ntp_intres.c#3 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/ntpd/ntp_io.c#4 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/ntpd/ntp_request.c#3 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/ntpd/ntp_timer.c#3 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/ntpd/ntpd-opts.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/ntpd/ntpd-opts.h#2 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/ntpd/ntpd-opts.texi#2 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/ntpd/ntpd.1#2 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/ntpd/ntpd.c#3 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/ntpd/ntpdsim-opts.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/ntpd/ntpdsim-opts.h#2 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/ntpd/ntpdsim-opts.texi#2 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/ntpd/ntpdsim.1#2 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/ntpd/refclock_dumbclock.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/ntpd/refclock_hopfser.c#3 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/ntpd/refclock_jjy.c#3 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/ntpd/refclock_nmea.c#3 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/ntpd/refclock_palisade.c#3 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/ntpdate/Makefile.in#3 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/ntpdc/Makefile.in#3 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/ntpdc/ntpdc-opts.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/ntpdc/ntpdc-opts.h#2 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/ntpdc/ntpdc-opts.texi#2 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/ntpdc/ntpdc.1#2 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/ntpq/Makefile.in#3 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/ntpq/ntpq-opts.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/ntpq/ntpq-opts.h#2 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/ntpq/ntpq-opts.texi#2 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/ntpq/ntpq.1#2 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/ntpq/ntpq.c#3 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/packageinfo.sh#2 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/parseutil/Makefile.in#3 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/scripts/Makefile.in#3 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/sntp/Makefile.in#3 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/sntp/aclocal.m4#3 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/sntp/config.h.in#2 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/sntp/configure#3 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/sntp/configure.ac#3 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/sntp/libopts/Makefile.in#2 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/sntp/sntp-opts.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/sntp/sntp-opts.def#2 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/sntp/sntp-opts.h#2 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/sntp/sntp-opts.texi#2 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/sntp/sntp.1#2 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/sntp/version.def#2 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/util/Makefile.in#3 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/util/ntp-keygen-opts.c#2 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/util/ntp-keygen-opts.h#2 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/util/ntp-keygen-opts.texi#2 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/util/ntp-keygen.1#2 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/version#3 integrate .. //depot/projects/scottl-camlock/src/contrib/ntp/version.m4#2 integrate .. //depot/projects/scottl-camlock/src/etc/mtree/BIND.chroot.dist#2 integrate .. //depot/projects/scottl-camlock/src/etc/mtree/BSD.usr.dist#6 integrate .. //depot/projects/scottl-camlock/src/etc/namedb/named.conf#3 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/named#3 integrate .. //depot/projects/scottl-camlock/src/etc/termcap.small#4 integrate .. //depot/projects/scottl-camlock/src/gnu/lib/libgcc/Makefile#5 integrate .. //depot/projects/scottl-camlock/src/lib/Makefile#6 integrate .. //depot/projects/scottl-camlock/src/lib/libc/stdio/getline.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/sys/cpuset.2#2 integrate .. //depot/projects/scottl-camlock/src/lib/libexpat/libbsdxml.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libjail/jail.c#4 integrate .. //depot/projects/scottl-camlock/src/lib/libpam/modules/pam_lastlog/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/lib/libpam/modules/pam_lastlog/pam_lastlog.c#4 integrate .. //depot/projects/scottl-camlock/src/lib/libtacplus/libtacplus.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libtacplus/taclib.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libtacplus/taclib.h#2 integrate .. //depot/projects/scottl-camlock/src/lib/libtacplus/taclib_private.h#2 integrate .. //depot/projects/scottl-camlock/src/lib/libthr/thread/thr_umtx.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libulog/ulog_login.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libusb/libusb10.c#6 integrate .. //depot/projects/scottl-camlock/src/lib/libutil/gr_util.c#2 integrate .. //depot/projects/scottl-camlock/src/sbin/ifconfig/regdomain.c#2 integrate .. //depot/projects/scottl-camlock/src/sbin/ipfw/ipfw.8#8 integrate .. //depot/projects/scottl-camlock/src/sbin/ipfw/ipfw2.c#5 integrate .. //depot/projects/scottl-camlock/src/sbin/ipfw/ipfw2.h#3 integrate .. //depot/projects/scottl-camlock/src/share/examples/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/share/examples/etc/make.conf#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/iwnfw.4#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/mwlfw.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/psm.4#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/vge.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man5/make.conf.5#5 integrate .. //depot/projects/scottl-camlock/src/share/man/man7/build.7#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/LOCK_PROFILING.9#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/sleep.9#4 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/sleepqueue.9#3 integrate .. //depot/projects/scottl-camlock/src/share/termcap/termcap.5#2 integrate .. //depot/projects/scottl-camlock/src/share/termcap/termcap.src#5 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/vm_machdep.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/conf/DEFAULTS#12 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/conf/NOTES#23 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/ia32/ia32_syscall.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/DEFAULTS#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/common/Makefile.inc#7 integrate .. //depot/projects/scottl-camlock/src/sys/boot/common/md.c#1 branch .. //depot/projects/scottl-camlock/src/sys/boot/i386/libi386/biosdisk.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/Makefile#5 integrate .. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/bios.S#2 integrate .. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/boot.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/boot.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/disk.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/io.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/serial_16550.S#3 integrate .. //depot/projects/scottl-camlock/src/sys/boot/pc98/boot2/sys.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/boot/pc98/libpc98/biosdisk.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/boot/uboot/lib/glue.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_cd.c#35 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/compat/freebsd32/freebsd32_proto.h#27 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_signal.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/compat/x86bios/x86bios.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/conf/NOTES#45 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files#59 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/changes.txt#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/compiler/aslcompile.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/debugger/dbutils.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/disassembler/dmwalk.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dispatcher/dsmethod.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/dispatcher/dswload.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/events/evregion.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/events/evrgnini.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/events/evxface.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/events/evxfevnt.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/events/evxfregn.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/executer/exmutex.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acnamesp.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acobject.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acoutput.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/include/acpixf.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/namespace/nsaccess.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/namespace/nsdump.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/namespace/nseval.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/namespace/nsnames.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/namespace/nspredef.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/namespace/nsrepair.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/namespace/nsrepair2.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/namespace/nsutils.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/namespace/nsxfeval.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/namespace/nsxfname.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/namespace/nsxfobj.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/parser/psxface.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/resources/rsxface.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/tools/acpiexec/aecommon.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/dev/acpica/utilities/utcopy.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/agp/agp_via.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.c#45 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.h#28 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-disk.c#25 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-pci.h#28 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-cd.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/atapi-cd.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-acerlabs.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-amd.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-ite.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-promise.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-serverworks.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-via.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/atkbdc/psm.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ciss/ciss.c#24 integrate .. //depot/projects/scottl-camlock/src/sys/dev/dpms/dpms.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_82543.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/e1000_osdep.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/e1000/if_igb.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fdc/fdc_acpi.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hwpmc/hwpmc_intel.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ichsmb/ichsmb_pci.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/if_ndis/if_ndis.c#23 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ipmi/ipmi.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ips/ips_pci.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mii/ip1000phy.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/puc/puc.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/u3g.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_device.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_dynamic.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_dynamic.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usbdevs#34 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usbdi.h#15 integrate .. //depot/projects/scottl-camlock/src/sys/dev/vge/if_vge.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/dev/vge/if_vgereg.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/vge/if_vgevar.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/wpi/if_wpi.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/fs/devfs/devfs_vnops.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/geom/part/g_part.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/geom/part/g_part.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/geom/part/g_part_gpt.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/i386/conf/DEFAULTS#12 integrate .. //depot/projects/scottl-camlock/src/sys/i386/conf/NOTES#30 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/conf/DEFAULTS#12 integrate .. //depot/projects/scottl-camlock/src/sys/isa/vga_isa.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_exit.c#25 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_jail.c#27 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_lock.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_proc.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_sx.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_timeout.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_acl_nfs4.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_eventhandler.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_sleepqueue.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_turnstile.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/kern/tty_pts.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_syscalls.c#33 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_subr.c#28 integrate .. //depot/projects/scottl-camlock/src/sys/mips/adm5120/if_admsw.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/mips/conf/DEFAULTS#2 integrate .. //depot/projects/scottl-camlock/src/sys/modules/ipfw/Makefile#9 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_bridge.c#24 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_ethersubr.c#25 integrate .. //depot/projects/scottl-camlock/src/sys/net/radix.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/net/radix.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/net/route.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/net/rtsock.c#25 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_bridge.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_ipfw.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_divert.c#24 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_fw.h#18 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_dummynet.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw2.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw_dynamic.c#1 branch .. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw_log.c#1 branch .. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw_nat.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw_pfil.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw_private.h#1 branch .. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw_sockopt.c#1 branch .. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw_table.c#1 branch .. //depot/projects/scottl-camlock/src/sys/netinet/raw_ip.c#28 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/mld6.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/raw_ip6.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/nfsclient/bootp_subr.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/nfsclient/krpc_subr.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_vfsops.c#23 integrate .. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_vnops.c#27 integrate .. //depot/projects/scottl-camlock/src/sys/pc98/conf/DEFAULTS#10 integrate .. //depot/projects/scottl-camlock/src/sys/pc98/conf/NOTES#20 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/booke/clock.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/conf/DEFAULTS#9 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/conf/DEFAULTS#8 integrate .. //depot/projects/scottl-camlock/src/sys/sun4v/conf/DEFAULTS#5 integrate .. //depot/projects/scottl-camlock/src/sys/sys/_lockmgr.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/sys/apm.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/sys/bio.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/sys/gpt.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/sys/jail.h#14 integrate .. //depot/projects/scottl-camlock/src/sys/sys/param.h#37 integrate .. //depot/projects/scottl-camlock/src/sys/sys/proc.h#29 integrate .. //depot/projects/scottl-camlock/src/sys/sys/sleepqueue.h#12 integrate .. //depot/projects/scottl-camlock/src/sys/sys/sysproto.h#23 integrate .. //depot/projects/scottl-camlock/src/sys/sys/vnode.h#23 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ffs/ffs_rawread.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_object.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_object.h#13 integrate .. //depot/projects/scottl-camlock/src/tools/regression/kqueue/Makefile#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/kqueue/common.h#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/kqueue/config.h#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/kqueue/main.c#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/kqueue/proc.c#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/kqueue/read.c#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/kqueue/signal.c#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/kqueue/timer.c#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/kqueue/user.c#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/kqueue/vnode.c#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/comm/Makefile#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/comm/regress.00.out#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/comm/regress.00a.in#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/comm/regress.00b.in#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/comm/regress.01.out#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/comm/regress.01a.in#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/comm/regress.01b.in#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/comm/regress.02.out#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/comm/regress.02a.in#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/comm/regress.02b.in#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/comm/regress.sh#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/comm/regress.t#1 branch .. //depot/projects/scottl-camlock/src/usr.bin/ar/util.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/c89/c89.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/calendar/calendar.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/calendar/calendars/calendar.all#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/calendar/calendars/calendar.dutch#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/calendar/day.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/calendar/io.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/calendar/ostern.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/calendar/paskha.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/cksum/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/cksum/crc.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/cksum/crc32.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/cksum/sum1.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/cksum/sum2.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/cmp/regular.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/cmp/special.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/colcrt/colcrt.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/colrm/colrm.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/comm/comm.1#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/comm/comm.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/compress/zopen.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/cpuset/cpuset.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/expand/expand.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/fetch/fetch.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/file2c/file2c.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/find/find.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/find/getdate.y#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/find/ls.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/find/main.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/find/misc.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/find/option.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/finger/lprint.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/finger/net.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/finger/util.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/fmt/fmt.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/fold/fold.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/gcore/gcore.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/getopt/getopt.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/hexdump/display.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/hexdump/hexdump.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/jot/jot.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/killall/killall.c#5 integrate .. //depot/projects/scottl-camlock/src/usr.bin/ktrace/subr.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/lastcomm/lastcomm.c#4 integrate .. //depot/projects/scottl-camlock/src/usr.bin/lastcomm/pathnames.h#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/lastcomm/readrec.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/limits/limits.c#4 integrate .. //depot/projects/scottl-camlock/src/usr.bin/lock/lock.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/login/login.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/login/login_fbtab.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/login/pathnames.h#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/make/arch.c#5 integrate .. //depot/projects/scottl-camlock/src/usr.bin/make/dir.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/make/for.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/make/globals.h#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/make/lst.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/make/lst.h#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/make/make.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/make/str.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/make/targ.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/make/var.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/mesg/mesg.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/mkfifo/mkfifo.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/mklocale/yacc.y#4 integrate .. //depot/projects/scottl-camlock/src/usr.bin/mktemp/mktemp.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/ncal/ncal.c#4 integrate .. //depot/projects/scottl-camlock/src/usr.bin/netstat/atalk.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/netstat/bpf.c#4 integrate .. //depot/projects/scottl-camlock/src/usr.bin/netstat/if.c#5 integrate .. //depot/projects/scottl-camlock/src/usr.bin/netstat/ipsec.c#4 integrate .. //depot/projects/scottl-camlock/src/usr.bin/netstat/ipx.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/netstat/main.c#6 integrate .. //depot/projects/scottl-camlock/src/usr.bin/netstat/mbuf.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/netstat/netgraph.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/netstat/pfkey.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/netstat/route.c#5 integrate .. //depot/projects/scottl-camlock/src/usr.bin/netstat/sctp.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/newgrp/newgrp.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/newkey/update.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/nfsstat/nfsstat.c#5 integrate .. //depot/projects/scottl-camlock/src/usr.bin/nohup/nohup.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/passwd/passwd.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/paste/paste.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/pr/egetopt.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/procstat/procstat_args.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/procstat/procstat_basic.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/procstat/procstat_files.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/procstat/procstat_vm.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/rev/rev.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/rlogin/rlogin.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/rpcgen/rpc_clntout.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/rpcgen/rpc_hout.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/rpcgen/rpc_tblout.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/rpcgen/rpc_util.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/ruptime/ruptime.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/rwall/rwall.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/sed/main.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/sed/misc.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/showmount/showmount.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/su/su.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/systat/fetch.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/systat/icmp.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/systat/iostat.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/systat/ip.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/systat/main.c#5 integrate .. //depot/projects/scottl-camlock/src/usr.bin/systat/mbufs.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/systat/mode.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/systat/netstat.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/systat/swap.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/systat/tcp.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/systat/vmstat.c#4 integrate .. //depot/projects/scottl-camlock/src/usr.bin/talk/ctl_transact.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/talk/display.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/talk/get_addrs.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/talk/get_iface.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/talk/get_names.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/talk/invite.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/talk/look_up.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/talk/talk.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/talk/talk.h#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/tar/getdate.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/tee/tee.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/time/time.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/tput/tput.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/tr/cmap.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/tr/cmap.h#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/tr/cset.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/tr/cset.h#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/tr/str.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/tr/tr.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/truss/main.c#4 integrate .. //depot/projects/scottl-camlock/src/usr.bin/truss/setup.c#4 integrate .. //depot/projects/scottl-camlock/src/usr.bin/truss/syscalls.c#4 integrate .. //depot/projects/scottl-camlock/src/usr.bin/tset/extern.h#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/tset/map.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/tset/misc.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/tset/set.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/tset/term.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/tset/tset.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/tset/wrterm.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/tsort/tsort.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/ul/ul.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/unexpand/unexpand.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/uniq/uniq.1#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/uniq/uniq.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/usbhidaction/usbhidaction.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/vis/foldit.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/w/pr_time.c#5 integrate .. //depot/projects/scottl-camlock/src/usr.bin/w/w.c#5 integrate .. //depot/projects/scottl-camlock/src/usr.bin/wall/ttymsg.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/who/who.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/xinstall/xinstall.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/yacc/defs.h#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/ypcat/ypcat.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/ypmatch/ypmatch.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/ypwhich/ypwhich.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/Makefile#7 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/jls/jls.c#9 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/mergemaster/mergemaster.sh#4 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/ndp/gnuc.h#2 delete .. //depot/projects/scottl-camlock/src/usr.sbin/ntp/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/ntp/ntptrace/Makefile#2 delete .. //depot/projects/scottl-camlock/src/usr.sbin/service/Makefile#1 branch .. //depot/projects/scottl-camlock/src/usr.sbin/service/service.8#1 branch .. //depot/projects/scottl-camlock/src/usr.sbin/service/service.sh#1 branch .. //depot/projects/scottl-camlock/src/usr.sbin/ypserv/yp_main.c#4 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/ypserv/ypserv.8#4 integrate Differences ... ==== //depot/projects/scottl-camlock/src/Makefile.inc1#11 (text+ko) ==== @@ -1,14 +1,15 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.633 2009/11/01 08:20:30 rdivacky Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.635 2009/12/16 02:54:34 imp Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir # -DNO_CLEAN do not clean at all # -DNO_SHARE do not go into share subdir -# -DKERNFAST define NO_KERNELCONFIG, NO_KERNELCLEAN and NO_KERNELDEPEND +# -DKERNFAST define NO_KERNEL{CONFIG,CLEAN,DEPEND,OBJ} # -DNO_KERNELCONFIG do not run config in ${MAKE} buildkernel # -DNO_KERNELCLEAN do not run ${MAKE} clean in ${MAKE} buildkernel # -DNO_KERNELDEPEND do not run ${MAKE} depend in ${MAKE} buildkernel +# -DNO_KERNELOBJ do not run ${MAKE} obj in ${MAKE} buildkernel # -DNO_PORTSUPDATE do not update ports in ${MAKE} update # -DNO_DOCUPDATE do not update doc in ${MAKE} update # -DNO_CTF do not run the DTrace CTF conversion tools on built objects @@ -694,6 +695,7 @@ NO_KERNELCLEAN= t NO_KERNELCONFIG= t NO_KERNELDEPEND= t +NO_KERNELOBJ= t # Shortcut for KERNCONF=Blah -DKERNFAST is now KERNFAST=Blah .if !defined(KERNCONF) && ${KERNFAST} != "1" KERNCONF=${KERNFAST} @@ -763,11 +765,13 @@ @echo "--------------------------------------------------------------" cd ${KRNLOBJDIR}/${_kernel}; ${KMAKE} ${CLEANDIR} .endif +.if !defined(NO_KERNELOBJ) @echo @echo "--------------------------------------------------------------" @echo ">>> stage 2.2: rebuilding the object tree" @echo "--------------------------------------------------------------" cd ${KRNLOBJDIR}/${_kernel}; ${KMAKE} obj +.endif @echo @echo "--------------------------------------------------------------" @echo ">>> stage 2.3: build tools" @@ -1103,8 +1107,8 @@ lib/libkiconv lib/libkvm lib/libmd \ lib/ncurses/ncurses lib/ncurses/ncursesw \ lib/libopie lib/libpam ${_lib_libthr} \ - lib/libradius lib/libsbuf lib/libtacplus lib/libutil \ - ${_lib_libypclnt} lib/libz lib/msun \ + lib/libradius lib/libsbuf lib/libtacplus lib/libulog \ + lib/libutil ${_lib_libypclnt} lib/libz lib/msun \ ${_secure_lib_libcrypto} ${_secure_lib_libssh} \ ${_secure_lib_libssl} lib/libdwarf lib/libproc ==== //depot/projects/scottl-camlock/src/UPDATING#24 (text+ko) ==== @@ -22,6 +22,19 @@ machines to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20091202: + The rc.firewall and rc.firewall6 were unified, and + rc.firewall6 and rc.d/ip6fw were removed. + According to the removal of rc.d/ip6fw, ipv6_firewall_* rc + variables are obsoleted. Instead, the following new rc + variables are added to rc.d/ipfw: + + firewall_client_net_ipv6, firewall_simple_iif_ipv6, + firewall_simple_inet_ipv6, firewall_simple_oif_ipv6, + firewall_simple_onet_ipv6, firewall_trusted_ipv6 + + The meanings correspond to the relevant IPv4 variables. + 20091113: The default terminal emulation for syscons(4) has been changed from cons25 to xterm on all platforms except pc98. This means @@ -1076,4 +1089,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.648 2009/11/21 01:43:22 dougb Exp $ +$FreeBSD: src/UPDATING,v 1.649 2009/12/18 16:35:28 ume Exp $ ==== //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/zdb/zdb_il.c#2 (text+ko) ==== @@ -19,12 +19,10 @@ * CDDL HEADER END */ /* - * Copyright 2007 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * Print intent log header and statistics. */ @@ -345,8 +343,10 @@ if (zh->zh_log.blk_birth == 0 || verbose < 2) return; - (void) printf("\n ZIL header: claim_txg %llu, seq %llu\n", - (u_longlong_t)zh->zh_claim_txg, (u_longlong_t)zh->zh_replay_seq); + (void) printf("\n ZIL header: claim_txg %llu, claim_seq %llu", + (u_longlong_t)zh->zh_claim_txg, (u_longlong_t)zh->zh_claim_seq); + (void) printf(" replay_seq %llu, flags 0x%llx\n", + (u_longlong_t)zh->zh_replay_seq, (u_longlong_t)zh->zh_flags); if (verbose >= 4) print_log_bp(&zh->zh_log, "\n\tfirst block: "); ==== //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c#2 (text+ko) ==== @@ -20,7 +20,7 @@ */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -2457,7 +2457,7 @@ bzero(&flags, sizeof (recvflags_t)); /* check options */ - while ((c = getopt(argc, argv, ":dnvF")) != -1) { + while ((c = getopt(argc, argv, ":dnuvF")) != -1) { switch (c) { case 'd': flags.isprefix = B_TRUE; @@ -2465,6 +2465,9 @@ case 'n': flags.dryrun = B_TRUE; break; + case 'u': + flags.nomount = B_TRUE; + break; case 'v': flags.verbose = B_TRUE; break; ==== //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h#2 (text+ko) ==== @@ -20,7 +20,7 @@ */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -457,6 +457,9 @@ /* byteswap flag is used internally; callers need not specify */ int byteswap : 1; + + /* do not mount file systems as they are extracted (private) */ + int nomount : 1; } recvflags_t; extern int zfs_receive(libzfs_handle_t *, const char *, recvflags_t, ==== //depot/projects/scottl-camlock/src/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c#3 (text+ko) ==== @@ -20,7 +20,7 @@ */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -2080,7 +2080,7 @@ err = zfs_receive_impl(hdl, tosnap, flags, infd, stream_avl, &top_zfs); - if (err == 0 && top_zfs) { + if (err == 0 && !flags.nomount && top_zfs) { zfs_handle_t *zhp; prop_changelist_t *clp; ==== //depot/projects/scottl-camlock/src/contrib/ntp/COPYRIGHT#3 (text+ko) ==== @@ -13,7 +13,7 @@ applies as if the text was explicitly included in the file. *********************************************************************** * * -* Copyright (c) David L. Mills 1992-2008 * +* Copyright (c) David L. Mills 1992-2009 * * * * Permission to use, copy, modify, and distribute this software and * * its documentation for any purpose with or without fee is hereby * ==== //depot/projects/scottl-camlock/src/contrib/ntp/ChangeLog#3 (text+ko) ==== @@ -1,7 +1,86 @@ -(4.2.4p5) 2008/08/17 Released by Harlan Stenn +--- +(4.2.4p8) 2009/12/08 Released by Harlan Stenn + +* [Sec 1331] DoS with mode 7 packets - CVE-2009-3563. + +--- +(4.2.4p7) 2009/05/18 Released by Harlan Stenn + +* [Sec 1151] Remote exploit if autokey is enabled - CVE-2009-1252. +* [Bug 1187] Update the copyright date. +* [Bug 1191] ntpd fails on Win2000 - "Address already in use" after fix + for [Sec 1149]. + +--- +(4.2.4p7-RC7) 2009/05/12 Released by Harlan Stenn + +* ntp.isc.org -> ntp.org cleanup. +* [Bug 1178] Use prior FORCE_DNSRETRY behavior as needed at runtime, + add configure --enable-ignore-dns-errors to be even more stubborn + +--- +(4.2.4p7-RC6) 2009/05/08 Released by Harlan Stenn + +* [Bug 784] Make --enable-linuxcaps the default when available +* [Bug 1179] error messages for -u/--user and -i lacking droproot +* Updated JJY reference clock driver from Takao Abe +* [Bug 1071] Log a message and exit before trying to use FD_SET with a + descriptor larger than FD_SETSIZE, which will corrupt memory +* On corruption of the iface list head in add_interface, log and exit + +--- +(4.2.4p7-RC5) 2009/05/02 Released by Harlan Stenn + +* [Bug 1172] 4.2.4p7-RC{3,4} fail to build on linux. +* flock-build script unportable 'set -m' use removed + +--- +(4.2.4p7-RC4) 2009/04/29 Released by Harlan Stenn + +* [Bug 1167] use gcc -Winit-self only if it is understood + +--- +(4.2.4p7-RC3) 2009/04/22 Released by Harlan Stenn + +* [Bug 787] Bug fixes for 64-bit time_t on Windows +* [Bug 813] Conditional naming of Event +* [Bug 1147] System errors should be logged to msyslog() +* [Bug 1155] Fix compile problem on Windows with VS2005 +* [Bug 1156] lock_thread_to_processor() should be declared in header +* [Bug 1157] quiet OpenSSL warnings, clean up configure.ac +* [Bug 1158] support for aix6.1 +* [Bug 1160] MacOS X is like BSD regarding F_SETOWN + +--- +(4.2.4p7-RC2) 2009/04/09 Released by Harlan Stenn + +* [Sec 1144] limited buffer overflow in ntpq. CVE-2009-0159 +* [Sec 1149] use SO_EXCLUSIVEADDRUSE on Windows + +--- +(4.2.4p7-RC1) 2009/03/30 Released by Harlan Stenn + +* [Bug 1131] UDP sockets should not use SIGPOLL on Solaris. +* build system email address cleanup +* [Bug 774] parsesolaris.c does not compile under the new Solaris +* [Bug 873] Windows serial refclock proper TTY line discipline emulation +* [Bug 1014] Enable building with VC9 (in Visual Studio 2008, + Visual C++ 2008, or SDK) +* [Bug 1117] Deferred interface binding under Windows works only correctly + if FORCE_DNSRETRY is defined +* [BUG 1124] Lock QueryPerformanceCounter() client threads to same CPU +* DPRINTF macro made safer, always evaluates to a statement and will not + misassociate an else which follows the macro. + +--- +(4.2.4p6) 2009/01/08 Released by Harlan Stenn + +* [Bug 1113] Fixed build errors with recent versions of openSSL. +* [Sec 1111] Fix incorrect check of EVP_VerifyFinal()'s return value. +* Update the copyright year. + --- (4.2.4p5) 2008/08/17 Released by Harlan Stenn -(4.2.4p5) 2008/08/17 Released by Harlan Stenn * [BUG 1051] Month off by one in leap second message written to clockstats file fixed. ==== //depot/projects/scottl-camlock/src/contrib/ntp/CommitLog#2 (text+ko) ==== @@ -1,3 +1,1727 @@ +ChangeSet@1.1612, 2009-12-08 08:30:54-05:00, stenn@whimsy.udel.edu +1 -0 + ChangeLog: + typo + + ChangeLog@1.95, 2009-12-08 08:30:44-05:00, stenn@whimsy.udel.edu +0 -1 + typo + +ChangeSet@1.1611, 2009-12-08 08:23:12-05:00, stenn@whimsy.udel.edu +26 -0 + NTP_4_2_4P8 + TAG: NTP_4_2_4P8 + + ChangeLog@1.94, 2009-12-08 08:23:01-05:00, stenn@whimsy.udel.edu +1 -0 + NTP_4_2_4P8 + + ntpd/ntpd-opts.c@1.86, 2009-12-08 08:23:02-05:00, stenn@whimsy.udel.edu +2 -2 + NTP_4_2_4P8 + + ntpd/ntpd-opts.h@1.86, 2009-12-08 08:23:02-05:00, stenn@whimsy.udel.edu +3 -3 + NTP_4_2_4P8 + + ntpd/ntpd-opts.texi@1.85, 2009-12-08 08:23:03-05:00, stenn@whimsy.udel.edu +1 -1 + NTP_4_2_4P8 + + ntpd/ntpd.1@1.84, 2009-12-08 08:23:03-05:00, stenn@whimsy.udel.edu +2 -2 + NTP_4_2_4P8 + + ntpd/ntpdsim-opts.c@1.86, 2009-12-08 08:23:03-05:00, stenn@whimsy.udel.edu +2 -2 + NTP_4_2_4P8 + + ntpd/ntpdsim-opts.h@1.86, 2009-12-08 08:23:04-05:00, stenn@whimsy.udel.edu +3 -3 + NTP_4_2_4P8 + + ntpd/ntpdsim-opts.texi@1.84, 2009-12-08 08:23:05-05:00, stenn@whimsy.udel.edu +1 -1 + NTP_4_2_4P8 + + ntpd/ntpdsim.1@1.84, 2009-12-08 08:23:05-05:00, stenn@whimsy.udel.edu +2 -2 + NTP_4_2_4P8 + + ntpdc/ntpdc-opts.c@1.86, 2009-12-08 08:23:05-05:00, stenn@whimsy.udel.edu +2 -2 + NTP_4_2_4P8 + + ntpdc/ntpdc-opts.h@1.86, 2009-12-08 08:23:05-05:00, stenn@whimsy.udel.edu +3 -3 + NTP_4_2_4P8 + + ntpdc/ntpdc-opts.texi@1.84, 2009-12-08 08:23:06-05:00, stenn@whimsy.udel.edu +1 -1 + NTP_4_2_4P8 + + ntpdc/ntpdc.1@1.84, 2009-12-08 08:23:06-05:00, stenn@whimsy.udel.edu +2 -2 + NTP_4_2_4P8 + + ntpq/ntpq-opts.c@1.88, 2009-12-08 08:23:06-05:00, stenn@whimsy.udel.edu +2 -2 + NTP_4_2_4P8 + + ntpq/ntpq-opts.h@1.88, 2009-12-08 08:23:06-05:00, stenn@whimsy.udel.edu +3 -3 + NTP_4_2_4P8 + + ntpq/ntpq-opts.texi@1.85, 2009-12-08 08:23:07-05:00, stenn@whimsy.udel.edu +1 -1 + NTP_4_2_4P8 + + ntpq/ntpq.1@1.84, 2009-12-08 08:23:07-05:00, stenn@whimsy.udel.edu +2 -2 + NTP_4_2_4P8 + + packageinfo.sh@1.118, 2009-12-08 08:23:07-05:00, stenn@whimsy.udel.edu +4 -4 + NTP_4_2_4P8 + + sntp/sntp-opts.c@1.84, 2009-12-08 08:23:07-05:00, stenn@whimsy.udel.edu +2 -2 + NTP_4_2_4P8 + + sntp/sntp-opts.h@1.84, 2009-12-08 08:23:07-05:00, stenn@whimsy.udel.edu +3 -3 + NTP_4_2_4P8 + + sntp/sntp-opts.texi@1.81, 2009-12-08 08:23:08-05:00, stenn@whimsy.udel.edu +1 -1 + NTP_4_2_4P8 + + sntp/sntp.1@1.84, 2009-12-08 08:23:08-05:00, stenn@whimsy.udel.edu +2 -2 + NTP_4_2_4P8 + + util/ntp-keygen-opts.c@1.85, 2009-12-08 08:23:08-05:00, stenn@whimsy.udel.edu +2 -2 + NTP_4_2_4P8 + + util/ntp-keygen-opts.h@1.85, 2009-12-08 08:23:08-05:00, stenn@whimsy.udel.edu +3 -3 + NTP_4_2_4P8 + + util/ntp-keygen-opts.texi@1.83, 2009-12-08 08:23:09-05:00, stenn@whimsy.udel.edu +1 -1 + NTP_4_2_4P8 + + util/ntp-keygen.1@1.83, 2009-12-08 08:23:09-05:00, stenn@whimsy.udel.edu +2 -2 + NTP_4_2_4P8 + +ChangeSet@1.1610, 2009-12-08 07:45:28-05:00, stenn@whimsy.udel.edu +26 -0 + NTP_4_2_4P9_RC1 + TAG: NTP_4_2_4P9_RC1 + + ChangeLog@1.93, 2009-12-08 07:45:19-05:00, stenn@whimsy.udel.edu +1 -0 + NTP_4_2_4P9_RC1 + + ntpd/ntpd-opts.c@1.85, 2009-12-08 07:45:19-05:00, stenn@whimsy.udel.edu +5 -5 + NTP_4_2_4P9_RC1 + + ntpd/ntpd-opts.h@1.85, 2009-12-08 07:45:19-05:00, stenn@whimsy.udel.edu +4 -4 + NTP_4_2_4P9_RC1 + + ntpd/ntpd-opts.texi@1.84, 2009-12-08 07:45:20-05:00, stenn@whimsy.udel.edu +13 -6 + NTP_4_2_4P9_RC1 + + ntpd/ntpd.1@1.83, 2009-12-08 07:45:20-05:00, stenn@whimsy.udel.edu +2 -2 + NTP_4_2_4P9_RC1 + + ntpd/ntpdsim-opts.c@1.85, 2009-12-08 07:45:20-05:00, stenn@whimsy.udel.edu +5 -5 + NTP_4_2_4P9_RC1 + + ntpd/ntpdsim-opts.h@1.85, 2009-12-08 07:45:20-05:00, stenn@whimsy.udel.edu +4 -4 + NTP_4_2_4P9_RC1 + + ntpd/ntpdsim-opts.texi@1.83, 2009-12-08 07:45:21-05:00, stenn@whimsy.udel.edu +61 -2 + NTP_4_2_4P9_RC1 + + ntpd/ntpdsim.1@1.83, 2009-12-08 07:45:21-05:00, stenn@whimsy.udel.edu +2 -2 + NTP_4_2_4P9_RC1 + + ntpdc/ntpdc-opts.c@1.85, 2009-12-08 07:45:21-05:00, stenn@whimsy.udel.edu +5 -5 + NTP_4_2_4P9_RC1 + + ntpdc/ntpdc-opts.h@1.85, 2009-12-08 07:45:21-05:00, stenn@whimsy.udel.edu +4 -4 + NTP_4_2_4P9_RC1 + + ntpdc/ntpdc-opts.texi@1.83, 2009-12-08 07:45:21-05:00, stenn@whimsy.udel.edu +7 -4 + NTP_4_2_4P9_RC1 + + ntpdc/ntpdc.1@1.83, 2009-12-08 07:45:22-05:00, stenn@whimsy.udel.edu +2 -2 + NTP_4_2_4P9_RC1 + + ntpq/ntpq-opts.c@1.87, 2009-12-08 07:45:22-05:00, stenn@whimsy.udel.edu +5 -5 + NTP_4_2_4P9_RC1 + + ntpq/ntpq-opts.h@1.87, 2009-12-08 07:45:22-05:00, stenn@whimsy.udel.edu +4 -4 + NTP_4_2_4P9_RC1 + + ntpq/ntpq-opts.texi@1.84, 2009-12-08 07:45:22-05:00, stenn@whimsy.udel.edu +8 -4 + NTP_4_2_4P9_RC1 + + ntpq/ntpq.1@1.83, 2009-12-08 07:45:23-05:00, stenn@whimsy.udel.edu +2 -2 + NTP_4_2_4P9_RC1 + + packageinfo.sh@1.117, 2009-12-08 07:45:23-05:00, stenn@whimsy.udel.edu +3 -3 + NTP_4_2_4P9_RC1 + + sntp/sntp-opts.c@1.83, 2009-12-08 07:45:23-05:00, stenn@whimsy.udel.edu +5 -5 + NTP_4_2_4P9_RC1 + + sntp/sntp-opts.h@1.83, 2009-12-08 07:45:23-05:00, stenn@whimsy.udel.edu +4 -4 + NTP_4_2_4P9_RC1 + + sntp/sntp-opts.texi@1.80, 2009-12-08 07:45:24-05:00, stenn@whimsy.udel.edu +54 -2 + NTP_4_2_4P9_RC1 + + sntp/sntp.1@1.83, 2009-12-08 07:45:24-05:00, stenn@whimsy.udel.edu +2 -2 + NTP_4_2_4P9_RC1 + + util/ntp-keygen-opts.c@1.84, 2009-12-08 07:45:24-05:00, stenn@whimsy.udel.edu +5 -5 + NTP_4_2_4P9_RC1 + + util/ntp-keygen-opts.h@1.84, 2009-12-08 07:45:24-05:00, stenn@whimsy.udel.edu +4 -4 + NTP_4_2_4P9_RC1 + + util/ntp-keygen-opts.texi@1.82, 2009-12-08 07:45:24-05:00, stenn@whimsy.udel.edu +4 -4 + NTP_4_2_4P9_RC1 + + util/ntp-keygen.1@1.82, 2009-12-08 07:45:25-05:00, stenn@whimsy.udel.edu +2 -2 + NTP_4_2_4P9_RC1 + +ChangeSet@1.1609, 2009-12-08 05:36:47-05:00, stenn@whimsy.udel.edu +2 -0 + [Sec 1331] DoS with mode 7 packets - CVE-2009-3563 + + NEWS@1.102, 2009-12-08 05:36:36-05:00, stenn@whimsy.udel.edu +34 -0 + [Sec 1331] DoS with mode 7 packets - CVE-2009-3563 + + packageinfo.sh@1.116, 2009-12-08 05:36:36-05:00, stenn@whimsy.udel.edu +2 -2 + [Sec 1331] DoS with mode 7 packets - CVE-2009-3563 + +ChangeSet@1.1608, 2009-10-07 01:33:22+00:00, davehart@shiny.ad.hartbrothers.com +2 -0 + [Sec 1331] DoS with mode 7 packets - CVE-2009-3563. + + ChangeLog@1.92, 2009-10-07 01:33:21+00:00, davehart@shiny.ad.hartbrothers.com +4 -0 + [Sec 1331] DoS with mode 7 packets - CVE-2009-3563. + + ntpd/ntp_request.c@1.68, 2009-10-07 01:33:21+00:00, davehart@shiny.ad.hartbrothers.com +9 -2 + [Sec 1331] DoS with mode 7 packets - CVE-2009-3563. + +ChangeSet@1.1607, 2009-05-18 05:04:41-04:00, stenn@whimsy.udel.edu +26 -0 + NTP_4_2_4P7 + TAG: NTP_4_2_4P7 + + ChangeLog@1.91, 2009-05-18 05:04:18-04:00, stenn@whimsy.udel.edu +1 -0 + NTP_4_2_4P7 + + ntpd/ntpd-opts.c@1.84, 2009-05-18 05:04:19-04:00, stenn@whimsy.udel.edu +4 -4 + NTP_4_2_4P7 + + ntpd/ntpd-opts.h@1.84, 2009-05-18 05:04:20-04:00, stenn@whimsy.udel.edu +4 -4 + NTP_4_2_4P7 + + ntpd/ntpd-opts.texi@1.83, 2009-05-18 05:04:21-04:00, stenn@whimsy.udel.edu +1 -1 + NTP_4_2_4P7 + + ntpd/ntpd.1@1.82, 2009-05-18 05:04:22-04:00, stenn@whimsy.udel.edu +2 -2 >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Dec 21 20:30:40 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A32211065698; Mon, 21 Dec 2009 20:30:40 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4E87D1065672 for ; Mon, 21 Dec 2009 20:30:40 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 399B88FC12 for ; Mon, 21 Dec 2009 20:30:40 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nBLKUebL070047 for ; Mon, 21 Dec 2009 20:30:40 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nBLKUdKH070045 for perforce@freebsd.org; Mon, 21 Dec 2009 20:30:39 GMT (envelope-from trasz@freebsd.org) Date: Mon, 21 Dec 2009 20:30:39 GMT Message-Id: <200912212030.nBLKUdKH070045@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 172037 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Dec 2009 20:30:40 -0000 http://p4web.freebsd.org/chv.cgi?CH=172037 Change 172037 by trasz@trasz_victim on 2009/12/21 20:30:07 IFC. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/UPDATING#46 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/pax/sel_subs.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/cddl/contrib/opensolaris/cmd/zdb/zdb_il.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/release/Makefile#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/examples/etc/make.conf#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/mwlfw.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/psm.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/vge.4#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/watchdog.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/conf/NOTES#16 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/pc98/kgzldr/crt.s#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/uboot/lib/glue.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/scsi/scsi_cd.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/linux/linux_signal.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/NOTES#44 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/agp/agp_via.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/ata-pci.h#18 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/chipsets/ata-ite.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/chipsets/ata-via.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/atkbdc/psm.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/e1000/if_igb.c#15 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hwpmc/hwpmc_intel.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ipmi/ipmi.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mii/ip1000phy.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ste/if_ste.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ste/if_stereg.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/vge/if_vge.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/vge/if_vgereg.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/vge/if_vgevar.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/devfs/devfs_vnops.c#15 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/conf/NOTES#20 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_exit.c#19 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_proc.c#22 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_nfs4.c#53 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_turnstile.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/tty_pts.c#18 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_subr.c#44 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_var.h#19 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ipfw/ip_fw_table.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/pc98/conf/NOTES#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/booke/clock.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/mount.h#17 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/proc.h#20 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/vnode.h#38 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ffs/ffs_rawread.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ffs/ffs_vfsops.c#27 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ffs/fs.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/acl.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_acl.c#23 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_lookup.c#20 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_vnops.c#36 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/vm_object.c#15 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/vm/vm_object.h#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/finger/finger.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/sockstat/sockstat.1#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/truss/amd64-fbsd32.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/truss/i386-fbsd.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/truss/main.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/truss/syscalls.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/Makefile#24 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/burncd/burncd.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/burncd/burncd.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/mergemaster/mergemaster.sh#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/service/Makefile#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/service/service.8#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/service/service.sh#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/watchdogd/watchdogd.c#2 integrate Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/UPDATING#46 (text+ko) ==== @@ -22,6 +22,19 @@ machines to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20091202: + The rc.firewall and rc.firewall6 were unified, and + rc.firewall6 and rc.d/ip6fw were removed. + According to the removal of rc.d/ip6fw, ipv6_firewall_* rc + variables are obsoleted. Instead, the following new rc + variables are added to rc.d/ipfw: + + firewall_client_net_ipv6, firewall_simple_iif_ipv6, + firewall_simple_inet_ipv6, firewall_simple_oif_ipv6, + firewall_simple_onet_ipv6, firewall_trusted_ipv6 + + The meanings correspond to the relevant IPv4 variables. + 20091113: The default terminal emulation for syscons(4) has been changed from cons25 to xterm on all platforms except pc98. This means @@ -1076,4 +1089,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.648 2009/11/21 01:43:22 dougb Exp $ +$FreeBSD: src/UPDATING,v 1.649 2009/12/18 16:35:28 ume Exp $ ==== //depot/projects/soc2008/trasz_nfs4acl/bin/pax/sel_subs.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/pax/sel_subs.c,v 1.21 2007/05/25 17:53:38 brian Exp $"); +__FBSDID("$FreeBSD: src/bin/pax/sel_subs.c,v 1.22 2009/12/21 19:18:27 delphij Exp $"); #include #include @@ -396,6 +396,7 @@ default: paxwarn(1, "Bad option %c with time range %s", *flgpt, str); + free(pt); goto out; } ++flgpt; ==== //depot/projects/soc2008/trasz_nfs4acl/cddl/contrib/opensolaris/cmd/zdb/zdb_il.c#3 (text+ko) ==== @@ -19,12 +19,10 @@ * CDDL HEADER END */ /* - * Copyright 2007 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * Print intent log header and statistics. */ @@ -345,8 +343,10 @@ if (zh->zh_log.blk_birth == 0 || verbose < 2) return; - (void) printf("\n ZIL header: claim_txg %llu, seq %llu\n", - (u_longlong_t)zh->zh_claim_txg, (u_longlong_t)zh->zh_replay_seq); + (void) printf("\n ZIL header: claim_txg %llu, claim_seq %llu", + (u_longlong_t)zh->zh_claim_txg, (u_longlong_t)zh->zh_claim_seq); + (void) printf(" replay_seq %llu, flags 0x%llx\n", + (u_longlong_t)zh->zh_replay_seq, (u_longlong_t)zh->zh_flags); if (verbose >= 4) print_log_bp(&zh->zh_log, "\n\tfirst block: "); ==== //depot/projects/soc2008/trasz_nfs4acl/release/Makefile#12 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.949 2009/09/18 14:53:01 kensmith Exp $ +# $FreeBSD: src/release/Makefile,v 1.950 2009/12/21 14:42:35 kensmith Exp $ # # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \ # [RELEASETAG=tag] [SVNROOT=svn://svn.freebsd.org/base] \ @@ -1128,36 +1128,36 @@ .if defined(CD_BOOT) @sh ${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh ${BOOTABLE} \ FreeBSD_bootonly \ - ${CD}/${BUILDNAME}-${TARGET}-bootonly.iso ${CD_BOOT} + ${CD}/FreeBSD-${BUILDNAME}-${TARGET}-bootonly.iso ${CD_BOOT} .endif @sh ${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh ${BOOTABLE} \ FreeBSD_Install \ - ${CD}/${BUILDNAME}-${TARGET}-disc1.iso ${CD_DISC1} \ + ${CD}/FreeBSD-${BUILDNAME}-${TARGET}-disc1.iso ${CD_DISC1} \ ${CD_DISC1_PKGS} @sh ${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh \ FreeBSD_Packages \ - ${CD}/${BUILDNAME}-${TARGET}-disc2.iso ${CD_DISC2} \ + ${CD}/FreeBSD-${BUILDNAME}-${TARGET}-disc2.iso ${CD_DISC2} \ ${CD_DISC2_PKGS} .if defined(MAKE_DVD) @sh ${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh ${BOOTABLE} \ FreeBSD_Install \ - ${CD}/${BUILDNAME}-${TARGET}-dvd1.iso ${CD_DVD1} \ + ${CD}/FreeBSD-${BUILDNAME}-${TARGET}-dvd1.iso ${CD_DVD1} \ ${CD_DVD1_PKGS} .endif .if !defined(NODOC) @sh ${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh \ FreeBSD_Documentation \ - ${CD}/${BUILDNAME}-${TARGET}-disc3.iso ${CD_DOCS} \ + ${CD}/FreeBSD-${BUILDNAME}-${TARGET}-disc3.iso ${CD_DOCS} \ ${CD_DOCS_PKGS} .endif .if defined(SEPARATE_LIVEFS) @sh ${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh ${BOOTABLE} \ FreeBSD_LiveFS \ - ${CD}/${BUILDNAME}-${TARGET}-livefs.iso ${CD_LIVEFS} + ${CD}/FreeBSD-${BUILDNAME}-${TARGET}-livefs.iso ${CD_LIVEFS} .endif @echo "Generating MD5 and SHA256 sums..." - @(cd ${CD} && md5 *.iso > ${BUILDNAME}-${TARGET}-iso.CHECKSUM.MD5) - @(cd ${CD} && sha256 *.iso > ${BUILDNAME}-${TARGET}-iso.CHECKSUM.SHA256) + @(cd ${CD} && md5 *.iso > FreeBSD-${BUILDNAME}-${TARGET}-iso.CHECKSUM.MD5) + @(cd ${CD} && sha256 *.iso > FreeBSD-${BUILDNAME}-${TARGET}-iso.CHECKSUM.SHA256) touch ${.TARGET} .else @echo "Do not know how to create an ISO for ${TARGET_ARCH}." ==== //depot/projects/soc2008/trasz_nfs4acl/share/examples/etc/make.conf#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/examples/etc/make.conf,v 1.279 2007/01/17 12:43:06 des Exp $ +# $FreeBSD: src/share/examples/etc/make.conf,v 1.280 2009/12/21 12:32:13 ru Exp $ # # NOTE: Please would any committer updating this file also update the # make.conf(5) manual page, if necessary, which is located in @@ -36,7 +36,6 @@ # pentium3m pentium3 pentium-m pentium2 # pentiumpro pentium-mmx pentium i486 i386 # (Via CPUs) c3 c3-2 -# Alpha/AXP architecture: ev67 ev6 pca56 ev56 ev5 ev45 ev4 # AMD64 architecture: opteron, athlon64, nocona, prescott, core2 # Intel ia64 architecture: itanium2, itanium # ==== //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/mwlfw.4#2 (text+ko) ==== @@ -20,7 +20,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/share/man/man4/mwlfw.4,v 1.1 2009/06/10 03:35:40 sam Exp $ +.\" $FreeBSD: src/share/man/man4/mwlfw.4,v 1.2 2009/12/19 16:36:57 bcr Exp $ .\" .Dd June 9, 2009 .Dt MWLFW 4 @@ -49,4 +49,4 @@ statically linked into the kernel, or loaded as a module. .Sh SEE ALSO .Xr mwl 4 , -.Xr firmware 8 +.Xr firmware 9 ==== //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/psm.4#2 (text+ko) ==== @@ -24,7 +24,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/share/man/man4/psm.4,v 1.49 2008/04/08 17:55:25 jkim Exp $ +.\" $FreeBSD: src/share/man/man4/psm.4,v 1.50 2009/12/18 17:46:57 dumbbell Exp $ .\" .Dd April 8, 2008 .Dt PSM 4 @@ -359,6 +359,18 @@ This will enable .Nm to handle packets from guest devices (sticks) and extra buttons. +.Pp +Tap and drag gestures can be disabled by setting +.Va hw.psm.tap_enabled +to +.Em 0 +at boot-time. +Currently, this is only supported on Synaptics touchpads with Extended +support disabled. The behaviour may be changed after boot by setting +the sysctl with the same name and by restarting +.Xr moused 8 +using +.Pa /etc/rc.d/moused . .Sh IOCTLS There are a few .Xr ioctl 2 ==== //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/vge.4#3 (text+ko) ==== @@ -28,14 +28,14 @@ .\" 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/vge.4,v 1.12 2009/12/17 18:37:11 yongari Exp $ +.\" $FreeBSD: src/share/man/man4/vge.4,v 1.13 2009/12/18 18:45:36 yongari Exp $ .\" -.Dd December 17, 2009 +.Dd December 18, 2009 .Dt VGE 4 .Os .Sh NAME .Nm vge -.Nd "VIA Networking Technologies VT6122 PCI Gigabit Ethernet adapter driver" +.Nd "VIA Networking Technologies Velocity Gigabit Ethernet adapter driver" .Sh SYNOPSIS To compile this driver into the kernel, place the following lines in your @@ -55,22 +55,23 @@ The .Nm driver provides support for various NICs and embedded Ethernet interfaces -based on the VIA Networking Technologies VT6122 Gigabit Ethernet -controller chips. +based on the VIA Technologies VT6120, VT6122, VT6130 and VT6132 Velocity +Family Gigabit Ethernet controller chips. .Pp -The VT6122 is a 33/66Mhz 64-bit PCI device which combines a tri-speed MAC with -an integrated 10/100/1000 copper PHY. +The VT6120/VT6122 is a 33/66Mhz 64-bit PCI device which combines a tri-speed +MAC with an integrated 10/100/1000 copper PHY. (Some older cards use an external PHY.) +The VT6130/VT6132 is the PCI express version of Velocity family. The MAC supports TCP/IP hardware checksums (IPv4 only), TCP large send, VLAN tag insertion and stripping, as well as VLAN filtering, a 64-entry CAM filter and a 64-entry VLAN filter, 64-bit multicast hash filter, 4 separate transmit DMA queues, flow control and jumbo frames up to 16K in size. -The VT6122 has a 16K receive FIFO and 48K transmit FIFO. +The Velocity family controllers have a 16K receive FIFO and 48K transmit FIFO. .Pp The .Nm -driver takes advantage of the VT6122's checksum offload and VLAN +driver takes advantage of the controller's checksum offload and VLAN tagging features, as well as the jumbo frame and CAM filter support. The CAM filter is used for multicast address filtering to provide 64 perfect multicast address filter support. @@ -162,7 +163,7 @@ .Sh HARDWARE The .Nm -driver supports VIA Networking VT3119 and VT6122 based +driver supports VIA Networking VT6120, VT6122, VT6130 and VT6132 based Gigabit Ethernet adapters including: .Pp .Bl -bullet -compact ==== //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/watchdog.4#2 (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/watchdog.4,v 1.9 2007/03/29 10:11:22 des Exp $ +.\" $FreeBSD: src/share/man/man4/watchdog.4,v 1.11 2009/12/21 15:12:56 ru Exp $ .\" -.Dd June 25, 2003 +.Dd December 21, 2009 .Dt WATCHDOG 4 .Os .Sh NAME @@ -62,8 +62,10 @@ .Xr ioctl 2 call will return success if just one of the available .Xr watchdog 9 -implementations supports setting the timeout to the specified timeout. This -means that at least one watchdog is armed. If the call fails, for instance if +implementations supports setting the timeout to the specified timeout. +This +means that at least one watchdog is armed. +If the call fails, for instance if none of .Xr watchdog 9 implementations support the timeout length, all watchdogs are disabled and must @@ -71,19 +73,20 @@ .Pp To disable the watchdogs pass .Dv WD_TO_NEVER . -If disarming the watchdog(s) failed an error is returned. The watchdog might +If disarming the watchdog(s) failed an error is returned. +The watchdog might still be armed! .Sh RETURN VALUES The ioctl returns zero on success and non-zero on failure. .Bl -tag -width Er .It Bq Er EOPNOTSUPP -No watchdog present in the kernel (timeout value other than 0). +No watchdog present in the kernel or +none of the watchdogs supports the requested timeout value +(timeout value other than 0). .It Bq Er EOPNOTSUPP Watchdog could not be disabled (timeout value of 0). -.It Bq Er EINVALID +.It Bq Er EINVAL Invalid flag combination passed. -.It Bq Er EINVALID -None of the watchdogs supports the requested timeout value. .El .Sh EXAMPLES .Bd -literal -offset indent @@ -94,7 +97,7 @@ int wdfd = -1; static void -wd_init(void) +wd_init(void) { wdfd = open(WDPATH, O_RDWR); if (wdfd == -1) @@ -116,9 +119,7 @@ .Pp Enables a watchdog to recover from a potentially freezing piece of code. .Pp -.Bd -literal -offset indent -options SW_WATCHDOG -.Ed +.Dl "options SW_WATCHDOG" .Pp in your kernel config adds a software watchdog in the kernel, dropping to KDB or panic-ing when firing. @@ -130,10 +131,6 @@ .Nm code first appeared in .Fx 5.1 . -.Sh BUGS -The -.Dv WD_PASSIVE -option has not yet been implemented. .Sh AUTHORS .An -nosplit The @@ -144,3 +141,7 @@ .An Sean Kelly Aq smkelly@FreeBSD.org . Some contributions were made by .An Jeff Roberson Aq jeff@FreeBSD.org . +.Sh BUGS +The +.Dv WD_PASSIVE +option has not yet been implemented. ==== //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/conf/NOTES#16 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.98 2009/11/30 11:44:03 avg Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.99 2009/12/18 16:13:21 jhb Exp $ # # @@ -277,7 +277,6 @@ # iwn: Intel Wireless WiFi Link 4965AGN 802.11 network adapters # nfe: nVidia nForce MCP on-board Ethernet Networking (BSD open source) # nve: nVidia nForce MCP on-board Ethernet Networking -# ral: Ralink Technology IEEE 802.11 wireless adapter # wpi: Intel 3945ABG Wireless LAN controller device ed @@ -289,16 +288,8 @@ device ipw device nfe device nve -device ral device wpi -device ath # Atheros pci/cardbus NIC's -device ath_hal # pci/cardbus chip support -options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors -device ath_rate_sample # SampleRate tx rate control for ath -#device ath_rate_amrr # AMRR rate control for ath driver -#device ath_rate_onoe # Onoe rate control for ath driver - # #XXX this stores pointers in a 32bit field that is defined by the hardware #device pst ==== //depot/projects/soc2008/trasz_nfs4acl/sys/boot/pc98/kgzldr/crt.s#2 (text+ko) ==== @@ -24,7 +24,7 @@ # EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # # From: btx.s 1.10 1999/02/25 16:27:41 rnordier -# $FreeBSD: src/sys/boot/pc98/kgzldr/crt.s,v 1.5 2005/05/08 14:17:28 nyan Exp $ +# $FreeBSD: src/sys/boot/pc98/kgzldr/crt.s,v 1.6 2009/12/21 14:59:23 nyan Exp $ # # Screen defaults and assumptions. @@ -75,5 +75,15 @@ stosw # line movw $(SCR_ROW-1)*SCR_COL*2,%dx crt_putchr.4: movw %dx,(%ebx) # Update position + shrw $1,%dx +crt_putchr.5: inb $0x60,%al # Move cursor + testb $0x04,%al + jz crt_putchr.5 + movb $0x49,%al + outb %al,$0x62 + movb %dl,%al + outb %al,$0x60 + movb %dh,%al + outb %al,$0x60 popa # Restore ret # To caller ==== //depot/projects/soc2008/trasz_nfs4acl/sys/boot/uboot/lib/glue.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/uboot/lib/glue.c,v 1.10 2009/11/11 19:39:45 antoine Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/uboot/lib/glue.c,v 1.11 2009/12/18 21:12:37 marcel Exp $"); #include #include "api_public.h" @@ -568,17 +568,16 @@ const char *env, *str; int i; - env = NULL; - /* * It's OK to pass only the name piece as last (and not the whole * 'name=val' string), since the API_ENUM_ENV call uses envmatch() * internally, which handles such case */ - if (!syscall(API_ENV_ENUM, NULL, (uint32_t)last, (uint32_t)&env)) + env = NULL; + if (syscall(API_ENV_ENUM, NULL, (uint32_t)last, (uint32_t)&env) != 0) return (NULL); - if (!env) + if (env == NULL) /* no more env. variables to enumerate */ return (NULL); ==== //depot/projects/soc2008/trasz_nfs4acl/sys/cam/scsi/scsi_cd.c#10 (text+ko) ==== @@ -46,7 +46,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.115 2009/12/09 14:21:21 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.116 2009/12/18 14:41:30 mav Exp $"); #include "opt_cd.h" @@ -1464,8 +1464,6 @@ } else { bioq_remove(&softc->bio_queue, bp); - devstat_start_transaction_bio(softc->disk->d_devstat, bp); - scsi_read_write(&start_ccb->csio, /*retries*/cd_retry_count, /* cbfcnp */ cddone, ==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#3 (text+ko) ==== @@ -19,12 +19,10 @@ * CDDL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include #include #include @@ -108,19 +106,51 @@ int dmu_object_reclaim(objset_t *os, uint64_t object, dmu_object_type_t ot, - int blocksize, dmu_object_type_t bonustype, int bonuslen, dmu_tx_t *tx) + int blocksize, dmu_object_type_t bonustype, int bonuslen) { dnode_t *dn; + dmu_tx_t *tx; + int nblkptr; int err; - if (object == DMU_META_DNODE_OBJECT && !dmu_tx_private_ok(tx)) + if (object == DMU_META_DNODE_OBJECT) return (EBADF); err = dnode_hold_impl(os->os, object, DNODE_MUST_BE_ALLOCATED, FTAG, &dn); if (err) return (err); + + if (dn->dn_type == ot && dn->dn_datablksz == blocksize && + dn->dn_bonustype == bonustype && dn->dn_bonuslen == bonuslen) { + /* nothing is changing, this is a noop */ + dnode_rele(dn, FTAG); + return (0); + } + + tx = dmu_tx_create(os); + dmu_tx_hold_bonus(tx, object); + err = dmu_tx_assign(tx, TXG_WAIT); + if (err) { + dmu_tx_abort(tx); + dnode_rele(dn, FTAG); + return (err); + } + + nblkptr = 1 + ((DN_MAX_BONUSLEN - bonuslen) >> SPA_BLKPTRSHIFT); + + /* + * If we are losing blkptrs or changing the block size this must + * be a new file instance. We must clear out the previous file + * contents before we can change this type of metadata in the dnode. + */ + if (dn->dn_nblkptr > nblkptr || dn->dn_datablksz != blocksize) + dmu_free_long_range(os, object, 0, DMU_OBJECT_END); + dnode_reallocate(dn, ot, blocksize, bonustype, bonuslen, tx); + + dmu_tx_commit(tx); + dnode_rele(dn, FTAG); return (0); ==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#4 (text+ko) ==== @@ -828,12 +828,8 @@ { int err; dmu_tx_t *tx; - - err = dmu_object_info(os, drro->drr_object, NULL); + void *data = NULL; - if (err != 0 && err != ENOENT) - return (EINVAL); - if (drro->drr_type == DMU_OT_NONE || drro->drr_type >= DMU_OT_NUMTYPES || drro->drr_bonustype >= DMU_OT_NUMTYPES || @@ -846,12 +842,15 @@ return (EINVAL); } - tx = dmu_tx_create(os); + err = dmu_object_info(os, drro->drr_object, NULL); + + if (err != 0 && err != ENOENT) + return (EINVAL); if (err == ENOENT) { /* currently free, want to be allocated */ + tx = dmu_tx_create(os); dmu_tx_hold_bonus(tx, DMU_NEW_OBJECT); - dmu_tx_hold_write(tx, DMU_NEW_OBJECT, 0, 1); err = dmu_tx_assign(tx, TXG_WAIT); if (err) { dmu_tx_abort(tx); @@ -860,45 +859,41 @@ err = dmu_object_claim(os, drro->drr_object, drro->drr_type, drro->drr_blksz, drro->drr_bonustype, drro->drr_bonuslen, tx); + dmu_tx_commit(tx); } else { /* currently allocated, want to be allocated */ - dmu_tx_hold_bonus(tx, drro->drr_object); - /* - * We may change blocksize and delete old content, - * so need to hold_write and hold_free. - */ - dmu_tx_hold_write(tx, drro->drr_object, 0, 1); - dmu_tx_hold_free(tx, drro->drr_object, 0, DMU_OBJECT_END); - err = dmu_tx_assign(tx, TXG_WAIT); - if (err) { - dmu_tx_abort(tx); - return (err); - } err = dmu_object_reclaim(os, drro->drr_object, drro->drr_type, drro->drr_blksz, - drro->drr_bonustype, drro->drr_bonuslen, tx); + drro->drr_bonustype, drro->drr_bonuslen); + } + if (err) + return (EINVAL); + + if (drro->drr_bonuslen) { + data = restore_read(ra, P2ROUNDUP(drro->drr_bonuslen, 8)); + if (ra->err) + return (ra->err); } + + tx = dmu_tx_create(os); + dmu_tx_hold_bonus(tx, drro->drr_object); + err = dmu_tx_assign(tx, TXG_WAIT); if (err) { - dmu_tx_commit(tx); - return (EINVAL); + dmu_tx_abort(tx); + return (err); } dmu_object_set_checksum(os, drro->drr_object, drro->drr_checksum, tx); dmu_object_set_compress(os, drro->drr_object, drro->drr_compress, tx); - if (drro->drr_bonuslen) { + if (data != NULL) { dmu_buf_t *db; - void *data; + VERIFY(0 == dmu_bonus_hold(os, drro->drr_object, FTAG, &db)); dmu_buf_will_dirty(db, tx); ASSERT3U(db->db_size, >=, drro->drr_bonuslen); - data = restore_read(ra, P2ROUNDUP(drro->drr_bonuslen, 8)); - if (data == NULL) { - dmu_tx_commit(tx); - return (ra->err); - } bcopy(data, db->db_data, drro->drr_bonuslen); if (ra->byteswap) { dmu_ot[drro->drr_bonustype].ot_byteswap(db->db_data, ==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#4 (text+ko) ==== @@ -415,8 +415,7 @@ dnode_reallocate(dnode_t *dn, dmu_object_type_t ot, int blocksize, dmu_object_type_t bonustype, int bonuslen, dmu_tx_t *tx) { - int i, nblkptr; - dmu_buf_impl_t *db = NULL; + int nblkptr; ASSERT3U(blocksize, >=, SPA_MINBLOCKSIZE); ASSERT3U(blocksize, <=, SPA_MAXBLOCKSIZE); @@ -428,42 +427,25 @@ ASSERT3U(bonustype, <, DMU_OT_NUMTYPES); ASSERT3U(bonuslen, <=, DN_MAX_BONUSLEN); - for (i = 0; i < TXG_SIZE; i++) - ASSERT(!list_link_active(&dn->dn_dirty_link[i])); - /* clean up any unreferenced dbufs */ dnode_evict_dbufs(dn); - ASSERT3P(list_head(&dn->dn_dbufs), ==, NULL); - /* - * XXX I should really have a generation number to tell if we - * need to do this... - */ - if (blocksize != dn->dn_datablksz || - dn->dn_bonustype != bonustype || dn->dn_bonuslen != bonuslen) { - /* free all old data */ - dnode_free_range(dn, 0, -1ULL, tx); + rw_enter(&dn->dn_struct_rwlock, RW_WRITER); + dnode_setdirty(dn, tx); + if (dn->dn_datablksz != blocksize) { + /* change blocksize */ + ASSERT(dn->dn_maxblkid == 0 && + (BP_IS_HOLE(&dn->dn_phys->dn_blkptr[0]) || + dnode_block_freed(dn, 0))); + dnode_setdblksz(dn, blocksize); + dn->dn_next_blksz[tx->tx_txg&TXG_MASK] = blocksize; } - + if (dn->dn_bonuslen != bonuslen) + dn->dn_next_bonuslen[tx->tx_txg&TXG_MASK] = bonuslen; nblkptr = 1 + ((DN_MAX_BONUSLEN - bonuslen) >> SPA_BLKPTRSHIFT); - - /* change blocksize */ - rw_enter(&dn->dn_struct_rwlock, RW_WRITER); - if (blocksize != dn->dn_datablksz && - (!BP_IS_HOLE(&dn->dn_phys->dn_blkptr[0]) || - list_head(&dn->dn_dbufs) != NULL)) { - db = dbuf_hold(dn, 0, FTAG); - dbuf_new_size(db, blocksize, tx); - } - dnode_setdblksz(dn, blocksize); - dnode_setdirty(dn, tx); - dn->dn_next_bonuslen[tx->tx_txg&TXG_MASK] = bonuslen; - dn->dn_next_blksz[tx->tx_txg&TXG_MASK] = blocksize; if (dn->dn_nblkptr != nblkptr) dn->dn_next_nblkptr[tx->tx_txg&TXG_MASK] = nblkptr; rw_exit(&dn->dn_struct_rwlock); - if (db) - dbuf_rele(db, FTAG); /* change type */ dn->dn_type = ot; @@ -1187,11 +1169,6 @@ if (dn->dn_free_txg) return (TRUE); - /* - * If dn_datablkshift is not set, then there's only a single - * block, in which case there will never be a free range so it - * won't matter. - */ range_tofind.fr_blkid = blkid; mutex_enter(&dn->dn_mtx); for (i = 0; i < TXG_SIZE; i++) { ==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#4 (text+ko) ==== @@ -19,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -237,7 +237,7 @@ int dmu_object_claim(objset_t *os, uint64_t object, dmu_object_type_t ot, int blocksize, dmu_object_type_t bonus_type, int bonus_len, dmu_tx_t *tx); int dmu_object_reclaim(objset_t *os, uint64_t object, dmu_object_type_t ot, - int blocksize, dmu_object_type_t bonustype, int bonuslen, dmu_tx_t *tx); + int blocksize, dmu_object_type_t bonustype, int bonuslen); /* * Free an object from this objset. ==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#3 (text+ko) ==== @@ -19,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -56,10 +56,16 @@ uint64_t zh_replay_seq; /* highest replayed sequence number */ blkptr_t zh_log; /* log chain */ uint64_t zh_claim_seq; /* highest claimed sequence number */ - uint64_t zh_pad[5]; + uint64_t zh_flags; /* header flags */ + uint64_t zh_pad[4]; } zil_header_t; /* + * zh_flags bit settings + */ +#define ZIL_REPLAY_NEEDED 0x1 /* replay needed - internal only */ + +/* * Log block trailer - structure at the end of the header and each log block * * The zit_bt contains a zbt_cksum which for the intent log is ==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#4 (text+ko) ==== @@ -502,6 +502,25 @@ tx, zh->zh_claim_txg); } +/* + * return true if the initial log block is not valid + */ +static boolean_t +zil_empty(zilog_t *zilog) +{ + const zil_header_t *zh = zilog->zl_header; + arc_buf_t *abuf = NULL; + + if (BP_IS_HOLE(&zh->zh_log)) + return (B_TRUE); + + if (zil_read_log_block(zilog, &zh->zh_log, &abuf) != 0) + return (B_TRUE); + + VERIFY(arc_buf_remove_ref(abuf, &abuf) == 1); + return (B_FALSE); +} + int zil_claim(char *osname, void *txarg) { @@ -522,6 +541,21 @@ zh = zil_header_in_syncing_context(zilog); /* + * Record here whether the zil has any records to replay. + * If the header block pointer is null or the block points + * to the stubby then we know there are no valid log records. + * We use the header to store this state as the the zilog gets + * freed later in dmu_objset_close(). + * The flags (and the rest of the header fields) are cleared in + * zil_sync() as a result of a zil_destroy(), after replaying the log. + * + * Note, the intent log can be empty but still need the + * stubby to be claimed. + */ + if (!zil_empty(zilog)) + zh->zh_flags |= ZIL_REPLAY_NEEDED; + + /* * Claim all log blocks if we haven't already done so, and remember * the highest claimed sequence number. This ensures that if we can * read only part of the log now (e.g. due to a missing device), @@ -1345,25 +1379,6 @@ } /* - * return true if the initial log block is not valid - */ -static boolean_t -zil_empty(zilog_t *zilog) -{ - const zil_header_t *zh = zilog->zl_header; - arc_buf_t *abuf = NULL; - - if (BP_IS_HOLE(&zh->zh_log)) - return (B_TRUE); - - if (zil_read_log_block(zilog, &zh->zh_log, &abuf) != 0) - return (B_TRUE); - - VERIFY(arc_buf_remove_ref(abuf, &abuf) == 1); - return (B_FALSE); -} - -/* * Open an intent log. */ zilog_t * @@ -1418,7 +1433,7 @@ const zil_header_t *zh = zilog->zl_header; mutex_enter(&zilog->zl_lock); - if (zh->zh_claim_txg != 0) { /* unplayed log */ + if (zh->zh_flags & ZIL_REPLAY_NEEDED) { /* unplayed log */ mutex_exit(&zilog->zl_lock); return (EBUSY); } @@ -1645,7 +1660,7 @@ const zil_header_t *zh = zilog->zl_header; zil_replay_arg_t zr; - if (zil_empty(zilog)) { + if ((zh->zh_flags & ZIL_REPLAY_NEEDED) == 0) { zil_destroy(zilog, B_TRUE); return; } ==== //depot/projects/soc2008/trasz_nfs4acl/sys/compat/linux/linux_signal.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_signal.c,v 1.67 2009/06/27 13:58:44 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_signal.c,v 1.68 2009/12/18 14:27:18 kib Exp $"); #include #include @@ -565,7 +565,7 @@ AUDIT_ARG_PROCESS(p); error = p_cansignal(td, p, signum); - if (error) + if (error != 0 || signum == 0) goto out; error = ESRCH; ==== //depot/projects/soc2008/trasz_nfs4acl/sys/conf/NOTES#44 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1567 2009/12/16 16:24:32 jhb Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1568 2009/12/18 16:13:21 jhb Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -1862,6 +1862,7 @@ # L1 PCI express gigabit ethernet controllers. # alc: Support for Atheros AR8131/AR8132 PCIe ethernet controllers. # ale: Support for Atheros AR8121/AR8113/AR8114 PCIe ethernet controllers. +# ath: Atheros a/b/g WiFi adapters (requires ath_hal and wlan) # bce: Broadcom NetXtreme II (BCM5706/BCM5708) PCI/PCIe Gigabit Ethernet # adapters. # bfe: Broadcom BCM4401 Ethernet adapter. @@ -1920,6 +1921,7 @@ # pcn(4) driver is left out of the kernel. The le(4) driver does not # support the additional features like the MII bus and burst mode of # the PCnet-FAST and greater chipsets though. +# ral: Ralink Technology IEEE 802.11 wireless adapter # re: RealTek 8139C+/8169/816xS/811xS/8101E PCI/PCIe Ethernet adapter # rl: Support for PCI fast ethernet adapters based on the RealTek 8129/8139 # chipset. Note that the RealTek driver defaults to using programmed @@ -2039,7 +2041,6 @@ device xl # 3Com 3c90x (``Boomerang'', ``Cyclone'') # PCI Ethernet NICs. -device bwi # Broadcom BCM430* BCM431* device de # DEC/Intel DC21x4x (``Tulip'') device em # Intel Pro/1000 Gigabit Ethernet >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Dec 21 20:33:44 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 16A981065679; Mon, 21 Dec 2009 20:33:44 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CD7FE1065672 for ; Mon, 21 Dec 2009 20:33:43 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B8AC58FC13 for ; Mon, 21 Dec 2009 20:33:43 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nBLKXh35070400 for ; Mon, 21 Dec 2009 20:33:43 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nBLKXhDQ070398 for perforce@freebsd.org; Mon, 21 Dec 2009 20:33:43 GMT (envelope-from trasz@freebsd.org) Date: Mon, 21 Dec 2009 20:33:43 GMT Message-Id: <200912212033.nBLKXhDQ070398@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 172039 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Dec 2009 20:33:44 -0000 http://p4web.freebsd.org/chv.cgi?CH=172039 Change 172039 by trasz@trasz_victim on 2009/12/21 20:33:31 IFC. Affected files ... .. //depot/projects/soc2009/trasz_limits/UPDATING#17 integrate .. //depot/projects/soc2009/trasz_limits/bin/pax/sel_subs.c#2 integrate .. //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/cmd/zdb/zdb_il.c#2 integrate .. //depot/projects/soc2009/trasz_limits/release/Makefile#6 integrate .. //depot/projects/soc2009/trasz_limits/share/examples/etc/make.conf#2 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man4/mwlfw.4#2 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man4/psm.4#2 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man4/vge.4#3 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man4/watchdog.4#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/amd64/conf/NOTES#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/boot/pc98/kgzldr/crt.s#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/boot/uboot/lib/glue.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/cam/scsi/scsi_cd.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/compat/linux/linux_signal.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/conf/NOTES#15 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/agp/agp_via.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ata/ata-pci.h#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ata/chipsets/ata-ite.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ata/chipsets/ata-via.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/atkbdc/psm.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/e1000/if_igb.c#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/hwpmc/hwpmc_intel.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ipmi/ipmi.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/mii/ip1000phy.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ste/if_ste.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ste/if_stereg.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/vge/if_vge.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/vge/if_vgereg.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/vge/if_vgevar.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/devfs/devfs_vnops.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/i386/conf/NOTES#10 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_exit.c#17 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_proc.c#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/subr_acl_nfs4.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/subr_turnstile.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/tty_pts.c#11 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/vfs_subr.c#10 integrate .. //depot/projects/soc2009/trasz_limits/sys/net/if_var.h#12 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/ipfw/ip_fw_table.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/pc98/conf/NOTES#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/powerpc/booke/clock.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/mount.h#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/proc.h#16 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/vnode.h#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/ufs/ffs/ffs_rawread.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/ufs/ffs/ffs_vfsops.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/ufs/ffs/fs.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/ufs/ufs/acl.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/ufs/ufs/ufs_acl.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/ufs/ufs/ufs_lookup.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/ufs/ufs/ufs_vnops.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/vm/vm_object.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/vm/vm_object.h#6 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/finger/finger.c#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/sockstat/sockstat.1#3 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/truss/amd64-fbsd32.c#4 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/truss/i386-fbsd.c#4 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/truss/main.c#4 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/truss/syscalls.c#3 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/Makefile#9 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/burncd/burncd.8#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/burncd/burncd.c#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/mergemaster/mergemaster.sh#5 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/service/Makefile#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/service/service.8#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/service/service.sh#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/watchdogd/watchdogd.c#2 integrate Differences ... ==== //depot/projects/soc2009/trasz_limits/UPDATING#17 (text+ko) ==== @@ -22,6 +22,19 @@ machines to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20091202: + The rc.firewall and rc.firewall6 were unified, and + rc.firewall6 and rc.d/ip6fw were removed. + According to the removal of rc.d/ip6fw, ipv6_firewall_* rc + variables are obsoleted. Instead, the following new rc + variables are added to rc.d/ipfw: + + firewall_client_net_ipv6, firewall_simple_iif_ipv6, + firewall_simple_inet_ipv6, firewall_simple_oif_ipv6, + firewall_simple_onet_ipv6, firewall_trusted_ipv6 + + The meanings correspond to the relevant IPv4 variables. + 20091113: The default terminal emulation for syscons(4) has been changed from cons25 to xterm on all platforms except pc98. This means @@ -1076,4 +1089,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.648 2009/11/21 01:43:22 dougb Exp $ +$FreeBSD: src/UPDATING,v 1.649 2009/12/18 16:35:28 ume Exp $ ==== //depot/projects/soc2009/trasz_limits/bin/pax/sel_subs.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/pax/sel_subs.c,v 1.21 2007/05/25 17:53:38 brian Exp $"); +__FBSDID("$FreeBSD: src/bin/pax/sel_subs.c,v 1.22 2009/12/21 19:18:27 delphij Exp $"); #include #include @@ -396,6 +396,7 @@ default: paxwarn(1, "Bad option %c with time range %s", *flgpt, str); + free(pt); goto out; } ++flgpt; ==== //depot/projects/soc2009/trasz_limits/cddl/contrib/opensolaris/cmd/zdb/zdb_il.c#2 (text+ko) ==== @@ -19,12 +19,10 @@ * CDDL HEADER END */ /* - * Copyright 2007 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - /* * Print intent log header and statistics. */ @@ -345,8 +343,10 @@ if (zh->zh_log.blk_birth == 0 || verbose < 2) return; - (void) printf("\n ZIL header: claim_txg %llu, seq %llu\n", - (u_longlong_t)zh->zh_claim_txg, (u_longlong_t)zh->zh_replay_seq); + (void) printf("\n ZIL header: claim_txg %llu, claim_seq %llu", + (u_longlong_t)zh->zh_claim_txg, (u_longlong_t)zh->zh_claim_seq); + (void) printf(" replay_seq %llu, flags 0x%llx\n", + (u_longlong_t)zh->zh_replay_seq, (u_longlong_t)zh->zh_flags); if (verbose >= 4) print_log_bp(&zh->zh_log, "\n\tfirst block: "); ==== //depot/projects/soc2009/trasz_limits/release/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.949 2009/09/18 14:53:01 kensmith Exp $ +# $FreeBSD: src/release/Makefile,v 1.950 2009/12/21 14:42:35 kensmith Exp $ # # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \ # [RELEASETAG=tag] [SVNROOT=svn://svn.freebsd.org/base] \ @@ -1128,36 +1128,36 @@ .if defined(CD_BOOT) @sh ${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh ${BOOTABLE} \ FreeBSD_bootonly \ - ${CD}/${BUILDNAME}-${TARGET}-bootonly.iso ${CD_BOOT} + ${CD}/FreeBSD-${BUILDNAME}-${TARGET}-bootonly.iso ${CD_BOOT} .endif @sh ${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh ${BOOTABLE} \ FreeBSD_Install \ - ${CD}/${BUILDNAME}-${TARGET}-disc1.iso ${CD_DISC1} \ + ${CD}/FreeBSD-${BUILDNAME}-${TARGET}-disc1.iso ${CD_DISC1} \ ${CD_DISC1_PKGS} @sh ${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh \ FreeBSD_Packages \ - ${CD}/${BUILDNAME}-${TARGET}-disc2.iso ${CD_DISC2} \ + ${CD}/FreeBSD-${BUILDNAME}-${TARGET}-disc2.iso ${CD_DISC2} \ ${CD_DISC2_PKGS} .if defined(MAKE_DVD) @sh ${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh ${BOOTABLE} \ FreeBSD_Install \ - ${CD}/${BUILDNAME}-${TARGET}-dvd1.iso ${CD_DVD1} \ + ${CD}/FreeBSD-${BUILDNAME}-${TARGET}-dvd1.iso ${CD_DVD1} \ ${CD_DVD1_PKGS} .endif .if !defined(NODOC) @sh ${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh \ FreeBSD_Documentation \ - ${CD}/${BUILDNAME}-${TARGET}-disc3.iso ${CD_DOCS} \ + ${CD}/FreeBSD-${BUILDNAME}-${TARGET}-disc3.iso ${CD_DOCS} \ ${CD_DOCS_PKGS} .endif .if defined(SEPARATE_LIVEFS) @sh ${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh ${BOOTABLE} \ FreeBSD_LiveFS \ - ${CD}/${BUILDNAME}-${TARGET}-livefs.iso ${CD_LIVEFS} + ${CD}/FreeBSD-${BUILDNAME}-${TARGET}-livefs.iso ${CD_LIVEFS} .endif @echo "Generating MD5 and SHA256 sums..." - @(cd ${CD} && md5 *.iso > ${BUILDNAME}-${TARGET}-iso.CHECKSUM.MD5) - @(cd ${CD} && sha256 *.iso > ${BUILDNAME}-${TARGET}-iso.CHECKSUM.SHA256) + @(cd ${CD} && md5 *.iso > FreeBSD-${BUILDNAME}-${TARGET}-iso.CHECKSUM.MD5) + @(cd ${CD} && sha256 *.iso > FreeBSD-${BUILDNAME}-${TARGET}-iso.CHECKSUM.SHA256) touch ${.TARGET} .else @echo "Do not know how to create an ISO for ${TARGET_ARCH}." ==== //depot/projects/soc2009/trasz_limits/share/examples/etc/make.conf#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/examples/etc/make.conf,v 1.279 2007/01/17 12:43:06 des Exp $ +# $FreeBSD: src/share/examples/etc/make.conf,v 1.280 2009/12/21 12:32:13 ru Exp $ # # NOTE: Please would any committer updating this file also update the # make.conf(5) manual page, if necessary, which is located in @@ -36,7 +36,6 @@ # pentium3m pentium3 pentium-m pentium2 # pentiumpro pentium-mmx pentium i486 i386 # (Via CPUs) c3 c3-2 -# Alpha/AXP architecture: ev67 ev6 pca56 ev56 ev5 ev45 ev4 # AMD64 architecture: opteron, athlon64, nocona, prescott, core2 # Intel ia64 architecture: itanium2, itanium # ==== //depot/projects/soc2009/trasz_limits/share/man/man4/mwlfw.4#2 (text+ko) ==== @@ -20,7 +20,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/share/man/man4/mwlfw.4,v 1.1 2009/06/10 03:35:40 sam Exp $ +.\" $FreeBSD: src/share/man/man4/mwlfw.4,v 1.2 2009/12/19 16:36:57 bcr Exp $ .\" .Dd June 9, 2009 .Dt MWLFW 4 @@ -49,4 +49,4 @@ statically linked into the kernel, or loaded as a module. .Sh SEE ALSO .Xr mwl 4 , -.Xr firmware 8 +.Xr firmware 9 ==== //depot/projects/soc2009/trasz_limits/share/man/man4/psm.4#2 (text+ko) ==== @@ -24,7 +24,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/share/man/man4/psm.4,v 1.49 2008/04/08 17:55:25 jkim Exp $ +.\" $FreeBSD: src/share/man/man4/psm.4,v 1.50 2009/12/18 17:46:57 dumbbell Exp $ .\" .Dd April 8, 2008 .Dt PSM 4 @@ -359,6 +359,18 @@ This will enable .Nm to handle packets from guest devices (sticks) and extra buttons. +.Pp +Tap and drag gestures can be disabled by setting +.Va hw.psm.tap_enabled +to +.Em 0 +at boot-time. +Currently, this is only supported on Synaptics touchpads with Extended +support disabled. The behaviour may be changed after boot by setting +the sysctl with the same name and by restarting +.Xr moused 8 +using +.Pa /etc/rc.d/moused . .Sh IOCTLS There are a few .Xr ioctl 2 ==== //depot/projects/soc2009/trasz_limits/share/man/man4/vge.4#3 (text+ko) ==== @@ -28,14 +28,14 @@ .\" 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/vge.4,v 1.12 2009/12/17 18:37:11 yongari Exp $ +.\" $FreeBSD: src/share/man/man4/vge.4,v 1.13 2009/12/18 18:45:36 yongari Exp $ .\" -.Dd December 17, 2009 +.Dd December 18, 2009 .Dt VGE 4 .Os .Sh NAME .Nm vge -.Nd "VIA Networking Technologies VT6122 PCI Gigabit Ethernet adapter driver" +.Nd "VIA Networking Technologies Velocity Gigabit Ethernet adapter driver" .Sh SYNOPSIS To compile this driver into the kernel, place the following lines in your @@ -55,22 +55,23 @@ The .Nm driver provides support for various NICs and embedded Ethernet interfaces -based on the VIA Networking Technologies VT6122 Gigabit Ethernet -controller chips. +based on the VIA Technologies VT6120, VT6122, VT6130 and VT6132 Velocity +Family Gigabit Ethernet controller chips. .Pp -The VT6122 is a 33/66Mhz 64-bit PCI device which combines a tri-speed MAC with -an integrated 10/100/1000 copper PHY. +The VT6120/VT6122 is a 33/66Mhz 64-bit PCI device which combines a tri-speed +MAC with an integrated 10/100/1000 copper PHY. (Some older cards use an external PHY.) +The VT6130/VT6132 is the PCI express version of Velocity family. The MAC supports TCP/IP hardware checksums (IPv4 only), TCP large send, VLAN tag insertion and stripping, as well as VLAN filtering, a 64-entry CAM filter and a 64-entry VLAN filter, 64-bit multicast hash filter, 4 separate transmit DMA queues, flow control and jumbo frames up to 16K in size. -The VT6122 has a 16K receive FIFO and 48K transmit FIFO. +The Velocity family controllers have a 16K receive FIFO and 48K transmit FIFO. .Pp The .Nm -driver takes advantage of the VT6122's checksum offload and VLAN +driver takes advantage of the controller's checksum offload and VLAN tagging features, as well as the jumbo frame and CAM filter support. The CAM filter is used for multicast address filtering to provide 64 perfect multicast address filter support. @@ -162,7 +163,7 @@ .Sh HARDWARE The .Nm -driver supports VIA Networking VT3119 and VT6122 based +driver supports VIA Networking VT6120, VT6122, VT6130 and VT6132 based Gigabit Ethernet adapters including: .Pp .Bl -bullet -compact ==== //depot/projects/soc2009/trasz_limits/share/man/man4/watchdog.4#2 (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/watchdog.4,v 1.9 2007/03/29 10:11:22 des Exp $ +.\" $FreeBSD: src/share/man/man4/watchdog.4,v 1.11 2009/12/21 15:12:56 ru Exp $ .\" -.Dd June 25, 2003 +.Dd December 21, 2009 .Dt WATCHDOG 4 .Os .Sh NAME @@ -62,8 +62,10 @@ .Xr ioctl 2 call will return success if just one of the available .Xr watchdog 9 -implementations supports setting the timeout to the specified timeout. This -means that at least one watchdog is armed. If the call fails, for instance if +implementations supports setting the timeout to the specified timeout. +This +means that at least one watchdog is armed. +If the call fails, for instance if none of .Xr watchdog 9 implementations support the timeout length, all watchdogs are disabled and must @@ -71,19 +73,20 @@ .Pp To disable the watchdogs pass .Dv WD_TO_NEVER . -If disarming the watchdog(s) failed an error is returned. The watchdog might +If disarming the watchdog(s) failed an error is returned. +The watchdog might still be armed! .Sh RETURN VALUES The ioctl returns zero on success and non-zero on failure. .Bl -tag -width Er .It Bq Er EOPNOTSUPP -No watchdog present in the kernel (timeout value other than 0). +No watchdog present in the kernel or +none of the watchdogs supports the requested timeout value +(timeout value other than 0). .It Bq Er EOPNOTSUPP Watchdog could not be disabled (timeout value of 0). -.It Bq Er EINVALID +.It Bq Er EINVAL Invalid flag combination passed. -.It Bq Er EINVALID -None of the watchdogs supports the requested timeout value. .El .Sh EXAMPLES .Bd -literal -offset indent @@ -94,7 +97,7 @@ int wdfd = -1; static void -wd_init(void) +wd_init(void) { wdfd = open(WDPATH, O_RDWR); if (wdfd == -1) @@ -116,9 +119,7 @@ .Pp Enables a watchdog to recover from a potentially freezing piece of code. .Pp -.Bd -literal -offset indent -options SW_WATCHDOG -.Ed +.Dl "options SW_WATCHDOG" .Pp in your kernel config adds a software watchdog in the kernel, dropping to KDB or panic-ing when firing. @@ -130,10 +131,6 @@ .Nm code first appeared in .Fx 5.1 . -.Sh BUGS -The -.Dv WD_PASSIVE -option has not yet been implemented. .Sh AUTHORS .An -nosplit The @@ -144,3 +141,7 @@ .An Sean Kelly Aq smkelly@FreeBSD.org . Some contributions were made by .An Jeff Roberson Aq jeff@FreeBSD.org . +.Sh BUGS +The +.Dv WD_PASSIVE +option has not yet been implemented. ==== //depot/projects/soc2009/trasz_limits/sys/amd64/conf/NOTES#9 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.98 2009/11/30 11:44:03 avg Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.99 2009/12/18 16:13:21 jhb Exp $ # # @@ -277,7 +277,6 @@ # iwn: Intel Wireless WiFi Link 4965AGN 802.11 network adapters # nfe: nVidia nForce MCP on-board Ethernet Networking (BSD open source) # nve: nVidia nForce MCP on-board Ethernet Networking -# ral: Ralink Technology IEEE 802.11 wireless adapter # wpi: Intel 3945ABG Wireless LAN controller device ed @@ -289,16 +288,8 @@ device ipw device nfe device nve -device ral device wpi -device ath # Atheros pci/cardbus NIC's -device ath_hal # pci/cardbus chip support -options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors -device ath_rate_sample # SampleRate tx rate control for ath -#device ath_rate_amrr # AMRR rate control for ath driver -#device ath_rate_onoe # Onoe rate control for ath driver - # #XXX this stores pointers in a 32bit field that is defined by the hardware #device pst ==== //depot/projects/soc2009/trasz_limits/sys/boot/pc98/kgzldr/crt.s#2 (text+ko) ==== @@ -24,7 +24,7 @@ # EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # # From: btx.s 1.10 1999/02/25 16:27:41 rnordier -# $FreeBSD: src/sys/boot/pc98/kgzldr/crt.s,v 1.5 2005/05/08 14:17:28 nyan Exp $ +# $FreeBSD: src/sys/boot/pc98/kgzldr/crt.s,v 1.6 2009/12/21 14:59:23 nyan Exp $ # # Screen defaults and assumptions. @@ -75,5 +75,15 @@ stosw # line movw $(SCR_ROW-1)*SCR_COL*2,%dx crt_putchr.4: movw %dx,(%ebx) # Update position + shrw $1,%dx +crt_putchr.5: inb $0x60,%al # Move cursor + testb $0x04,%al + jz crt_putchr.5 + movb $0x49,%al + outb %al,$0x62 + movb %dl,%al + outb %al,$0x60 + movb %dh,%al + outb %al,$0x60 popa # Restore ret # To caller ==== //depot/projects/soc2009/trasz_limits/sys/boot/uboot/lib/glue.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/uboot/lib/glue.c,v 1.10 2009/11/11 19:39:45 antoine Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/uboot/lib/glue.c,v 1.11 2009/12/18 21:12:37 marcel Exp $"); #include #include "api_public.h" @@ -568,17 +568,16 @@ const char *env, *str; int i; - env = NULL; - /* * It's OK to pass only the name piece as last (and not the whole * 'name=val' string), since the API_ENUM_ENV call uses envmatch() * internally, which handles such case */ - if (!syscall(API_ENV_ENUM, NULL, (uint32_t)last, (uint32_t)&env)) + env = NULL; + if (syscall(API_ENV_ENUM, NULL, (uint32_t)last, (uint32_t)&env) != 0) return (NULL); - if (!env) + if (env == NULL) /* no more env. variables to enumerate */ return (NULL); ==== //depot/projects/soc2009/trasz_limits/sys/cam/scsi/scsi_cd.c#5 (text+ko) ==== @@ -46,7 +46,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.115 2009/12/09 14:21:21 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.116 2009/12/18 14:41:30 mav Exp $"); #include "opt_cd.h" @@ -1464,8 +1464,6 @@ } else { bioq_remove(&softc->bio_queue, bp); - devstat_start_transaction_bio(softc->disk->d_devstat, bp); - scsi_read_write(&start_ccb->csio, /*retries*/cd_retry_count, /* cbfcnp */ cddone, ==== //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#2 (text+ko) ==== @@ -19,12 +19,10 @@ * CDDL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include #include #include @@ -108,19 +106,51 @@ int dmu_object_reclaim(objset_t *os, uint64_t object, dmu_object_type_t ot, - int blocksize, dmu_object_type_t bonustype, int bonuslen, dmu_tx_t *tx) + int blocksize, dmu_object_type_t bonustype, int bonuslen) { dnode_t *dn; + dmu_tx_t *tx; + int nblkptr; int err; - if (object == DMU_META_DNODE_OBJECT && !dmu_tx_private_ok(tx)) + if (object == DMU_META_DNODE_OBJECT) return (EBADF); err = dnode_hold_impl(os->os, object, DNODE_MUST_BE_ALLOCATED, FTAG, &dn); if (err) return (err); + + if (dn->dn_type == ot && dn->dn_datablksz == blocksize && + dn->dn_bonustype == bonustype && dn->dn_bonuslen == bonuslen) { + /* nothing is changing, this is a noop */ + dnode_rele(dn, FTAG); + return (0); + } + + tx = dmu_tx_create(os); + dmu_tx_hold_bonus(tx, object); + err = dmu_tx_assign(tx, TXG_WAIT); + if (err) { + dmu_tx_abort(tx); + dnode_rele(dn, FTAG); + return (err); + } + + nblkptr = 1 + ((DN_MAX_BONUSLEN - bonuslen) >> SPA_BLKPTRSHIFT); + + /* + * If we are losing blkptrs or changing the block size this must + * be a new file instance. We must clear out the previous file + * contents before we can change this type of metadata in the dnode. + */ + if (dn->dn_nblkptr > nblkptr || dn->dn_datablksz != blocksize) + dmu_free_long_range(os, object, 0, DMU_OBJECT_END); + dnode_reallocate(dn, ot, blocksize, bonustype, bonuslen, tx); + + dmu_tx_commit(tx); + dnode_rele(dn, FTAG); return (0); ==== //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#3 (text+ko) ==== @@ -828,12 +828,8 @@ { int err; dmu_tx_t *tx; - - err = dmu_object_info(os, drro->drr_object, NULL); + void *data = NULL; - if (err != 0 && err != ENOENT) - return (EINVAL); - if (drro->drr_type == DMU_OT_NONE || drro->drr_type >= DMU_OT_NUMTYPES || drro->drr_bonustype >= DMU_OT_NUMTYPES || @@ -846,12 +842,15 @@ return (EINVAL); } - tx = dmu_tx_create(os); + err = dmu_object_info(os, drro->drr_object, NULL); + + if (err != 0 && err != ENOENT) + return (EINVAL); if (err == ENOENT) { /* currently free, want to be allocated */ + tx = dmu_tx_create(os); dmu_tx_hold_bonus(tx, DMU_NEW_OBJECT); - dmu_tx_hold_write(tx, DMU_NEW_OBJECT, 0, 1); err = dmu_tx_assign(tx, TXG_WAIT); if (err) { dmu_tx_abort(tx); @@ -860,45 +859,41 @@ err = dmu_object_claim(os, drro->drr_object, drro->drr_type, drro->drr_blksz, drro->drr_bonustype, drro->drr_bonuslen, tx); + dmu_tx_commit(tx); } else { /* currently allocated, want to be allocated */ - dmu_tx_hold_bonus(tx, drro->drr_object); - /* - * We may change blocksize and delete old content, - * so need to hold_write and hold_free. - */ - dmu_tx_hold_write(tx, drro->drr_object, 0, 1); - dmu_tx_hold_free(tx, drro->drr_object, 0, DMU_OBJECT_END); - err = dmu_tx_assign(tx, TXG_WAIT); - if (err) { - dmu_tx_abort(tx); - return (err); - } err = dmu_object_reclaim(os, drro->drr_object, drro->drr_type, drro->drr_blksz, - drro->drr_bonustype, drro->drr_bonuslen, tx); + drro->drr_bonustype, drro->drr_bonuslen); + } + if (err) + return (EINVAL); + + if (drro->drr_bonuslen) { + data = restore_read(ra, P2ROUNDUP(drro->drr_bonuslen, 8)); + if (ra->err) + return (ra->err); } + + tx = dmu_tx_create(os); + dmu_tx_hold_bonus(tx, drro->drr_object); + err = dmu_tx_assign(tx, TXG_WAIT); if (err) { - dmu_tx_commit(tx); - return (EINVAL); + dmu_tx_abort(tx); + return (err); } dmu_object_set_checksum(os, drro->drr_object, drro->drr_checksum, tx); dmu_object_set_compress(os, drro->drr_object, drro->drr_compress, tx); - if (drro->drr_bonuslen) { + if (data != NULL) { dmu_buf_t *db; - void *data; + VERIFY(0 == dmu_bonus_hold(os, drro->drr_object, FTAG, &db)); dmu_buf_will_dirty(db, tx); ASSERT3U(db->db_size, >=, drro->drr_bonuslen); - data = restore_read(ra, P2ROUNDUP(drro->drr_bonuslen, 8)); - if (data == NULL) { - dmu_tx_commit(tx); - return (ra->err); - } bcopy(data, db->db_data, drro->drr_bonuslen); if (ra->byteswap) { dmu_ot[drro->drr_bonustype].ot_byteswap(db->db_data, ==== //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#3 (text+ko) ==== @@ -415,8 +415,7 @@ dnode_reallocate(dnode_t *dn, dmu_object_type_t ot, int blocksize, dmu_object_type_t bonustype, int bonuslen, dmu_tx_t *tx) { - int i, nblkptr; - dmu_buf_impl_t *db = NULL; + int nblkptr; ASSERT3U(blocksize, >=, SPA_MINBLOCKSIZE); ASSERT3U(blocksize, <=, SPA_MAXBLOCKSIZE); @@ -428,42 +427,25 @@ ASSERT3U(bonustype, <, DMU_OT_NUMTYPES); ASSERT3U(bonuslen, <=, DN_MAX_BONUSLEN); - for (i = 0; i < TXG_SIZE; i++) - ASSERT(!list_link_active(&dn->dn_dirty_link[i])); - /* clean up any unreferenced dbufs */ dnode_evict_dbufs(dn); - ASSERT3P(list_head(&dn->dn_dbufs), ==, NULL); - /* - * XXX I should really have a generation number to tell if we - * need to do this... - */ - if (blocksize != dn->dn_datablksz || - dn->dn_bonustype != bonustype || dn->dn_bonuslen != bonuslen) { - /* free all old data */ - dnode_free_range(dn, 0, -1ULL, tx); + rw_enter(&dn->dn_struct_rwlock, RW_WRITER); + dnode_setdirty(dn, tx); + if (dn->dn_datablksz != blocksize) { + /* change blocksize */ + ASSERT(dn->dn_maxblkid == 0 && + (BP_IS_HOLE(&dn->dn_phys->dn_blkptr[0]) || + dnode_block_freed(dn, 0))); + dnode_setdblksz(dn, blocksize); + dn->dn_next_blksz[tx->tx_txg&TXG_MASK] = blocksize; } - + if (dn->dn_bonuslen != bonuslen) + dn->dn_next_bonuslen[tx->tx_txg&TXG_MASK] = bonuslen; nblkptr = 1 + ((DN_MAX_BONUSLEN - bonuslen) >> SPA_BLKPTRSHIFT); - - /* change blocksize */ - rw_enter(&dn->dn_struct_rwlock, RW_WRITER); - if (blocksize != dn->dn_datablksz && - (!BP_IS_HOLE(&dn->dn_phys->dn_blkptr[0]) || - list_head(&dn->dn_dbufs) != NULL)) { - db = dbuf_hold(dn, 0, FTAG); - dbuf_new_size(db, blocksize, tx); - } - dnode_setdblksz(dn, blocksize); - dnode_setdirty(dn, tx); - dn->dn_next_bonuslen[tx->tx_txg&TXG_MASK] = bonuslen; - dn->dn_next_blksz[tx->tx_txg&TXG_MASK] = blocksize; if (dn->dn_nblkptr != nblkptr) dn->dn_next_nblkptr[tx->tx_txg&TXG_MASK] = nblkptr; rw_exit(&dn->dn_struct_rwlock); - if (db) - dbuf_rele(db, FTAG); /* change type */ dn->dn_type = ot; @@ -1187,11 +1169,6 @@ if (dn->dn_free_txg) return (TRUE); - /* - * If dn_datablkshift is not set, then there's only a single - * block, in which case there will never be a free range so it - * won't matter. - */ range_tofind.fr_blkid = blkid; mutex_enter(&dn->dn_mtx); for (i = 0; i < TXG_SIZE; i++) { ==== //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#4 (text+ko) ==== @@ -19,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -237,7 +237,7 @@ int dmu_object_claim(objset_t *os, uint64_t object, dmu_object_type_t ot, int blocksize, dmu_object_type_t bonus_type, int bonus_len, dmu_tx_t *tx); int dmu_object_reclaim(objset_t *os, uint64_t object, dmu_object_type_t ot, - int blocksize, dmu_object_type_t bonustype, int bonuslen, dmu_tx_t *tx); + int blocksize, dmu_object_type_t bonustype, int bonuslen); /* * Free an object from this objset. ==== //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#2 (text+ko) ==== @@ -19,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -56,10 +56,16 @@ uint64_t zh_replay_seq; /* highest replayed sequence number */ blkptr_t zh_log; /* log chain */ uint64_t zh_claim_seq; /* highest claimed sequence number */ - uint64_t zh_pad[5]; + uint64_t zh_flags; /* header flags */ + uint64_t zh_pad[4]; } zil_header_t; /* + * zh_flags bit settings + */ +#define ZIL_REPLAY_NEEDED 0x1 /* replay needed - internal only */ + +/* * Log block trailer - structure at the end of the header and each log block * * The zit_bt contains a zbt_cksum which for the intent log is ==== //depot/projects/soc2009/trasz_limits/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#2 (text+ko) ==== @@ -502,6 +502,25 @@ tx, zh->zh_claim_txg); } +/* + * return true if the initial log block is not valid + */ +static boolean_t +zil_empty(zilog_t *zilog) +{ + const zil_header_t *zh = zilog->zl_header; + arc_buf_t *abuf = NULL; + + if (BP_IS_HOLE(&zh->zh_log)) + return (B_TRUE); + + if (zil_read_log_block(zilog, &zh->zh_log, &abuf) != 0) + return (B_TRUE); + + VERIFY(arc_buf_remove_ref(abuf, &abuf) == 1); + return (B_FALSE); +} + int zil_claim(char *osname, void *txarg) { @@ -522,6 +541,21 @@ zh = zil_header_in_syncing_context(zilog); /* + * Record here whether the zil has any records to replay. + * If the header block pointer is null or the block points + * to the stubby then we know there are no valid log records. + * We use the header to store this state as the the zilog gets + * freed later in dmu_objset_close(). + * The flags (and the rest of the header fields) are cleared in + * zil_sync() as a result of a zil_destroy(), after replaying the log. + * + * Note, the intent log can be empty but still need the + * stubby to be claimed. + */ + if (!zil_empty(zilog)) + zh->zh_flags |= ZIL_REPLAY_NEEDED; + + /* * Claim all log blocks if we haven't already done so, and remember * the highest claimed sequence number. This ensures that if we can * read only part of the log now (e.g. due to a missing device), @@ -1345,25 +1379,6 @@ } /* - * return true if the initial log block is not valid - */ -static boolean_t -zil_empty(zilog_t *zilog) -{ - const zil_header_t *zh = zilog->zl_header; - arc_buf_t *abuf = NULL; - - if (BP_IS_HOLE(&zh->zh_log)) - return (B_TRUE); - - if (zil_read_log_block(zilog, &zh->zh_log, &abuf) != 0) - return (B_TRUE); - - VERIFY(arc_buf_remove_ref(abuf, &abuf) == 1); - return (B_FALSE); -} - -/* * Open an intent log. */ zilog_t * @@ -1418,7 +1433,7 @@ const zil_header_t *zh = zilog->zl_header; mutex_enter(&zilog->zl_lock); - if (zh->zh_claim_txg != 0) { /* unplayed log */ + if (zh->zh_flags & ZIL_REPLAY_NEEDED) { /* unplayed log */ mutex_exit(&zilog->zl_lock); return (EBUSY); } @@ -1645,7 +1660,7 @@ const zil_header_t *zh = zilog->zl_header; zil_replay_arg_t zr; - if (zil_empty(zilog)) { + if ((zh->zh_flags & ZIL_REPLAY_NEEDED) == 0) { zil_destroy(zilog, B_TRUE); return; } ==== //depot/projects/soc2009/trasz_limits/sys/compat/linux/linux_signal.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_signal.c,v 1.67 2009/06/27 13:58:44 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_signal.c,v 1.68 2009/12/18 14:27:18 kib Exp $"); #include #include @@ -565,7 +565,7 @@ AUDIT_ARG_PROCESS(p); error = p_cansignal(td, p, signum); - if (error) + if (error != 0 || signum == 0) goto out; error = ESRCH; ==== //depot/projects/soc2009/trasz_limits/sys/conf/NOTES#15 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1567 2009/12/16 16:24:32 jhb Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1568 2009/12/18 16:13:21 jhb Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -1862,6 +1862,7 @@ # L1 PCI express gigabit ethernet controllers. # alc: Support for Atheros AR8131/AR8132 PCIe ethernet controllers. # ale: Support for Atheros AR8121/AR8113/AR8114 PCIe ethernet controllers. +# ath: Atheros a/b/g WiFi adapters (requires ath_hal and wlan) # bce: Broadcom NetXtreme II (BCM5706/BCM5708) PCI/PCIe Gigabit Ethernet # adapters. # bfe: Broadcom BCM4401 Ethernet adapter. @@ -1920,6 +1921,7 @@ # pcn(4) driver is left out of the kernel. The le(4) driver does not # support the additional features like the MII bus and burst mode of # the PCnet-FAST and greater chipsets though. +# ral: Ralink Technology IEEE 802.11 wireless adapter # re: RealTek 8139C+/8169/816xS/811xS/8101E PCI/PCIe Ethernet adapter # rl: Support for PCI fast ethernet adapters based on the RealTek 8129/8139 # chipset. Note that the RealTek driver defaults to using programmed @@ -2039,7 +2041,6 @@ device xl # 3Com 3c90x (``Boomerang'', ``Cyclone'') # PCI Ethernet NICs. -device bwi # Broadcom BCM430* BCM431* device de # DEC/Intel DC21x4x (``Tulip'') device em # Intel Pro/1000 Gigabit Ethernet >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Dec 21 20:34:45 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7681310656BE; Mon, 21 Dec 2009 20:34:45 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2178A10656A4 for ; Mon, 21 Dec 2009 20:34:45 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0EB708FC22 for ; Mon, 21 Dec 2009 20:34:45 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nBLKYiRw070467 for ; Mon, 21 Dec 2009 20:34:44 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nBLKYiLQ070465 for perforce@freebsd.org; Mon, 21 Dec 2009 20:34:44 GMT (envelope-from trasz@freebsd.org) Date: Mon, 21 Dec 2009 20:34:44 GMT Message-Id: <200912212034.nBLKYiLQ070465@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 172041 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Dec 2009 20:34:45 -0000 http://p4web.freebsd.org/chv.cgi?CH=172041 Change 172041 by trasz@trasz_victim on 2009/12/21 20:34:36 Remove no longer relevant entries. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/TODO#57 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/TODO#57 (text+ko) ==== @@ -1,10 +1,5 @@ Things that need to be done before this goes into -CURRENT: -- Decide how VAPPEND is supposed to work - always OR-ed with VWRITE, - or used alone. Fix stuff accordingly. - -- MFP4 of the above. - - Decide what to do with MNT_RDONLY et a. Fix stuff. - MFP4 of the above. From owner-p4-projects@FreeBSD.ORG Tue Dec 22 06:31:23 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6B581106568D; Tue, 22 Dec 2009 06:31:23 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 29CA51065676 for ; Tue, 22 Dec 2009 06:31:23 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1594F8FC15 for ; Tue, 22 Dec 2009 06:31:23 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nBM6VNIc058023 for ; Tue, 22 Dec 2009 06:31:23 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nBM6VMtZ058021 for perforce@freebsd.org; Tue, 22 Dec 2009 06:31:22 GMT (envelope-from trasz@freebsd.org) Date: Tue, 22 Dec 2009 06:31:22 GMT Message-Id: <200912220631.nBM6VMtZ058021@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 172073 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Dec 2009 06:31:23 -0000 http://p4web.freebsd.org/chv.cgi?CH=172073 Change 172073 by trasz@trasz_victim on 2009/12/22 06:30:37 IFC. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/etc/rc.subr#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/stdio/sprintf.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/stdio/sscanf.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/stdio/vsscanf.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/stdtime/localtime.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/dumpfs/dumpfs.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/mount/mntopts.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/mount/mount.8#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/mount/mount.c#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/tunefs/tunefs.8#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/tunefs/tunefs.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ahci/ahci.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/chipsets/ata-amd.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/auxio/auxio.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/if_ndis/if_ndis_usb.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/usb/uaudio.c#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ste/if_ste.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/uart/uart_bus_acpi.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/ehci_pci.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/ohci_pci.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/serial/uftdi.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usbdevs#36 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/raid3/g_raid3.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/raid3/g_raid3.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/central/central.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/fhc/fhc.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/pci/apb.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/pci/ofw_pcib.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/sbus/sbus.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/sparc64/nexus.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/02.t#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/newsyslog/newsyslog.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/powerd/powerd.8#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/service/service.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/service/service.sh#2 integrate Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/etc/rc.subr#9 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: rc.subr,v 1.67 2006/10/07 11:25:15 elad Exp $ -# $FreeBSD: src/etc/rc.subr,v 1.94 2009/10/18 19:51:06 ed Exp $ +# $FreeBSD: src/etc/rc.subr,v 1.95 2009/12/21 22:16:07 jilles Exp $ # # Copyright (c) 1997-2004 The NetBSD Foundation, Inc. # All rights reserved. @@ -390,7 +390,7 @@ _list=$_nlist echo -n ${_prefix:-"Waiting for PIDS: "}$_list _prefix=", " - sleep 2 + pwait $_list 2>/dev/null || sleep 2 done if [ -n "$_prefix" ]; then echo "." ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/stdio/sprintf.c#2 (text+ko) ==== @@ -34,7 +34,7 @@ static char sccsid[] = "@(#)sprintf.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/sprintf.c,v 1.16 2008/04/17 22:17:54 jhb Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/sprintf.c,v 1.17 2009/12/21 19:59:38 delphij Exp $"); #include #include @@ -46,17 +46,9 @@ { int ret; va_list ap; - FILE f; - f._file = -1; - f._flags = __SWR | __SSTR; - f._bf._base = f._p = (unsigned char *)str; - f._bf._size = f._w = INT_MAX; - f._orientation = 0; - memset(&f._mbstate, 0, sizeof(mbstate_t)); va_start(ap, fmt); - ret = __vfprintf(&f, fmt, ap); + ret = vsprintf(str, fmt, ap); va_end(ap); - *f._p = 0; return (ret); } ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/stdio/sscanf.c#2 (text+ko) ==== @@ -34,44 +34,21 @@ static char sccsid[] = "@(#)sscanf.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/sscanf.c,v 1.13 2008/04/17 22:17:54 jhb Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/sscanf.c,v 1.14 2009/12/21 19:56:03 delphij Exp $"); #include #include #include #include "local.h" -static int eofread(void *, char *, int); - -/* ARGSUSED */ -static int -eofread(cookie, buf, len) - void *cookie; - char *buf; - int len; -{ - - return (0); -} - int sscanf(const char * __restrict str, char const * __restrict fmt, ...) { int ret; va_list ap; - FILE f; - f._file = -1; - f._flags = __SRD; - f._bf._base = f._p = (unsigned char *)str; - f._bf._size = f._r = strlen(str); - f._read = eofread; - f._ub._base = NULL; - f._lb._base = NULL; - f._orientation = 0; - memset(&f._mbstate, 0, sizeof(mbstate_t)); va_start(ap, fmt); - ret = __svfscanf(&f, fmt, ap); + ret = vsscanf(str, fmt, ap); va_end(ap); return (ret); } ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/stdio/vsscanf.c#2 (text+ko) ==== @@ -34,7 +34,7 @@ static char sccsid[] = "@(#)vsscanf.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/vsscanf.c,v 1.14 2008/04/17 22:17:54 jhb Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/vsscanf.c,v 1.15 2009/12/21 19:55:05 delphij Exp $"); #include #include @@ -45,20 +45,15 @@ /* ARGSUSED */ static int -eofread(cookie, buf, len) - void *cookie; - char *buf; - int len; +eofread(void *cookie, char *buf, int len) { return (0); } int -vsscanf(str, fmt, ap) - const char * __restrict str; - const char * __restrict fmt; - __va_list ap; +vsscanf(const char * __restrict str, const char * __restrict fmt, + __va_list ap) { FILE f; ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libc/stdtime/localtime.c#6 (text+ko) ==== @@ -9,7 +9,7 @@ static char elsieid[] __unused = "@(#)localtime.c 8.9"; #endif /* !defined NOID */ #endif /* !defined lint */ -__FBSDID("$FreeBSD: src/lib/libc/stdtime/localtime.c,v 1.47 2009/11/20 19:21:33 jhb Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdtime/localtime.c,v 1.48 2009/12/21 19:43:23 jhb Exp $"); /* ** Leap second handling from Bradley White. @@ -237,6 +237,9 @@ static int lcl_is_set; static pthread_once_t gmt_once = PTHREAD_ONCE_INIT; static pthread_rwlock_t lcl_rwlock = PTHREAD_RWLOCK_INITIALIZER; +static pthread_once_t localtime_once = PTHREAD_ONCE_INIT; +static pthread_key_t localtime_key; +static int localtime_key_error; char * tzname[2] = { wildabbr, @@ -1406,27 +1409,24 @@ return result; } +static void +localtime_key_init(void) +{ + + localtime_key_error = _pthread_key_create(&localtime_key, free); +} + struct tm * localtime(timep) const time_t * const timep; { - static pthread_mutex_t localtime_mutex = PTHREAD_MUTEX_INITIALIZER; - static pthread_key_t localtime_key = -1; struct tm *p_tm; - int r; if (__isthreaded != 0) { - if (localtime_key < 0) { - _pthread_mutex_lock(&localtime_mutex); - if (localtime_key < 0) { - if ((r = _pthread_key_create(&localtime_key, - free)) != 0) { - _pthread_mutex_unlock(&localtime_mutex); - errno = r; - return(NULL); - } - } - _pthread_mutex_unlock(&localtime_mutex); + _once(&localtime_once, localtime_key_init); + if (localtime_key_error != 0) { + errno = localtime_key_error; + return(NULL); } p_tm = _pthread_getspecific(localtime_key); if (p_tm == NULL) { ==== //depot/projects/soc2008/trasz_nfs4acl/sbin/dumpfs/dumpfs.c#6 (text+ko) ==== @@ -53,7 +53,7 @@ static char sccsid[] = "@(#)dumpfs.c 8.5 (Berkeley) 4/29/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/dumpfs/dumpfs.c,v 1.47 2009/10/19 14:04:19 ru Exp $"; + "$FreeBSD: src/sbin/dumpfs/dumpfs.c,v 1.48 2009/12/21 19:39:10 trasz Exp $"; #endif /* not lint */ #include ==== //depot/projects/soc2008/trasz_nfs4acl/sbin/mount/mntopts.h#4 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)mntopts.h 8.7 (Berkeley) 3/29/95 - * $FreeBSD: src/sbin/mount/mntopts.h,v 1.29 2005/12/02 03:55:02 rodrigc Exp $ + * $FreeBSD: src/sbin/mount/mntopts.h,v 1.30 2009/12/21 19:39:10 trasz Exp $ */ struct mntopt { ==== //depot/projects/soc2008/trasz_nfs4acl/sbin/mount/mount.8#11 (text+ko) ==== @@ -26,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)mount.8 8.8 (Berkeley) 6/16/94 -.\" $FreeBSD: src/sbin/mount/mount.8,v 1.92 2009/11/11 12:55:58 trasz Exp $ +.\" $FreeBSD: src/sbin/mount/mount.8,v 1.93 2009/12/21 19:39:10 trasz Exp $ .\" .Dd March 11, 2008 .Dt MOUNT 8 ==== //depot/projects/soc2008/trasz_nfs4acl/sbin/mount/mount.c#12 (text+ko) ==== @@ -37,7 +37,7 @@ #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/sbin/mount/mount.c,v 1.108 2009/09/14 21:08:22 pjd Exp $"); +__FBSDID("$FreeBSD: src/sbin/mount/mount.c,v 1.109 2009/12/21 19:39:10 trasz Exp $"); #include #include ==== //depot/projects/soc2008/trasz_nfs4acl/sbin/tunefs/tunefs.8#5 (text+ko) ==== @@ -26,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)tunefs.8 8.2 (Berkeley) 12/11/93 -.\" $FreeBSD: src/sbin/tunefs/tunefs.8,v 1.41 2009/10/21 10:15:26 remko Exp $ +.\" $FreeBSD: src/sbin/tunefs/tunefs.8,v 1.42 2009/12/21 19:39:10 trasz Exp $ .\" .Dd October 21, 2009 .Dt TUNEFS 8 ==== //depot/projects/soc2008/trasz_nfs4acl/sbin/tunefs/tunefs.c#3 (text+ko) ==== @@ -39,7 +39,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/sbin/tunefs/tunefs.c,v 1.43 2006/10/31 21:52:28 pjd Exp $"); +__FBSDID("$FreeBSD: src/sbin/tunefs/tunefs.c,v 1.44 2009/12/21 19:39:10 trasz Exp $"); /* * tunefs: change layout parameters to an existing file system. ==== //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ahci/ahci.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ahci/ahci.c,v 1.19 2009/12/06 23:56:54 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ahci/ahci.c,v 1.20 2009/12/21 21:27:56 mav Exp $"); #include #include @@ -596,20 +596,18 @@ unit = irq->r_irq_rid - 1; is = ATA_INL(ctlr->r_mem, AHCI_IS); } + /* Some controllers have edge triggered IS. */ + if (ctlr->quirks & AHCI_Q_EDGEIS) + ATA_OUTL(ctlr->r_mem, AHCI_IS, is); for (; unit < ctlr->channels; unit++) { if ((is & (1 << unit)) != 0 && (arg = ctlr->interrupt[unit].argument)) { - if (ctlr->quirks & AHCI_Q_EDGEIS) { - /* Some controller have edge triggered IS. */ - ATA_OUTL(ctlr->r_mem, AHCI_IS, 1 << unit); ctlr->interrupt[unit].function(arg); - } else { - /* but AHCI declares level triggered IS. */ - ctlr->interrupt[unit].function(arg); - ATA_OUTL(ctlr->r_mem, AHCI_IS, 1 << unit); - } } } + /* AHCI declares level triggered IS. */ + if (!(ctlr->quirks & AHCI_Q_EDGEIS)) + ATA_OUTL(ctlr->r_mem, AHCI_IS, is); } /* ==== //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/chipsets/ata-amd.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-amd.c,v 1.4 2009/12/14 21:11:50 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-amd.c,v 1.5 2009/12/21 21:47:33 mav Exp $"); #include "opt_ata.h" #include @@ -61,7 +61,7 @@ #define AMD_CABLE 0x02 /* - * American Micro Devices (AMD) chipset support functions + * Advanced Micro Devices (AMD) chipset support functions */ static int ata_amd_probe(device_t dev) ==== //depot/projects/soc2008/trasz_nfs4acl/sys/dev/auxio/auxio.c#2 (text+ko) ==== @@ -56,12 +56,12 @@ */ /* - * AUXIO registers support on the sbus & ebus2, used for the floppy driver + * AUXIO registers support on the SBus & EBus2, used for the floppy driver * and to control the system LED, for the BLINK option. */ #include -__FBSDID("$FreeBSD: src/sys/dev/auxio/auxio.c,v 1.5 2006/01/26 19:04:18 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/auxio/auxio.c,v 1.6 2009/12/21 21:29:16 marius Exp $"); #include #include @@ -85,8 +85,8 @@ #include /* - * on sun4u, auxio exists with one register (LED) on the sbus, and 5 - * registers on the ebus2 (pci) (LED, PCIMODE, FREQUENCY, SCSI + * On sun4u, auxio exists with one register (LED) on the SBus, and 5 + * registers on the EBus2 (pci) (LED, PCIMODE, FREQUENCY, SCSI * OSCILLATOR, and TEMP SENSE. */ @@ -142,6 +142,7 @@ static devclass_t auxio_devclass; DRIVER_MODULE(auxio, sbus, auxio_sbus_driver, auxio_devclass, 0, 0); +MODULE_DEPEND(auxio, sbus, 1, 1, 1); /* EBus */ static device_method_t auxio_ebus_methods[] = { @@ -158,6 +159,7 @@ }; DRIVER_MODULE(auxio, ebus, auxio_ebus_driver, auxio_devclass, 0, 0); +MODULE_DEPEND(auxio, ebus, 1, 1, 1); MODULE_VERSION(auxio, 1); #define AUXIO_LOCK_INIT(sc) \ ==== //depot/projects/soc2008/trasz_nfs4acl/sys/dev/if_ndis/if_ndis_usb.c#8 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis_usb.c,v 1.20 2009/11/02 11:07:42 rpaulo Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis_usb.c,v 1.21 2009/12/22 02:04:16 thompsa Exp $"); #include #include @@ -165,6 +165,7 @@ driver_object *drv; int devidx = 0; + device_set_usb_desc(self); db = uaa->driver_ivar; sc = (struct ndis_softc *)dummy; sc->ndis_dev = self; ==== //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/usb/uaudio.c#12 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: uaudio.c,v 1.91 2004/11/05 17:46:14 kent Exp $ */ -/* $FreeBSD: src/sys/dev/sound/usb/uaudio.c,v 1.59 2009/11/22 21:26:27 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/sound/usb/uaudio.c,v 1.60 2009/12/22 02:11:37 thompsa Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -87,20 +87,27 @@ #include #include "feeder_if.h" -static int uaudio_default_rate = 96000; +static int uaudio_default_rate = 0; /* use rate list */ static int uaudio_default_bits = 32; -static int uaudio_default_channels = 2; +static int uaudio_default_channels = 0; /* use default */ #if USB_DEBUG static int uaudio_debug = 0; SYSCTL_NODE(_hw_usb, OID_AUTO, uaudio, CTLFLAG_RW, 0, "USB uaudio"); + SYSCTL_INT(_hw_usb_uaudio, OID_AUTO, debug, CTLFLAG_RW, &uaudio_debug, 0, "uaudio debug level"); + +TUNABLE_INT("hw.usb.uaudio.default_rate", &uaudio_default_rate); SYSCTL_INT(_hw_usb_uaudio, OID_AUTO, default_rate, CTLFLAG_RW, &uaudio_default_rate, 0, "uaudio default sample rate"); + +TUNABLE_INT("hw.usb.uaudio.default_bits", &uaudio_default_bits); SYSCTL_INT(_hw_usb_uaudio, OID_AUTO, default_bits, CTLFLAG_RW, &uaudio_default_bits, 0, "uaudio default sample bits"); + +TUNABLE_INT("hw.usb.uaudio.default_channels", &uaudio_default_channels); SYSCTL_INT(_hw_usb_uaudio, OID_AUTO, default_channels, CTLFLAG_RW, &uaudio_default_channels, 0, "uaudio default sample channels"); #endif @@ -169,10 +176,16 @@ uint32_t intr_size; /* in bytes */ uint32_t intr_frames; /* in units */ uint32_t sample_rate; + uint32_t frames_per_second; + uint32_t sample_rem; + uint32_t sample_curr; + uint32_t format; uint32_t pcm_format[2]; - uint16_t bytes_per_frame; + uint16_t bytes_per_frame[2]; + + uint16_t sample_size; uint8_t valid; uint8_t iface_index; @@ -330,7 +343,7 @@ static usb_callback_t umidi_bulk_write_callback; static void uaudio_chan_fill_info_sub(struct uaudio_softc *, - struct usb_device *, uint32_t, uint16_t, uint8_t, uint8_t); + struct usb_device *, uint32_t, uint8_t, uint8_t); static void uaudio_chan_fill_info(struct uaudio_softc *, struct usb_device *); static void uaudio_mixer_add_ctl_sub(struct uaudio_softc *, @@ -787,8 +800,7 @@ static void uaudio_chan_fill_info_sub(struct uaudio_softc *sc, struct usb_device *udev, - uint32_t rate, uint16_t fps, uint8_t channels, - uint8_t bit_resolution) + uint32_t rate, uint8_t channels, uint8_t bit_resolution) { struct usb_descriptor *desc = NULL; const struct usb2_audio_streaming_interface_descriptor *asid = NULL; @@ -811,7 +823,6 @@ uint8_t bBitResolution; uint8_t x; uint8_t audio_if = 0; - uint8_t sample_size; while ((desc = usb_desc_foreach(cd, desc))) { @@ -1040,16 +1051,10 @@ chan->usb2_cfg = uaudio_cfg_play; - sample_size = (( + chan->sample_size = (( UAUDIO_MAX_CHAN(chan->p_asf1d->bNrChannels) * chan->p_asf1d->bBitResolution) / 8); - /* - * NOTE: "chan->bytes_per_frame" - * should not be zero! - */ - chan->bytes_per_frame = ((rate / fps) * sample_size); - if (sc->sc_sndstat_valid) { sbuf_printf(&sc->sc_sndstat, "\n\t" "mode %d.%d:(%s) %dch, %d/%dbit, %s, %dHz", @@ -1067,12 +1072,32 @@ } } +/* This structure defines all the supported rates. */ + +static const uint32_t uaudio_rate_list[] = { + 96000, + 88000, + 80000, + 72000, + 64000, + 56000, + 48000, + 44100, + 40000, + 32000, + 24000, + 22050, + 16000, + 11025, + 8000, + 0 +}; + static void uaudio_chan_fill_info(struct uaudio_softc *sc, struct usb_device *udev) { uint32_t rate = uaudio_default_rate; - uint32_t z; - uint16_t fps = usbd_get_isoc_fps(udev); + uint8_t z; uint8_t bits = uaudio_default_bits; uint8_t y; uint8_t channels = uaudio_default_channels; @@ -1083,14 +1108,24 @@ /* set a valid value */ bits = 32; } - rate -= (rate % fps); - if ((rate == 0) || (rate > 192000)) { - /* set a valid value */ - rate = 192000 - (192000 % fps); - } - if ((channels == 0) || (channels > 2)) { - /* set a valid value */ - channels = 2; + if (channels == 0) { + switch (usbd_get_speed(udev)) { + case USB_SPEED_LOW: + case USB_SPEED_FULL: + /* + * Due to high bandwidth usage and problems + * with HIGH-speed split transactions we + * disable surround setups on FULL-speed USB + * by default + */ + channels = 2; + break; + default: + channels = 16; + break; + } + } else if (channels > 16) { + channels = 16; } if (sbuf_new(&sc->sc_sndstat, NULL, 4096, SBUF_AUTOEXTEND)) { sc->sc_sndstat_valid = 1; @@ -1099,8 +1134,14 @@ for (x = channels; x; x--) { for (y = bits; y; y -= 8) { - for (z = rate; z; z -= fps) { - uaudio_chan_fill_info_sub(sc, udev, z, fps, x, y); + + /* try user defined rate, if any */ + if (rate != 0) + uaudio_chan_fill_info_sub(sc, udev, rate, x, y); + + /* try find a matching rate, if any */ + for (z = 0; uaudio_rate_list[z]; z++) { + uaudio_chan_fill_info_sub(sc, udev, uaudio_rate_list[z], x, y); if (sc->sc_rec_chan.valid && sc->sc_play_chan.valid) { @@ -1116,19 +1157,7 @@ } } -/* - * The following function sets up data size and block count for the - * next audio transfer. - */ static void -uaudio_setup_blockcount(struct uaudio_chan *ch, - uint32_t *total, uint32_t *blockcount) -{ - *total = ch->intr_size; - *blockcount = ch->intr_frames; -} - -static void uaudio_chan_play_callback(struct usb_xfer *xfer, usb_error_t error) { struct uaudio_chan *ch = usbd_xfer_softc(xfer); @@ -1137,12 +1166,11 @@ uint32_t blockcount; uint32_t n; uint32_t offset; - int actlen, sumlen; + int actlen; + int sumlen; usbd_xfer_status(xfer, &actlen, &sumlen, NULL, NULL); - uaudio_setup_blockcount(ch, &total, &blockcount); - if (ch->end == ch->start) { DPRINTF("no buffer!\n"); return; @@ -1153,22 +1181,39 @@ tr_transferred: if (actlen < sumlen) { DPRINTF("short transfer, " - "%d of %d bytes\n", actlen, total); + "%d of %d bytes\n", actlen, sumlen); } chn_intr(ch->pcm_ch); case USB_ST_SETUP: - if (ch->bytes_per_frame > usbd_xfer_max_framelen(xfer)) { + if (ch->bytes_per_frame[1] > usbd_xfer_max_framelen(xfer)) { DPRINTF("bytes per transfer, %d, " "exceeds maximum, %d!\n", - ch->bytes_per_frame, + ch->bytes_per_frame[1], usbd_xfer_max_framelen(xfer)); break; } - /* setup frame length */ + + blockcount = ch->intr_frames; + + /* setup number of frames */ usbd_xfer_set_frames(xfer, blockcount); - for (n = 0; n != blockcount; n++) - usbd_xfer_set_frame_len(xfer, n, ch->bytes_per_frame); + + /* reset total length */ + total = 0; + + /* setup frame lengths */ + for (n = 0; n != blockcount; n++) { + ch->sample_curr += ch->sample_rem; + if (ch->sample_curr >= ch->frames_per_second) { + ch->sample_curr -= ch->frames_per_second; + usbd_xfer_set_frame_len(xfer, n, ch->bytes_per_frame[1]); + total += ch->bytes_per_frame[1]; + } else { + usbd_xfer_set_frame_len(xfer, n, ch->bytes_per_frame[0]); + total += ch->bytes_per_frame[0]; + } + } DPRINTFN(6, "transfer %d bytes\n", total); @@ -1210,7 +1255,6 @@ struct usb_page_cache *pc; uint32_t n; uint32_t m; - uint32_t total; uint32_t blockcount; uint32_t offset0; uint32_t offset1; @@ -1222,8 +1266,6 @@ usbd_xfer_status(xfer, &actlen, NULL, NULL, &nframes); mfl = usbd_xfer_max_framelen(xfer); - uaudio_setup_blockcount(ch, &total, &blockcount); - if (ch->end == ch->start) { DPRINTF("no buffer!\n"); return; @@ -1231,12 +1273,8 @@ switch (USB_GET_STATE(xfer)) { case USB_ST_TRANSFERRED: - if (actlen < total) { - DPRINTF("short transfer, " - "%d of %d bytes\n", actlen, total); - } else { - DPRINTFN(6, "transferred %d bytes\n", actlen); - } + + DPRINTFN(6, "transferred %d bytes\n", actlen); offset0 = 0; pc = usbd_xfer_get_frame(xfer, 0); @@ -1271,6 +1309,8 @@ case USB_ST_SETUP: tr_setup: + blockcount = ch->intr_frames; + usbd_xfer_set_frames(xfer, blockcount); for (n = 0; n < blockcount; n++) { usbd_xfer_set_frame_len(xfer, n, mfl); @@ -1295,6 +1335,8 @@ &sc->sc_play_chan : &sc->sc_rec_chan); uint32_t buf_size; uint32_t frames; + uint32_t format; + uint16_t fps; uint8_t endpoint; uint8_t blocks; uint8_t iface_index; @@ -1302,7 +1344,9 @@ uint8_t fps_shift; usb_error_t err; - if (usbd_get_isoc_fps(sc->sc_udev) < 8000) { + fps = usbd_get_isoc_fps(sc->sc_udev); + + if (fps < 8000) { /* FULL speed USB */ frames = 8; } else { @@ -1310,10 +1354,6 @@ frames = UAUDIO_NFRAMES; } - /* compute required buffer size */ - - buf_size = (ch->bytes_per_frame * frames); - /* setup play/record format */ ch->pcm_cap.fmtlist = ch->pcm_format; @@ -1329,15 +1369,34 @@ ch->pcm_ch = c; ch->pcm_mtx = c->lock; - if (ch->p_asf1d->bNrChannels >= 2) - ch->pcm_cap.fmtlist[0] = - SND_FORMAT(ch->p_fmt->freebsd_fmt, 2, 0); - else - ch->pcm_cap.fmtlist[0] = - SND_FORMAT(ch->p_fmt->freebsd_fmt, 1, 0); + format = ch->p_fmt->freebsd_fmt; + + switch (ch->p_asf1d->bNrChannels) { + case 2: + /* stereo */ + format = SND_FORMAT(format, 2, 0); + break; + case 1: + /* mono */ + format = SND_FORMAT(format, 1, 0); + break; + default: + /* surround and more */ + format = feeder_matrix_default_format( + SND_FORMAT(format, ch->p_asf1d->bNrChannels, 0)); + break; + } + ch->pcm_cap.fmtlist[0] = format; ch->pcm_cap.fmtlist[1] = 0; + /* check if format is not supported */ + + if (format == 0) { + DPRINTF("The selected audio format is not supported\n"); + goto error; + } + /* set alternate interface corresponding to the mode */ endpoint = ch->p_ed1->bEndpointAddress; @@ -1377,10 +1436,27 @@ fps_shift = usbd_xfer_get_fps_shift(ch->xfer[0]); - /* setup frame sizes */ + /* down shift number of frames per second, if any */ + fps >>= fps_shift; + frames >>= fps_shift; + + /* bytes per frame should not be zero */ + ch->bytes_per_frame[0] = ((ch->sample_rate / fps) * ch->sample_size); + ch->bytes_per_frame[1] = (((ch->sample_rate + fps - 1) / fps) * ch->sample_size); + + /* setup data rate dithering, if any */ + ch->frames_per_second = fps; + ch->sample_rem = ch->sample_rate % fps; + ch->sample_curr = 0; + ch->frames_per_second = fps; + + /* compute required buffer size */ + buf_size = (ch->bytes_per_frame[1] * frames); + ch->intr_size = buf_size; - ch->intr_frames = (frames >> fps_shift); - ch->bytes_per_frame <<= fps_shift; + ch->intr_frames = frames; + + DPRINTF("fps=%d sample_rem=%d\n", fps, ch->sample_rem); if (ch->intr_frames == 0) { DPRINTF("frame shift is too high!\n"); ==== //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ste/if_ste.c#6 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ste/if_ste.c,v 1.9 2009/12/21 20:18:01 yongari Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ste/if_ste.c,v 1.10 2009/12/21 20:42:23 yongari Exp $"); #ifdef HAVE_KERNEL_OPTION_HEADERS #include "opt_device_polling.h" @@ -91,45 +91,44 @@ { 0, 0, NULL } }; -static int ste_probe(device_t); -static int ste_attach(device_t); -static int ste_detach(device_t); -static void ste_init(void *); -static void ste_init_locked(struct ste_softc *); -static void ste_intr(void *); -static void ste_rxeoc(struct ste_softc *); -static int ste_rxeof(struct ste_softc *); -static void ste_txeoc(struct ste_softc *); -static void ste_txeof(struct ste_softc *); -static void ste_stats_update(void *); -static void ste_stop(struct ste_softc *); -static void ste_reset(struct ste_softc *); -static int ste_ioctl(struct ifnet *, u_long, caddr_t); -static int ste_encap(struct ste_softc *, struct ste_chain *, struct mbuf *); -static void ste_start(struct ifnet *); -static void ste_start_locked(struct ifnet *); -static void ste_watchdog(struct ste_softc *); -static int ste_shutdown(device_t); -static int ste_newbuf(struct ste_softc *, struct ste_chain_onefrag *, - struct mbuf *); -static int ste_ifmedia_upd(struct ifnet *); -static void ste_ifmedia_upd_locked(struct ifnet *); -static void ste_ifmedia_sts(struct ifnet *, struct ifmediareq *); +static int ste_attach(device_t); +static int ste_detach(device_t); +static int ste_probe(device_t); +static int ste_shutdown(device_t); -static void ste_mii_sync(struct ste_softc *); -static void ste_mii_send(struct ste_softc *, uint32_t, int); -static int ste_mii_readreg(struct ste_softc *, struct ste_mii_frame *); -static int ste_mii_writereg(struct ste_softc *, struct ste_mii_frame *); -static int ste_miibus_readreg(device_t, int, int); -static int ste_miibus_writereg(device_t, int, int, int); -static void ste_miibus_statchg(device_t); - -static int ste_eeprom_wait(struct ste_softc *); -static int ste_read_eeprom(struct ste_softc *, caddr_t, int, int, int); -static void ste_wait(struct ste_softc *); -static void ste_setmulti(struct ste_softc *); -static int ste_init_rx_list(struct ste_softc *); -static void ste_init_tx_list(struct ste_softc *); +static int ste_eeprom_wait(struct ste_softc *); +static int ste_encap(struct ste_softc *, struct ste_chain *, struct mbuf *); +static int ste_ifmedia_upd(struct ifnet *); +static void ste_ifmedia_upd_locked(struct ifnet *); +static void ste_ifmedia_sts(struct ifnet *, struct ifmediareq *); +static void ste_init(void *); +static void ste_init_locked(struct ste_softc *); +static int ste_init_rx_list(struct ste_softc *); +static void ste_init_tx_list(struct ste_softc *); +static void ste_intr(void *); +static int ste_ioctl(struct ifnet *, u_long, caddr_t); +static int ste_mii_readreg(struct ste_softc *, struct ste_mii_frame *); +static void ste_mii_send(struct ste_softc *, uint32_t, int); +static void ste_mii_sync(struct ste_softc *); +static int ste_mii_writereg(struct ste_softc *, struct ste_mii_frame *); +static int ste_miibus_readreg(device_t, int, int); +static void ste_miibus_statchg(device_t); +static int ste_miibus_writereg(device_t, int, int, int); +static int ste_newbuf(struct ste_softc *, struct ste_chain_onefrag *, + struct mbuf *); +static int ste_read_eeprom(struct ste_softc *, caddr_t, int, int, int); +static void ste_reset(struct ste_softc *); +static void ste_rxeoc(struct ste_softc *); +static int ste_rxeof(struct ste_softc *); +static void ste_setmulti(struct ste_softc *); +static void ste_start(struct ifnet *); +static void ste_start_locked(struct ifnet *); +static void ste_stats_update(void *); +static void ste_stop(struct ste_softc *); +static void ste_txeoc(struct ste_softc *); +static void ste_txeof(struct ste_softc *); +static void ste_wait(struct ste_softc *); +static void ste_watchdog(struct ste_softc *); #ifdef STE_USEIOSPACE #define STE_RES SYS_RES_IOPORT ==== //depot/projects/soc2008/trasz_nfs4acl/sys/dev/uart/uart_bus_acpi.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/uart/uart_bus_acpi.c,v 1.3 2005/01/06 01:43:26 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/uart/uart_bus_acpi.c,v 1.4 2009/12/21 22:57:40 gavin Exp $"); #include #include @@ -59,6 +59,7 @@ static struct isa_pnp_id acpi_ns8250_ids[] = { {0x0005d041, "Standard PC COM port"}, /* PNP0500 */ {0x0105d041, "16550A-compatible COM port"}, /* PNP0501 */ + {0x04f0235c, "Wacom Tablet PC Screen"}, /* WACF004 */ {0} }; ==== //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/controller/ehci_pci.c#9 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/controller/ehci_pci.c,v 1.16 2009/12/09 20:17:22 thompsa Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/controller/ehci_pci.c,v 1.17 2009/12/22 01:57:34 thompsa Exp $"); /* * USB Enhanced Host Controller Driver, a.k.a. USB 2.0 controller. @@ -197,6 +197,10 @@ return "Intel 82801JI (ICH10) USB 2.0 controller USB-A"; case 0x3a3c8086: return "Intel 82801JI (ICH10) USB 2.0 controller USB-B"; + case 0x3b348086: + return ("Intel PCH USB 2.0 controller USB-A"); + case 0x3b3c8086: + return ("Intel PCH USB 2.0 controller USB-B"); case 0x00e01033: return ("NEC uPD 720100 USB 2.0 controller"); @@ -213,6 +217,12 @@ return "NVIDIA nForce4 USB 2.0 controller"; case 0x03f210de: return "NVIDIA nForce MCP61 USB 2.0 controller"; + case 0x0aa610de: + return "NVIDIA nForce MCP79 USB 2.0 controller"; + case 0x0aa910de: + return "NVIDIA nForce MCP79 USB 2.0 controller"; + case 0x0aaa10de: + return "NVIDIA nForce MCP79 USB 2.0 controller"; case 0x15621131: >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Dec 22 06:31:24 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 56DD11065740; Tue, 22 Dec 2009 06:31:23 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4514A106568F for ; Tue, 22 Dec 2009 06:31:23 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 30F868FC19 for ; Tue, 22 Dec 2009 06:31:23 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nBM6VNJR058028 for ; Tue, 22 Dec 2009 06:31:23 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nBM6VNbw058026 for perforce@freebsd.org; Tue, 22 Dec 2009 06:31:23 GMT (envelope-from trasz@freebsd.org) Date: Tue, 22 Dec 2009 06:31:23 GMT Message-Id: <200912220631.nBM6VNbw058026@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 172074 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Dec 2009 06:31:24 -0000 http://p4web.freebsd.org/chv.cgi?CH=172074 Change 172074 by trasz@trasz_victim on 2009/12/22 06:30:53 IFC. Affected files ... .. //depot/projects/soc2009/trasz_limits/etc/rc.subr#7 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/stdio/sprintf.c#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/stdio/sscanf.c#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/stdio/vsscanf.c#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/stdtime/localtime.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sbin/dumpfs/dumpfs.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sbin/mount/mntopts.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sbin/mount/mount.8#4 integrate .. //depot/projects/soc2009/trasz_limits/sbin/mount/mount.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sbin/tunefs/tunefs.8#3 integrate .. //depot/projects/soc2009/trasz_limits/sbin/tunefs/tunefs.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ahci/ahci.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ata/chipsets/ata-amd.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/auxio/auxio.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/if_ndis/if_ndis_usb.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/sound/usb/uaudio.c#10 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ste/if_ste.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/uart/uart_bus_acpi.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/controller/ehci_pci.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/controller/ohci_pci.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/serial/uftdi.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usbdevs#13 integrate .. //depot/projects/soc2009/trasz_limits/sys/geom/raid3/g_raid3.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/geom/raid3/g_raid3.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sparc64/central/central.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sparc64/fhc/fhc.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sparc64/pci/apb.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sparc64/pci/ofw_pcib.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sparc64/sbus/sbus.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sparc64/sparc64/nexus.c#2 integrate .. //depot/projects/soc2009/trasz_limits/tools/regression/acltools/02.t#1 branch .. //depot/projects/soc2009/trasz_limits/usr.sbin/newsyslog/newsyslog.c#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/powerd/powerd.8#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/service/service.8#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/service/service.sh#2 integrate Differences ... ==== //depot/projects/soc2009/trasz_limits/etc/rc.subr#7 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: rc.subr,v 1.67 2006/10/07 11:25:15 elad Exp $ -# $FreeBSD: src/etc/rc.subr,v 1.94 2009/10/18 19:51:06 ed Exp $ +# $FreeBSD: src/etc/rc.subr,v 1.95 2009/12/21 22:16:07 jilles Exp $ # # Copyright (c) 1997-2004 The NetBSD Foundation, Inc. # All rights reserved. @@ -390,7 +390,7 @@ _list=$_nlist echo -n ${_prefix:-"Waiting for PIDS: "}$_list _prefix=", " - sleep 2 + pwait $_list 2>/dev/null || sleep 2 done if [ -n "$_prefix" ]; then echo "." ==== //depot/projects/soc2009/trasz_limits/lib/libc/stdio/sprintf.c#2 (text+ko) ==== @@ -34,7 +34,7 @@ static char sccsid[] = "@(#)sprintf.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/sprintf.c,v 1.16 2008/04/17 22:17:54 jhb Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/sprintf.c,v 1.17 2009/12/21 19:59:38 delphij Exp $"); #include #include @@ -46,17 +46,9 @@ { int ret; va_list ap; - FILE f; - f._file = -1; - f._flags = __SWR | __SSTR; - f._bf._base = f._p = (unsigned char *)str; - f._bf._size = f._w = INT_MAX; - f._orientation = 0; - memset(&f._mbstate, 0, sizeof(mbstate_t)); va_start(ap, fmt); - ret = __vfprintf(&f, fmt, ap); + ret = vsprintf(str, fmt, ap); va_end(ap); - *f._p = 0; return (ret); } ==== //depot/projects/soc2009/trasz_limits/lib/libc/stdio/sscanf.c#2 (text+ko) ==== @@ -34,44 +34,21 @@ static char sccsid[] = "@(#)sscanf.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/sscanf.c,v 1.13 2008/04/17 22:17:54 jhb Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/sscanf.c,v 1.14 2009/12/21 19:56:03 delphij Exp $"); #include #include #include #include "local.h" -static int eofread(void *, char *, int); - -/* ARGSUSED */ -static int -eofread(cookie, buf, len) - void *cookie; - char *buf; - int len; -{ - - return (0); -} - int sscanf(const char * __restrict str, char const * __restrict fmt, ...) { int ret; va_list ap; - FILE f; - f._file = -1; - f._flags = __SRD; - f._bf._base = f._p = (unsigned char *)str; - f._bf._size = f._r = strlen(str); - f._read = eofread; - f._ub._base = NULL; - f._lb._base = NULL; - f._orientation = 0; - memset(&f._mbstate, 0, sizeof(mbstate_t)); va_start(ap, fmt); - ret = __svfscanf(&f, fmt, ap); + ret = vsscanf(str, fmt, ap); va_end(ap); return (ret); } ==== //depot/projects/soc2009/trasz_limits/lib/libc/stdio/vsscanf.c#2 (text+ko) ==== @@ -34,7 +34,7 @@ static char sccsid[] = "@(#)vsscanf.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/vsscanf.c,v 1.14 2008/04/17 22:17:54 jhb Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/vsscanf.c,v 1.15 2009/12/21 19:55:05 delphij Exp $"); #include #include @@ -45,20 +45,15 @@ /* ARGSUSED */ static int -eofread(cookie, buf, len) - void *cookie; - char *buf; - int len; +eofread(void *cookie, char *buf, int len) { return (0); } int -vsscanf(str, fmt, ap) - const char * __restrict str; - const char * __restrict fmt; - __va_list ap; +vsscanf(const char * __restrict str, const char * __restrict fmt, + __va_list ap) { FILE f; ==== //depot/projects/soc2009/trasz_limits/lib/libc/stdtime/localtime.c#6 (text+ko) ==== @@ -9,7 +9,7 @@ static char elsieid[] __unused = "@(#)localtime.c 8.9"; #endif /* !defined NOID */ #endif /* !defined lint */ -__FBSDID("$FreeBSD: src/lib/libc/stdtime/localtime.c,v 1.47 2009/11/20 19:21:33 jhb Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdtime/localtime.c,v 1.48 2009/12/21 19:43:23 jhb Exp $"); /* ** Leap second handling from Bradley White. @@ -237,6 +237,9 @@ static int lcl_is_set; static pthread_once_t gmt_once = PTHREAD_ONCE_INIT; static pthread_rwlock_t lcl_rwlock = PTHREAD_RWLOCK_INITIALIZER; +static pthread_once_t localtime_once = PTHREAD_ONCE_INIT; +static pthread_key_t localtime_key; +static int localtime_key_error; char * tzname[2] = { wildabbr, @@ -1406,27 +1409,24 @@ return result; } +static void +localtime_key_init(void) +{ + + localtime_key_error = _pthread_key_create(&localtime_key, free); +} + struct tm * localtime(timep) const time_t * const timep; { - static pthread_mutex_t localtime_mutex = PTHREAD_MUTEX_INITIALIZER; - static pthread_key_t localtime_key = -1; struct tm *p_tm; - int r; if (__isthreaded != 0) { - if (localtime_key < 0) { - _pthread_mutex_lock(&localtime_mutex); - if (localtime_key < 0) { - if ((r = _pthread_key_create(&localtime_key, - free)) != 0) { - _pthread_mutex_unlock(&localtime_mutex); - errno = r; - return(NULL); - } - } - _pthread_mutex_unlock(&localtime_mutex); + _once(&localtime_once, localtime_key_init); + if (localtime_key_error != 0) { + errno = localtime_key_error; + return(NULL); } p_tm = _pthread_getspecific(localtime_key); if (p_tm == NULL) { ==== //depot/projects/soc2009/trasz_limits/sbin/dumpfs/dumpfs.c#3 (text+ko) ==== @@ -53,7 +53,7 @@ static char sccsid[] = "@(#)dumpfs.c 8.5 (Berkeley) 4/29/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/dumpfs/dumpfs.c,v 1.47 2009/10/19 14:04:19 ru Exp $"; + "$FreeBSD: src/sbin/dumpfs/dumpfs.c,v 1.48 2009/12/21 19:39:10 trasz Exp $"; #endif /* not lint */ #include @@ -251,8 +251,11 @@ printf("gjournal "); if (fsflags & FS_FLAGS_UPDATED) printf("fs_flags expanded "); + if (fsflags & FS_NFS4ACLS) + printf("nfsv4acls "); fsflags &= ~(FS_UNCLEAN | FS_DOSOFTDEP | FS_NEEDSFSCK | FS_INDEXDIRS | - FS_ACLS | FS_MULTILABEL | FS_GJOURNAL | FS_FLAGS_UPDATED); + FS_ACLS | FS_MULTILABEL | FS_GJOURNAL | FS_FLAGS_UPDATED | + FS_NFS4ACLS); if (fsflags != 0) printf("unknown flags (%#x)", fsflags); putchar('\n'); ==== //depot/projects/soc2009/trasz_limits/sbin/mount/mntopts.h#2 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)mntopts.h 8.7 (Berkeley) 3/29/95 - * $FreeBSD: src/sbin/mount/mntopts.h,v 1.29 2005/12/02 03:55:02 rodrigc Exp $ + * $FreeBSD: src/sbin/mount/mntopts.h,v 1.30 2009/12/21 19:39:10 trasz Exp $ */ struct mntopt { @@ -54,6 +54,7 @@ #define MOPT_SNAPSHOT { "snapshot", 0, MNT_SNAPSHOT, 0 } #define MOPT_MULTILABEL { "multilabel", 0, MNT_MULTILABEL, 0 } #define MOPT_ACLS { "acls", 0, MNT_ACLS, 0 } +#define MOPT_NFS4ACLS { "nfsv4acls", 0, MNT_NFS4ACLS, 0 } /* Control flags. */ #define MOPT_FORCE { "force", 0, MNT_FORCE, 0 } @@ -87,7 +88,8 @@ MOPT_NOCLUSTERR, \ MOPT_NOCLUSTERW, \ MOPT_MULTILABEL, \ - MOPT_ACLS + MOPT_ACLS, \ + MOPT_NFS4ACLS void getmntopts(const char *, const struct mntopt *, int *, int *); void rmslashes(char *, char *); ==== //depot/projects/soc2009/trasz_limits/sbin/mount/mount.8#4 (text+ko) ==== @@ -26,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)mount.8 8.8 (Berkeley) 6/16/94 -.\" $FreeBSD: src/sbin/mount/mount.8,v 1.92 2009/11/11 12:55:58 trasz Exp $ +.\" $FreeBSD: src/sbin/mount/mount.8,v 1.93 2009/12/21 19:39:10 trasz Exp $ .\" .Dd March 11, 2008 .Dt MOUNT 8 @@ -120,11 +120,14 @@ The following options are available: .Bl -tag -width indent .It Cm acls -Enable Access Control Lists, or ACLS, which can be customized via the +Enable POSIX.1e Access Control Lists, or ACLs, which can be customized via the .Xr setfacl 1 and .Xr getfacl 1 commands. +This flag is mutually exclusive with +.Cm nfsv4acls +flag. .It Cm async All .Tn I/O @@ -186,6 +189,15 @@ .Xr mac 4 for more information, which cause the multilabel mount flag to be set automatically at mount-time. +.It Cm nfsv4acls +Enable NFSv4 ACLs, which can be customized via the +.Xr setfacl 1 +and +.Xr getfacl 1 +commands. +This flag is mutually exclusive with +.Cm acls +flag. .It Cm noasync Metadata I/O should be done synchronously, while data I/O should be done asynchronously. ==== //depot/projects/soc2009/trasz_limits/sbin/mount/mount.c#4 (text+ko) ==== @@ -37,7 +37,7 @@ #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/sbin/mount/mount.c,v 1.108 2009/09/14 21:08:22 pjd Exp $"); +__FBSDID("$FreeBSD: src/sbin/mount/mount.c,v 1.109 2009/12/21 19:39:10 trasz Exp $"); #include #include @@ -111,6 +111,7 @@ { MNT_SOFTDEP, "soft-updates" }, { MNT_MULTILABEL, "multilabel" }, { MNT_ACLS, "acls" }, + { MNT_NFS4ACLS, "nfsv4acls" }, { MNT_GJOURNAL, "gjournal" }, { 0, NULL } }; @@ -918,6 +919,7 @@ if (flags & MNT_SUIDDIR) res = catopt(res, "suiddir"); if (flags & MNT_MULTILABEL) res = catopt(res, "multilabel"); if (flags & MNT_ACLS) res = catopt(res, "acls"); + if (flags & MNT_NFS4ACLS) res = catopt(res, "nfsv4acls"); return (res); } ==== //depot/projects/soc2009/trasz_limits/sbin/tunefs/tunefs.8#3 (text+ko) ==== @@ -26,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)tunefs.8 8.2 (Berkeley) 12/11/93 -.\" $FreeBSD: src/sbin/tunefs/tunefs.8,v 1.41 2009/10/21 10:15:26 remko Exp $ +.\" $FreeBSD: src/sbin/tunefs/tunefs.8,v 1.42 2009/12/21 19:39:10 trasz Exp $ .\" .Dd October 21, 2009 .Dt TUNEFS 8 @@ -44,6 +44,7 @@ .Op Fl L Ar volname .Op Fl l Cm enable | disable .Op Fl m Ar minfree +.Op Fl N Cm enable | disable .Op Fl n Cm enable | disable .Op Fl o Cm space | time .Op Fl p @@ -70,7 +71,7 @@ primary super-block. This is potentially dangerous - use with caution. .It Fl a Cm enable | disable -Turn on/off the administrative ACL enable flag. +Turn on/off the administrative POSIX.1e ACL enable flag. .It Fl e Ar maxbpg Indicate the maximum number of blocks any single file can allocate out of a cylinder group before it is forced to begin @@ -114,6 +115,8 @@ If the value is raised above the current usage level, users will be unable to allocate files until enough files have been deleted to get under the higher threshold. +.It Fl N Cm enable | disable +Turn on/off the administrative NFSv4 ACL enable flag. .It Fl n Cm enable | disable Turn on/off soft updates. .It Fl o Cm space | time ==== //depot/projects/soc2009/trasz_limits/sbin/tunefs/tunefs.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/sbin/tunefs/tunefs.c,v 1.43 2006/10/31 21:52:28 pjd Exp $"); +__FBSDID("$FreeBSD: src/sbin/tunefs/tunefs.c,v 1.44 2009/12/21 19:39:10 trasz Exp $"); /* * tunefs: change layout parameters to an existing file system. @@ -76,12 +76,12 @@ int main(int argc, char *argv[]) { - char *avalue, *Jvalue, *Lvalue, *lvalue, *nvalue; + char *avalue, *Jvalue, *Lvalue, *lvalue, *Nvalue, *nvalue; const char *special, *on; const char *name; int active; int Aflag, aflag, eflag, evalue, fflag, fvalue, Jflag, Lflag, lflag; - int mflag, mvalue, nflag, oflag, ovalue, pflag, sflag, svalue; + int mflag, mvalue, Nflag, nflag, oflag, ovalue, pflag, sflag, svalue; int ch, found_arg, i; const char *chg[2]; struct ufs_args args; @@ -90,12 +90,12 @@ if (argc < 3) usage(); Aflag = aflag = eflag = fflag = Jflag = Lflag = lflag = mflag = 0; - nflag = oflag = pflag = sflag = 0; - avalue = Jvalue = Lvalue = lvalue = nvalue = NULL; + Nflag = nflag = oflag = pflag = sflag = 0; + avalue = Jvalue = Lvalue = lvalue = Nvalue = nvalue = NULL; evalue = fvalue = mvalue = ovalue = svalue = 0; active = 0; found_arg = 0; /* At least one arg is required. */ - while ((ch = getopt(argc, argv, "Aa:e:f:J:L:l:m:n:o:ps:")) != -1) + while ((ch = getopt(argc, argv, "Aa:e:f:J:L:l:m:N:n:o:ps:")) != -1) switch (ch) { case 'A': @@ -105,7 +105,7 @@ case 'a': found_arg = 1; - name = "ACLs"; + name = "POSIX.1e ACLs"; avalue = optarg; if (strcmp(avalue, "enable") && strcmp(avalue, "disable")) { @@ -187,6 +187,18 @@ mflag = 1; break; + case 'N': + found_arg = 1; + name = "NFSv4 ACLs"; + Nvalue = optarg; + if (strcmp(Nvalue, "enable") && + strcmp(Nvalue, "disable")) { + errx(10, "bad %s (options are %s)", + name, "`enable' or `disable'"); + } + Nflag = 1; + break; + case 'n': found_arg = 1; name = "soft updates"; @@ -255,10 +267,13 @@ strlcpy(sblock.fs_volname, Lvalue, MAXVOLLEN); } if (aflag) { - name = "ACLs"; + name = "POSIX.1e ACLs"; if (strcmp(avalue, "enable") == 0) { if (sblock.fs_flags & FS_ACLS) { warnx("%s remains unchanged as enabled", name); + } else if (sblock.fs_flags & FS_NFS4ACLS) { + warnx("%s and NFSv4 ACLs are mutually " + "exclusive", name); } else { sblock.fs_flags |= FS_ACLS; warnx("%s set", name); @@ -349,6 +364,29 @@ warnx(OPTWARN, "space", "<", MINFREE); } } + if (Nflag) { + name = "NFSv4 ACLs"; + if (strcmp(Nvalue, "enable") == 0) { + if (sblock.fs_flags & FS_NFS4ACLS) { + warnx("%s remains unchanged as enabled", name); + } else if (sblock.fs_flags & FS_ACLS) { + warnx("%s and POSIX.1e ACLs are mutually " + "exclusive", name); + } else { + sblock.fs_flags |= FS_NFS4ACLS; + warnx("%s set", name); + } + } else if (strcmp(Nvalue, "disable") == 0) { + if ((~sblock.fs_flags & FS_NFS4ACLS) == + FS_NFS4ACLS) { + warnx("%s remains unchanged as disabled", + name); + } else { + sblock.fs_flags &= ~FS_NFS4ACLS; + warnx("%s cleared", name); + } + } + } if (nflag) { name = "soft updates"; if (strcmp(nvalue, "enable") == 0) { @@ -423,16 +461,18 @@ fprintf(stderr, "%s\n%s\n%s\n%s\n", "usage: tunefs [-A] [-a enable | disable] [-e maxbpg] [-f avgfilesize]", " [-J enable | disable ] [-L volname] [-l enable | disable]", -" [-m minfree] [-n enable | disable] [-o space | time] [-p]", -" [-s avgfpdir] special | filesystem"); +" [-m minfree] [-N enable | disable] [-n enable | disable]", +" [-o space | time] [-p] [-s avgfpdir] special | filesystem"); exit(2); } void printfs(void) { - warnx("ACLs: (-a) %s", + warnx("POSIX.1e ACLs: (-a) %s", (sblock.fs_flags & FS_ACLS)? "enabled" : "disabled"); + warnx("NFSv4 ACLs: (-N) %s", + (sblock.fs_flags & FS_NFS4ACLS)? "enabled" : "disabled"); warnx("MAC multilabel: (-l) %s", (sblock.fs_flags & FS_MULTILABEL)? "enabled" : "disabled"); warnx("soft updates: (-n) %s", ==== //depot/projects/soc2009/trasz_limits/sys/dev/ahci/ahci.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ahci/ahci.c,v 1.19 2009/12/06 23:56:54 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ahci/ahci.c,v 1.20 2009/12/21 21:27:56 mav Exp $"); #include #include @@ -596,20 +596,18 @@ unit = irq->r_irq_rid - 1; is = ATA_INL(ctlr->r_mem, AHCI_IS); } + /* Some controllers have edge triggered IS. */ + if (ctlr->quirks & AHCI_Q_EDGEIS) + ATA_OUTL(ctlr->r_mem, AHCI_IS, is); for (; unit < ctlr->channels; unit++) { if ((is & (1 << unit)) != 0 && (arg = ctlr->interrupt[unit].argument)) { - if (ctlr->quirks & AHCI_Q_EDGEIS) { - /* Some controller have edge triggered IS. */ - ATA_OUTL(ctlr->r_mem, AHCI_IS, 1 << unit); ctlr->interrupt[unit].function(arg); - } else { - /* but AHCI declares level triggered IS. */ - ctlr->interrupt[unit].function(arg); - ATA_OUTL(ctlr->r_mem, AHCI_IS, 1 << unit); - } } } + /* AHCI declares level triggered IS. */ + if (!(ctlr->quirks & AHCI_Q_EDGEIS)) + ATA_OUTL(ctlr->r_mem, AHCI_IS, is); } /* ==== //depot/projects/soc2009/trasz_limits/sys/dev/ata/chipsets/ata-amd.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-amd.c,v 1.4 2009/12/14 21:11:50 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/chipsets/ata-amd.c,v 1.5 2009/12/21 21:47:33 mav Exp $"); #include "opt_ata.h" #include @@ -61,7 +61,7 @@ #define AMD_CABLE 0x02 /* - * American Micro Devices (AMD) chipset support functions + * Advanced Micro Devices (AMD) chipset support functions */ static int ata_amd_probe(device_t dev) ==== //depot/projects/soc2009/trasz_limits/sys/dev/auxio/auxio.c#2 (text+ko) ==== @@ -56,12 +56,12 @@ */ /* - * AUXIO registers support on the sbus & ebus2, used for the floppy driver + * AUXIO registers support on the SBus & EBus2, used for the floppy driver * and to control the system LED, for the BLINK option. */ #include -__FBSDID("$FreeBSD: src/sys/dev/auxio/auxio.c,v 1.5 2006/01/26 19:04:18 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/auxio/auxio.c,v 1.6 2009/12/21 21:29:16 marius Exp $"); #include #include @@ -85,8 +85,8 @@ #include /* - * on sun4u, auxio exists with one register (LED) on the sbus, and 5 - * registers on the ebus2 (pci) (LED, PCIMODE, FREQUENCY, SCSI + * On sun4u, auxio exists with one register (LED) on the SBus, and 5 + * registers on the EBus2 (pci) (LED, PCIMODE, FREQUENCY, SCSI * OSCILLATOR, and TEMP SENSE. */ @@ -142,6 +142,7 @@ static devclass_t auxio_devclass; DRIVER_MODULE(auxio, sbus, auxio_sbus_driver, auxio_devclass, 0, 0); +MODULE_DEPEND(auxio, sbus, 1, 1, 1); /* EBus */ static device_method_t auxio_ebus_methods[] = { @@ -158,6 +159,7 @@ }; DRIVER_MODULE(auxio, ebus, auxio_ebus_driver, auxio_devclass, 0, 0); +MODULE_DEPEND(auxio, ebus, 1, 1, 1); MODULE_VERSION(auxio, 1); #define AUXIO_LOCK_INIT(sc) \ ==== //depot/projects/soc2009/trasz_limits/sys/dev/if_ndis/if_ndis_usb.c#7 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis_usb.c,v 1.20 2009/11/02 11:07:42 rpaulo Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/if_ndis/if_ndis_usb.c,v 1.21 2009/12/22 02:04:16 thompsa Exp $"); #include #include @@ -165,6 +165,7 @@ driver_object *drv; int devidx = 0; + device_set_usb_desc(self); db = uaa->driver_ivar; sc = (struct ndis_softc *)dummy; sc->ndis_dev = self; ==== //depot/projects/soc2009/trasz_limits/sys/dev/sound/usb/uaudio.c#10 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD: uaudio.c,v 1.91 2004/11/05 17:46:14 kent Exp $ */ -/* $FreeBSD: src/sys/dev/sound/usb/uaudio.c,v 1.59 2009/11/22 21:26:27 thompsa Exp $ */ +/* $FreeBSD: src/sys/dev/sound/usb/uaudio.c,v 1.60 2009/12/22 02:11:37 thompsa Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -87,20 +87,27 @@ #include #include "feeder_if.h" -static int uaudio_default_rate = 96000; +static int uaudio_default_rate = 0; /* use rate list */ static int uaudio_default_bits = 32; -static int uaudio_default_channels = 2; +static int uaudio_default_channels = 0; /* use default */ #if USB_DEBUG static int uaudio_debug = 0; SYSCTL_NODE(_hw_usb, OID_AUTO, uaudio, CTLFLAG_RW, 0, "USB uaudio"); + SYSCTL_INT(_hw_usb_uaudio, OID_AUTO, debug, CTLFLAG_RW, &uaudio_debug, 0, "uaudio debug level"); + +TUNABLE_INT("hw.usb.uaudio.default_rate", &uaudio_default_rate); SYSCTL_INT(_hw_usb_uaudio, OID_AUTO, default_rate, CTLFLAG_RW, &uaudio_default_rate, 0, "uaudio default sample rate"); + +TUNABLE_INT("hw.usb.uaudio.default_bits", &uaudio_default_bits); SYSCTL_INT(_hw_usb_uaudio, OID_AUTO, default_bits, CTLFLAG_RW, &uaudio_default_bits, 0, "uaudio default sample bits"); + +TUNABLE_INT("hw.usb.uaudio.default_channels", &uaudio_default_channels); SYSCTL_INT(_hw_usb_uaudio, OID_AUTO, default_channels, CTLFLAG_RW, &uaudio_default_channels, 0, "uaudio default sample channels"); #endif @@ -169,10 +176,16 @@ uint32_t intr_size; /* in bytes */ uint32_t intr_frames; /* in units */ uint32_t sample_rate; + uint32_t frames_per_second; + uint32_t sample_rem; + uint32_t sample_curr; + uint32_t format; uint32_t pcm_format[2]; - uint16_t bytes_per_frame; + uint16_t bytes_per_frame[2]; + + uint16_t sample_size; uint8_t valid; uint8_t iface_index; @@ -330,7 +343,7 @@ static usb_callback_t umidi_bulk_write_callback; static void uaudio_chan_fill_info_sub(struct uaudio_softc *, - struct usb_device *, uint32_t, uint16_t, uint8_t, uint8_t); + struct usb_device *, uint32_t, uint8_t, uint8_t); static void uaudio_chan_fill_info(struct uaudio_softc *, struct usb_device *); static void uaudio_mixer_add_ctl_sub(struct uaudio_softc *, @@ -787,8 +800,7 @@ static void uaudio_chan_fill_info_sub(struct uaudio_softc *sc, struct usb_device *udev, - uint32_t rate, uint16_t fps, uint8_t channels, - uint8_t bit_resolution) + uint32_t rate, uint8_t channels, uint8_t bit_resolution) { struct usb_descriptor *desc = NULL; const struct usb2_audio_streaming_interface_descriptor *asid = NULL; @@ -811,7 +823,6 @@ uint8_t bBitResolution; uint8_t x; uint8_t audio_if = 0; - uint8_t sample_size; while ((desc = usb_desc_foreach(cd, desc))) { @@ -1040,16 +1051,10 @@ chan->usb2_cfg = uaudio_cfg_play; - sample_size = (( + chan->sample_size = (( UAUDIO_MAX_CHAN(chan->p_asf1d->bNrChannels) * chan->p_asf1d->bBitResolution) / 8); - /* - * NOTE: "chan->bytes_per_frame" - * should not be zero! - */ - chan->bytes_per_frame = ((rate / fps) * sample_size); - if (sc->sc_sndstat_valid) { sbuf_printf(&sc->sc_sndstat, "\n\t" "mode %d.%d:(%s) %dch, %d/%dbit, %s, %dHz", @@ -1067,12 +1072,32 @@ } } +/* This structure defines all the supported rates. */ + +static const uint32_t uaudio_rate_list[] = { + 96000, + 88000, + 80000, + 72000, + 64000, + 56000, + 48000, + 44100, + 40000, + 32000, + 24000, + 22050, + 16000, + 11025, + 8000, + 0 +}; + static void uaudio_chan_fill_info(struct uaudio_softc *sc, struct usb_device *udev) { uint32_t rate = uaudio_default_rate; - uint32_t z; - uint16_t fps = usbd_get_isoc_fps(udev); + uint8_t z; uint8_t bits = uaudio_default_bits; uint8_t y; uint8_t channels = uaudio_default_channels; @@ -1083,14 +1108,24 @@ /* set a valid value */ bits = 32; } - rate -= (rate % fps); - if ((rate == 0) || (rate > 192000)) { - /* set a valid value */ - rate = 192000 - (192000 % fps); - } - if ((channels == 0) || (channels > 2)) { - /* set a valid value */ - channels = 2; + if (channels == 0) { + switch (usbd_get_speed(udev)) { + case USB_SPEED_LOW: + case USB_SPEED_FULL: + /* + * Due to high bandwidth usage and problems + * with HIGH-speed split transactions we + * disable surround setups on FULL-speed USB + * by default + */ + channels = 2; + break; + default: + channels = 16; + break; + } + } else if (channels > 16) { + channels = 16; } if (sbuf_new(&sc->sc_sndstat, NULL, 4096, SBUF_AUTOEXTEND)) { sc->sc_sndstat_valid = 1; @@ -1099,8 +1134,14 @@ for (x = channels; x; x--) { for (y = bits; y; y -= 8) { - for (z = rate; z; z -= fps) { - uaudio_chan_fill_info_sub(sc, udev, z, fps, x, y); + + /* try user defined rate, if any */ + if (rate != 0) + uaudio_chan_fill_info_sub(sc, udev, rate, x, y); + + /* try find a matching rate, if any */ + for (z = 0; uaudio_rate_list[z]; z++) { + uaudio_chan_fill_info_sub(sc, udev, uaudio_rate_list[z], x, y); if (sc->sc_rec_chan.valid && sc->sc_play_chan.valid) { @@ -1116,19 +1157,7 @@ } } -/* - * The following function sets up data size and block count for the - * next audio transfer. - */ static void -uaudio_setup_blockcount(struct uaudio_chan *ch, - uint32_t *total, uint32_t *blockcount) -{ - *total = ch->intr_size; - *blockcount = ch->intr_frames; -} - -static void uaudio_chan_play_callback(struct usb_xfer *xfer, usb_error_t error) { struct uaudio_chan *ch = usbd_xfer_softc(xfer); @@ -1137,12 +1166,11 @@ uint32_t blockcount; uint32_t n; uint32_t offset; - int actlen, sumlen; + int actlen; + int sumlen; usbd_xfer_status(xfer, &actlen, &sumlen, NULL, NULL); - uaudio_setup_blockcount(ch, &total, &blockcount); - if (ch->end == ch->start) { DPRINTF("no buffer!\n"); return; @@ -1153,22 +1181,39 @@ tr_transferred: if (actlen < sumlen) { DPRINTF("short transfer, " - "%d of %d bytes\n", actlen, total); + "%d of %d bytes\n", actlen, sumlen); } chn_intr(ch->pcm_ch); case USB_ST_SETUP: - if (ch->bytes_per_frame > usbd_xfer_max_framelen(xfer)) { + if (ch->bytes_per_frame[1] > usbd_xfer_max_framelen(xfer)) { DPRINTF("bytes per transfer, %d, " "exceeds maximum, %d!\n", - ch->bytes_per_frame, + ch->bytes_per_frame[1], usbd_xfer_max_framelen(xfer)); break; } - /* setup frame length */ + + blockcount = ch->intr_frames; + + /* setup number of frames */ usbd_xfer_set_frames(xfer, blockcount); - for (n = 0; n != blockcount; n++) - usbd_xfer_set_frame_len(xfer, n, ch->bytes_per_frame); + + /* reset total length */ + total = 0; + + /* setup frame lengths */ + for (n = 0; n != blockcount; n++) { + ch->sample_curr += ch->sample_rem; + if (ch->sample_curr >= ch->frames_per_second) { + ch->sample_curr -= ch->frames_per_second; + usbd_xfer_set_frame_len(xfer, n, ch->bytes_per_frame[1]); + total += ch->bytes_per_frame[1]; + } else { + usbd_xfer_set_frame_len(xfer, n, ch->bytes_per_frame[0]); + total += ch->bytes_per_frame[0]; + } + } DPRINTFN(6, "transfer %d bytes\n", total); @@ -1210,7 +1255,6 @@ struct usb_page_cache *pc; uint32_t n; uint32_t m; - uint32_t total; uint32_t blockcount; uint32_t offset0; uint32_t offset1; @@ -1222,8 +1266,6 @@ usbd_xfer_status(xfer, &actlen, NULL, NULL, &nframes); mfl = usbd_xfer_max_framelen(xfer); - uaudio_setup_blockcount(ch, &total, &blockcount); - if (ch->end == ch->start) { DPRINTF("no buffer!\n"); return; @@ -1231,12 +1273,8 @@ switch (USB_GET_STATE(xfer)) { case USB_ST_TRANSFERRED: - if (actlen < total) { - DPRINTF("short transfer, " - "%d of %d bytes\n", actlen, total); - } else { - DPRINTFN(6, "transferred %d bytes\n", actlen); - } + + DPRINTFN(6, "transferred %d bytes\n", actlen); offset0 = 0; pc = usbd_xfer_get_frame(xfer, 0); @@ -1271,6 +1309,8 @@ case USB_ST_SETUP: tr_setup: + blockcount = ch->intr_frames; + usbd_xfer_set_frames(xfer, blockcount); for (n = 0; n < blockcount; n++) { usbd_xfer_set_frame_len(xfer, n, mfl); @@ -1295,6 +1335,8 @@ &sc->sc_play_chan : &sc->sc_rec_chan); uint32_t buf_size; uint32_t frames; + uint32_t format; + uint16_t fps; uint8_t endpoint; uint8_t blocks; uint8_t iface_index; @@ -1302,7 +1344,9 @@ uint8_t fps_shift; usb_error_t err; - if (usbd_get_isoc_fps(sc->sc_udev) < 8000) { + fps = usbd_get_isoc_fps(sc->sc_udev); + + if (fps < 8000) { /* FULL speed USB */ frames = 8; } else { @@ -1310,10 +1354,6 @@ frames = UAUDIO_NFRAMES; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Dec 22 12:00:53 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CE590106568F; Tue, 22 Dec 2009 12:00:52 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5921C1065692 for ; Tue, 22 Dec 2009 12:00:52 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4697F8FC1A for ; Tue, 22 Dec 2009 12:00:52 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nBMC0qjQ098563 for ; Tue, 22 Dec 2009 12:00:52 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nBMC0qB9098561 for perforce@freebsd.org; Tue, 22 Dec 2009 12:00:52 GMT (envelope-from trasz@freebsd.org) Date: Tue, 22 Dec 2009 12:00:52 GMT Message-Id: <200912221200.nBMC0qB9098561@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 172077 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Dec 2009 12:00:53 -0000 http://p4web.freebsd.org/chv.cgi?CH=172077 Change 172077 by trasz@trasz_victim on 2009/12/22 11:59:59 Fix mismerge. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/02.t#8 integrate Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/02.t#8 (text+ko) ==== @@ -1,5 +1,32 @@ #!/bin/sh # +# Copyright (c) 2008, 2009 Edward Tomasz Napierała +# 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. +# +# 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. +# +# $FreeBSD: src/tools/regression/acltools/02.t,v 1.1 2009/12/21 20:47:41 trasz Exp $ +# + # This is a wrapper script to run tools-nfs4.test. # # If any of the tests fails, here is how to debug it: go to From owner-p4-projects@FreeBSD.ORG Wed Dec 23 00:48:47 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0791010656C7; Wed, 23 Dec 2009 00:48:47 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BEC7410656C4 for ; Wed, 23 Dec 2009 00:48:46 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8FC5C8FC12 for ; Wed, 23 Dec 2009 00:48:46 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nBN0mkTh011394 for ; Wed, 23 Dec 2009 00:48:46 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nBN0mjWK011392 for perforce@freebsd.org; Wed, 23 Dec 2009 00:48:45 GMT (envelope-from thompsa@freebsd.org) Date: Wed, 23 Dec 2009 00:48:45 GMT Message-Id: <200912230048.nBN0mjWK011392@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 Precedence: bulk Cc: Subject: PERFORCE change 172119 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Dec 2009 00:48:47 -0000 http://p4web.freebsd.org/chv.cgi?CH=172119 Change 172119 by thompsa@thompsa_pea on 2009/12/23 00:48:09 IFC @172117 Affected files ... .. //depot/projects/usb/src/lib/libusb/libusb10.c#20 integrate .. //depot/projects/usb/src/sys/amd64/acpica/acpi_switch.S#3 integrate .. //depot/projects/usb/src/sys/amd64/amd64/mca.c#3 integrate .. //depot/projects/usb/src/sys/amd64/amd64/vm_machdep.c#15 integrate .. //depot/projects/usb/src/sys/amd64/conf/DEFAULTS#12 integrate .. //depot/projects/usb/src/sys/amd64/conf/NOTES#24 integrate .. //depot/projects/usb/src/sys/amd64/ia32/ia32_syscall.c#5 integrate .. //depot/projects/usb/src/sys/amd64/include/mca.h#2 integrate .. //depot/projects/usb/src/sys/arm/conf/AVILA#18 integrate .. //depot/projects/usb/src/sys/arm/conf/CAMBRIA#10 integrate .. //depot/projects/usb/src/sys/arm/conf/DEFAULTS#3 integrate .. //depot/projects/usb/src/sys/arm/mv/mv_sata.c#3 integrate .. //depot/projects/usb/src/sys/boot/common/Makefile.inc#5 integrate .. //depot/projects/usb/src/sys/boot/common/md.c#1 branch .. //depot/projects/usb/src/sys/boot/i386/Makefile#7 integrate .. //depot/projects/usb/src/sys/boot/i386/gptboot/gptboot.c#5 integrate .. //depot/projects/usb/src/sys/boot/i386/libi386/biosacpi.c#4 integrate .. //depot/projects/usb/src/sys/boot/i386/libi386/biosdisk.c#13 integrate .. //depot/projects/usb/src/sys/boot/i386/libi386/biosmem.c#3 integrate .. //depot/projects/usb/src/sys/boot/i386/libi386/libi386.h#4 integrate .. //depot/projects/usb/src/sys/boot/i386/loader/main.c#9 integrate .. //depot/projects/usb/src/sys/boot/i386/zfsboot/zfsboot.c#7 integrate .. //depot/projects/usb/src/sys/boot/pc98/boot2/Makefile#3 integrate .. //depot/projects/usb/src/sys/boot/pc98/boot2/bios.S#2 integrate .. //depot/projects/usb/src/sys/boot/pc98/boot2/boot.c#5 integrate .. //depot/projects/usb/src/sys/boot/pc98/boot2/boot.h#2 integrate .. //depot/projects/usb/src/sys/boot/pc98/boot2/disk.c#2 integrate .. //depot/projects/usb/src/sys/boot/pc98/boot2/io.c#2 integrate .. //depot/projects/usb/src/sys/boot/pc98/boot2/serial_16550.S#2 integrate .. //depot/projects/usb/src/sys/boot/pc98/boot2/sys.c#3 integrate .. //depot/projects/usb/src/sys/boot/pc98/btx/btx/btx.S#4 integrate .. //depot/projects/usb/src/sys/boot/pc98/kgzldr/crt.s#2 integrate .. //depot/projects/usb/src/sys/boot/pc98/libpc98/biosdisk.c#6 integrate .. //depot/projects/usb/src/sys/boot/pc98/libpc98/biosmem.c#2 integrate .. //depot/projects/usb/src/sys/boot/pc98/loader/main.c#7 integrate .. //depot/projects/usb/src/sys/boot/uboot/lib/glue.c#6 integrate .. //depot/projects/usb/src/sys/boot/zfs/zfsimpl.c#6 integrate .. //depot/projects/usb/src/sys/cam/ata/ata_all.c#6 integrate .. //depot/projects/usb/src/sys/cam/ata/ata_all.h#5 integrate .. //depot/projects/usb/src/sys/cam/ata/ata_da.c#8 integrate .. //depot/projects/usb/src/sys/cam/ata/ata_pmp.c#3 integrate .. //depot/projects/usb/src/sys/cam/ata/ata_xpt.c#8 integrate .. //depot/projects/usb/src/sys/cam/cam_periph.h#7 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_cd.c#14 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#4 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#4 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#5 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#6 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#17 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#4 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#5 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_proto.h#23 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_syscall.h#22 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_syscalls.c#22 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_sysent.c#23 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/syscalls.master#22 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_ioctl.c#20 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_ioctl.h#5 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_signal.c#6 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_videodev.h#1 branch .. //depot/projects/usb/src/sys/compat/linux/linux_videodev_compat.h#1 branch .. //depot/projects/usb/src/sys/compat/x86bios/x86bios.c#3 integrate .. //depot/projects/usb/src/sys/conf/NOTES#51 integrate .. //depot/projects/usb/src/sys/conf/files#88 integrate .. //depot/projects/usb/src/sys/conf/options#44 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/changes.txt#5 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslcompile.c#6 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/debugger/dbutils.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/disassembler/dmwalk.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/dispatcher/dsmethod.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/dispatcher/dswload.c#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/events/evregion.c#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/events/evrgnini.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/events/evxface.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/events/evxfevnt.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/events/evxfregn.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/executer/exmutex.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acnamesp.h#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acobject.h#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acoutput.h#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acpixf.h#5 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/namespace/nsaccess.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/namespace/nsdump.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/namespace/nseval.c#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/namespace/nsnames.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/namespace/nspredef.c#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/namespace/nsrepair.c#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/namespace/nsrepair2.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/namespace/nsutils.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/namespace/nsxfeval.c#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/namespace/nsxfname.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/namespace/nsxfobj.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/parser/psxface.c#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/resources/rsxface.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/tools/acpiexec/aecommon.h#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/utilities/utcopy.c#2 integrate .. //depot/projects/usb/src/sys/dev/aac/aac.c#12 integrate .. //depot/projects/usb/src/sys/dev/aac/aac_cam.c#9 integrate .. //depot/projects/usb/src/sys/dev/aac/aacvar.h#7 integrate .. //depot/projects/usb/src/sys/dev/agp/agp_via.c#5 integrate .. //depot/projects/usb/src/sys/dev/ahci/ahci.c#8 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-all.c#22 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-all.h#17 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-disk.c#19 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-dma.c#12 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-lowlevel.c#7 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-pci.c#17 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-pci.h#25 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-queue.c#17 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-sata.c#7 integrate .. //depot/projects/usb/src/sys/dev/ata/ata_if.m#4 integrate .. //depot/projects/usb/src/sys/dev/ata/atapi-cd.c#14 integrate .. //depot/projects/usb/src/sys/dev/ata/atapi-cd.h#5 integrate .. //depot/projects/usb/src/sys/dev/ata/atapi-fd.c#10 integrate .. //depot/projects/usb/src/sys/dev/ata/atapi-tape.c#12 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-acard.c#5 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-acerlabs.c#7 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-ahci.c#12 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-amd.c#3 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-ati.c#5 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-cenatek.c#3 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-cypress.c#3 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-cyrix.c#3 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-highpoint.c#4 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-intel.c#10 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-ite.c#3 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-jmicron.c#6 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-marvell.c#11 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-micron.c#3 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-national.c#3 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-netcell.c#4 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-nvidia.c#10 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-promise.c#9 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-serverworks.c#6 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-siliconimage.c#9 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-sis.c#7 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-via.c#7 integrate .. //depot/projects/usb/src/sys/dev/atkbdc/psm.c#13 integrate .. //depot/projects/usb/src/sys/dev/auxio/auxio.c#2 integrate .. //depot/projects/usb/src/sys/dev/bge/if_bge.c#25 integrate .. //depot/projects/usb/src/sys/dev/bge/if_bgereg.h#14 integrate .. //depot/projects/usb/src/sys/dev/ciss/ciss.c#18 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_common.h#12 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_t3fw.h#4 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#5 integrate .. //depot/projects/usb/src/sys/dev/dpms/dpms.c#5 integrate .. //depot/projects/usb/src/sys/dev/e1000/LICENSE#2 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_80003es2lan.c#4 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_80003es2lan.h#2 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_82541.c#5 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_82543.c#3 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_82571.c#5 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_82575.c#5 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_82575.h#5 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_api.c#5 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_defines.h#5 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_hw.h#5 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_ich8lan.c#6 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_ich8lan.h#5 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_mac.c#5 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_manage.c#3 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_osdep.h#3 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_phy.c#5 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_phy.h#5 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_regs.h#5 integrate .. //depot/projects/usb/src/sys/dev/e1000/if_em.c#14 integrate .. //depot/projects/usb/src/sys/dev/e1000/if_em.h#6 integrate .. //depot/projects/usb/src/sys/dev/e1000/if_igb.c#16 integrate .. //depot/projects/usb/src/sys/dev/e1000/if_igb.h#5 integrate .. //depot/projects/usb/src/sys/dev/fdc/fdc_acpi.c#3 integrate .. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_intel.c#5 integrate .. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_x86.c#9 integrate .. //depot/projects/usb/src/sys/dev/ichsmb/ichsmb_pci.c#5 integrate .. //depot/projects/usb/src/sys/dev/if_ndis/if_ndis.c#35 integrate .. //depot/projects/usb/src/sys/dev/if_ndis/if_ndis_usb.c#24 integrate .. //depot/projects/usb/src/sys/dev/iir/iir_ctrl.c#5 integrate .. //depot/projects/usb/src/sys/dev/ipmi/ipmi.c#6 integrate .. //depot/projects/usb/src/sys/dev/ips/ips_pci.c#5 integrate .. //depot/projects/usb/src/sys/dev/isp/isp_freebsd.c#13 integrate .. //depot/projects/usb/src/sys/dev/isp/isp_freebsd.h#10 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe.c#15 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe.h#9 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_82598.c#8 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_82599.c#3 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_api.c#8 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_api.h#8 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_common.c#8 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_common.h#7 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_osdep.h#7 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_phy.c#8 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_phy.h#8 integrate .. //depot/projects/usb/src/sys/dev/ixgbe/ixgbe_type.h#8 integrate .. //depot/projects/usb/src/sys/dev/mfi/mfi.c#19 integrate .. //depot/projects/usb/src/sys/dev/mii/ip1000phy.c#5 integrate .. //depot/projects/usb/src/sys/dev/mxge/if_mxge.c#19 integrate .. //depot/projects/usb/src/sys/dev/pci/pci.c#31 integrate .. //depot/projects/usb/src/sys/dev/pci/pci_pci.c#11 integrate .. //depot/projects/usb/src/sys/dev/puc/puc.c#5 integrate .. //depot/projects/usb/src/sys/dev/puc/pucdata.c#14 integrate .. //depot/projects/usb/src/sys/dev/siis/siis.c#8 integrate .. //depot/projects/usb/src/sys/dev/siis/siis.h#4 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/hda/hdac.c#39 integrate .. //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#66 integrate .. //depot/projects/usb/src/sys/dev/ste/if_ste.c#5 integrate .. //depot/projects/usb/src/sys/dev/ste/if_stereg.h#3 integrate .. //depot/projects/usb/src/sys/dev/uart/uart_bus_acpi.c#2 integrate .. //depot/projects/usb/src/sys/dev/uart/uart_bus_pci.c#7 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/ehci_pci.c#24 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/ohci_pci.c#14 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/uhci_pci.c#17 integrate .. //depot/projects/usb/src/sys/dev/usb/input/atp.c#5 integrate .. //depot/projects/usb/src/sys/dev/usb/input/uhid.c#17 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_axe.c#21 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_cdce.c#26 integrate .. //depot/projects/usb/src/sys/dev/usb/quirk/usb_quirk.c#11 integrate .. //depot/projects/usb/src/sys/dev/usb/quirk/usb_quirk.h#6 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/u3g.c#25 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/uftdi.c#21 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/umodem.c#20 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_device.c#60 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_dynamic.c#10 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_dynamic.h#8 integrate .. //depot/projects/usb/src/sys/dev/usb/usbdevs#90 integrate .. //depot/projects/usb/src/sys/dev/usb/usbdi.h#17 integrate .. //depot/projects/usb/src/sys/dev/vge/if_vge.c#13 integrate .. //depot/projects/usb/src/sys/dev/vge/if_vgereg.h#2 integrate .. //depot/projects/usb/src/sys/dev/vge/if_vgevar.h#4 integrate .. //depot/projects/usb/src/sys/dev/wpi/if_wpi.c#16 integrate .. //depot/projects/usb/src/sys/fs/devfs/devfs_vnops.c#24 integrate .. //depot/projects/usb/src/sys/fs/nfs/nfs_commonacl.c#5 integrate .. //depot/projects/usb/src/sys/fs/nfs/nfs_commonport.c#4 integrate .. //depot/projects/usb/src/sys/fs/nfs/nfs_commonsubs.c#3 integrate .. //depot/projects/usb/src/sys/fs/nfs/nfs_var.h#6 integrate .. //depot/projects/usb/src/sys/fs/nfs/nfsport.h#9 integrate .. //depot/projects/usb/src/sys/fs/nfsclient/nfs_clrpcops.c#5 integrate .. //depot/projects/usb/src/sys/fs/nfsclient/nfs_clvnops.c#13 integrate .. //depot/projects/usb/src/sys/fs/nfsserver/nfs_nfsdcache.c#2 integrate .. //depot/projects/usb/src/sys/fs/ntfs/ntfs.h#3 integrate .. //depot/projects/usb/src/sys/fs/ntfs/ntfs_subr.c#6 integrate .. //depot/projects/usb/src/sys/fs/ntfs/ntfs_vfsops.c#8 integrate .. //depot/projects/usb/src/sys/fs/portalfs/portal_vnops.c#9 integrate .. //depot/projects/usb/src/sys/geom/mirror/g_mirror.c#9 integrate .. //depot/projects/usb/src/sys/geom/mirror/g_mirror.h#4 integrate .. //depot/projects/usb/src/sys/geom/part/g_part.c#22 integrate .. //depot/projects/usb/src/sys/geom/part/g_part.h#9 integrate .. //depot/projects/usb/src/sys/geom/part/g_part_gpt.c#17 integrate .. //depot/projects/usb/src/sys/geom/raid3/g_raid3.c#9 integrate .. //depot/projects/usb/src/sys/geom/raid3/g_raid3.h#4 integrate .. //depot/projects/usb/src/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#9 integrate .. //depot/projects/usb/src/sys/i386/conf/DEFAULTS#13 integrate .. //depot/projects/usb/src/sys/i386/conf/NOTES#29 integrate .. //depot/projects/usb/src/sys/i386/i386/dump_machdep.c#6 integrate .. //depot/projects/usb/src/sys/i386/i386/machdep.c#25 integrate .. //depot/projects/usb/src/sys/i386/i386/mca.c#3 integrate .. //depot/projects/usb/src/sys/i386/i386/minidump_machdep.c#8 integrate .. //depot/projects/usb/src/sys/i386/include/mca.h#2 integrate .. //depot/projects/usb/src/sys/i386/xen/pmap.c#18 integrate .. //depot/projects/usb/src/sys/ia64/conf/DEFAULTS#9 integrate .. //depot/projects/usb/src/sys/ia64/ia64/clock.c#6 integrate .. //depot/projects/usb/src/sys/ia64/ia64/exception.S#6 integrate .. //depot/projects/usb/src/sys/ia64/ia64/genassym.c#4 integrate .. //depot/projects/usb/src/sys/ia64/ia64/interrupt.c#12 integrate .. //depot/projects/usb/src/sys/ia64/ia64/machdep.c#16 integrate .. //depot/projects/usb/src/sys/ia64/ia64/mp_machdep.c#12 integrate .. //depot/projects/usb/src/sys/ia64/ia64/pmap.c#17 integrate .. //depot/projects/usb/src/sys/ia64/include/bus.h#2 integrate .. //depot/projects/usb/src/sys/ia64/include/cpufunc.h#3 integrate .. //depot/projects/usb/src/sys/ia64/include/ia64_cpu.h#5 integrate .. //depot/projects/usb/src/sys/ia64/include/kdb.h#4 integrate .. //depot/projects/usb/src/sys/ia64/include/param.h#8 integrate .. //depot/projects/usb/src/sys/ia64/include/pcpu.h#7 integrate .. //depot/projects/usb/src/sys/ia64/include/pmap.h#5 integrate .. //depot/projects/usb/src/sys/isa/vga_isa.c#5 integrate .. //depot/projects/usb/src/sys/kern/kern_exit.c#25 integrate .. //depot/projects/usb/src/sys/kern/kern_jail.c#34 integrate .. //depot/projects/usb/src/sys/kern/kern_lock.c#22 integrate .. //depot/projects/usb/src/sys/kern/kern_proc.c#24 integrate .. //depot/projects/usb/src/sys/kern/kern_sig.c#22 integrate .. //depot/projects/usb/src/sys/kern/kern_sx.c#20 integrate .. //depot/projects/usb/src/sys/kern/kern_timeout.c#12 integrate .. //depot/projects/usb/src/sys/kern/subr_acl_nfs4.c#3 integrate .. //depot/projects/usb/src/sys/kern/subr_bus.c#35 integrate .. //depot/projects/usb/src/sys/kern/subr_eventhandler.c#3 integrate .. //depot/projects/usb/src/sys/kern/subr_sleepqueue.c#14 integrate .. //depot/projects/usb/src/sys/kern/subr_turnstile.c#10 integrate .. //depot/projects/usb/src/sys/kern/tty_pts.c#20 integrate .. //depot/projects/usb/src/sys/kern/uipc_syscalls.c#23 integrate .. //depot/projects/usb/src/sys/kern/vfs_acl.c#9 integrate .. //depot/projects/usb/src/sys/kern/vfs_subr.c#28 integrate .. //depot/projects/usb/src/sys/kern/vfs_syscalls.c#30 integrate .. //depot/projects/usb/src/sys/kern/vfs_vnops.c#25 integrate .. //depot/projects/usb/src/sys/mips/adm5120/if_admsw.c#7 integrate .. //depot/projects/usb/src/sys/mips/conf/DEFAULTS#3 integrate .. //depot/projects/usb/src/sys/modules/ipfw/Makefile#6 integrate .. //depot/projects/usb/src/sys/net/if_bridge.c#21 integrate .. //depot/projects/usb/src/sys/net/if_ethersubr.c#25 integrate .. //depot/projects/usb/src/sys/net/if_var.h#31 integrate .. //depot/projects/usb/src/sys/net/radix.c#4 integrate .. //depot/projects/usb/src/sys/net/radix.h#4 integrate .. //depot/projects/usb/src/sys/net/route.c#27 integrate .. //depot/projects/usb/src/sys/net/rtsock.c#33 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_hostap.c#16 integrate .. //depot/projects/usb/src/sys/netgraph/ng_bridge.c#7 integrate .. //depot/projects/usb/src/sys/netgraph/ng_ipfw.c#5 integrate .. //depot/projects/usb/src/sys/netgraph/ng_ipfw.h#3 integrate .. //depot/projects/usb/src/sys/netinet/in.h#15 integrate .. //depot/projects/usb/src/sys/netinet/ip_carp.c#20 integrate .. //depot/projects/usb/src/sys/netinet/ip_divert.c#25 integrate .. //depot/projects/usb/src/sys/netinet/ip_dummynet.h#8 integrate .. //depot/projects/usb/src/sys/netinet/ip_fw.h#20 integrate .. //depot/projects/usb/src/sys/netinet/ipfw/ip_dummynet.c#5 integrate .. //depot/projects/usb/src/sys/netinet/ipfw/ip_fw2.c#13 integrate .. //depot/projects/usb/src/sys/netinet/ipfw/ip_fw_dynamic.c#1 branch .. //depot/projects/usb/src/sys/netinet/ipfw/ip_fw_log.c#1 branch .. //depot/projects/usb/src/sys/netinet/ipfw/ip_fw_nat.c#6 integrate .. //depot/projects/usb/src/sys/netinet/ipfw/ip_fw_pfil.c#6 integrate .. //depot/projects/usb/src/sys/netinet/ipfw/ip_fw_private.h#1 branch .. //depot/projects/usb/src/sys/netinet/ipfw/ip_fw_sockopt.c#1 branch .. //depot/projects/usb/src/sys/netinet/ipfw/ip_fw_table.c#1 branch .. //depot/projects/usb/src/sys/netinet/raw_ip.c#32 integrate .. //depot/projects/usb/src/sys/netinet/tcp.h#7 integrate .. //depot/projects/usb/src/sys/netinet/tcp_usrreq.c#25 integrate .. //depot/projects/usb/src/sys/netinet6/mld6.c#23 integrate .. //depot/projects/usb/src/sys/netinet6/mld6_var.h#4 integrate .. //depot/projects/usb/src/sys/netinet6/raw_ip6.c#27 integrate .. //depot/projects/usb/src/sys/nfsclient/bootp_subr.c#20 integrate .. //depot/projects/usb/src/sys/nfsclient/krpc_subr.c#7 integrate .. //depot/projects/usb/src/sys/nfsclient/nfs_vfsops.c#21 integrate .. //depot/projects/usb/src/sys/nfsclient/nfs_vnops.c#32 integrate .. //depot/projects/usb/src/sys/nfsserver/nfs_serv.c#18 integrate .. //depot/projects/usb/src/sys/pc98/conf/DEFAULTS#8 integrate .. //depot/projects/usb/src/sys/pc98/conf/NOTES#20 integrate .. //depot/projects/usb/src/sys/powerpc/aim/machdep.c#15 integrate .. //depot/projects/usb/src/sys/powerpc/booke/clock.c#5 integrate .. //depot/projects/usb/src/sys/powerpc/conf/DEFAULTS#8 integrate .. //depot/projects/usb/src/sys/powerpc/include/vmparam.h#9 integrate .. //depot/projects/usb/src/sys/powerpc/powermac/ata_dbdma.c#2 integrate .. //depot/projects/usb/src/sys/powerpc/powermac/ata_kauai.c#4 integrate .. //depot/projects/usb/src/sys/powerpc/powermac/ata_macio.c#5 integrate .. //depot/projects/usb/src/sys/powerpc/psim/ata_iobus.c#3 integrate .. //depot/projects/usb/src/sys/sparc64/central/central.c#5 integrate .. //depot/projects/usb/src/sys/sparc64/conf/DEFAULTS#8 integrate .. //depot/projects/usb/src/sys/sparc64/ebus/ebus.c#5 integrate .. //depot/projects/usb/src/sys/sparc64/fhc/fhc.c#8 integrate .. //depot/projects/usb/src/sys/sparc64/include/bus_common.h#4 integrate .. //depot/projects/usb/src/sys/sparc64/isa/ofw_isa.c#4 integrate .. //depot/projects/usb/src/sys/sparc64/pci/apb.c#6 integrate .. //depot/projects/usb/src/sys/sparc64/pci/ofw_pcib.c#7 integrate .. //depot/projects/usb/src/sys/sparc64/pci/ofw_pcibus.c#10 integrate .. //depot/projects/usb/src/sys/sparc64/sbus/dma_sbus.c#5 integrate .. //depot/projects/usb/src/sys/sparc64/sbus/sbus.c#11 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/nexus.c#6 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/stack_machdep.c#4 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/trap.c#12 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/upa.c#7 integrate .. //depot/projects/usb/src/sys/sun4v/conf/DEFAULTS#5 integrate .. //depot/projects/usb/src/sys/sun4v/sun4v/stack_machdep.c#3 integrate .. //depot/projects/usb/src/sys/sys/_lockmgr.h#3 integrate .. //depot/projects/usb/src/sys/sys/acl.h#6 integrate .. //depot/projects/usb/src/sys/sys/apm.h#4 integrate .. //depot/projects/usb/src/sys/sys/ata.h#10 integrate .. //depot/projects/usb/src/sys/sys/bio.h#4 integrate .. //depot/projects/usb/src/sys/sys/bus.h#13 integrate .. //depot/projects/usb/src/sys/sys/gpt.h#5 integrate .. //depot/projects/usb/src/sys/sys/jail.h#20 integrate .. //depot/projects/usb/src/sys/sys/mount.h#22 integrate .. //depot/projects/usb/src/sys/sys/param.h#48 integrate .. //depot/projects/usb/src/sys/sys/proc.h#24 integrate .. //depot/projects/usb/src/sys/sys/sleepqueue.h#7 integrate .. //depot/projects/usb/src/sys/sys/sysproto.h#19 integrate .. //depot/projects/usb/src/sys/sys/vnode.h#27 integrate .. //depot/projects/usb/src/sys/ufs/ffs/ffs_rawread.c#4 integrate .. //depot/projects/usb/src/sys/ufs/ffs/ffs_vfsops.c#21 integrate .. //depot/projects/usb/src/sys/ufs/ffs/fs.h#4 integrate .. //depot/projects/usb/src/sys/ufs/ufs/acl.h#2 integrate .. //depot/projects/usb/src/sys/ufs/ufs/ufs_acl.c#6 integrate .. //depot/projects/usb/src/sys/ufs/ufs/ufs_lookup.c#14 integrate .. //depot/projects/usb/src/sys/ufs/ufs/ufs_vnops.c#21 integrate .. //depot/projects/usb/src/sys/vm/uma_int.h#4 integrate .. //depot/projects/usb/src/sys/vm/vm_object.c#22 integrate .. //depot/projects/usb/src/sys/vm/vm_object.h#11 integrate Differences ... ==== //depot/projects/usb/src/lib/libusb/libusb10.c#20 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libusb/libusb10.c,v 1.5 2009/11/20 08:57:25 thompsa Exp $ */ +/* $FreeBSD: src/lib/libusb/libusb10.c,v 1.6 2009/12/12 00:24:30 scf Exp $ */ /*- * Copyright (c) 2009 Sylvestre Gallon. All rights reserved. * Copyright (c) 2009 Hans Petter Selasky. All rights reserved. @@ -379,8 +379,6 @@ if ((i = libusb_get_device_list(ctx, &devs)) < 0) return (NULL); - pdev = NULL; - for (j = 0; j < i; j++) { pdev = devs[j]->os_priv; pdesc = libusb20_dev_get_device_desc(pdev); @@ -396,6 +394,8 @@ break; } } + if (j == i) + pdev = NULL; libusb_free_device_list(devs, 1); DPRINTF(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_open_device_width_vid_pid leave"); ==== //depot/projects/usb/src/sys/amd64/acpica/acpi_switch.S#3 (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/amd64/acpica/acpi_switch.S,v 1.4 2009/04/02 01:46:57 jkim Exp $ + * $FreeBSD: src/sys/amd64/acpica/acpi_switch.S,v 1.5 2009/12/08 22:38:42 jkim Exp $ */ #include @@ -34,20 +34,7 @@ #include "acpi_wakedata.h" #include "assym.s" -#define WAKEUP_DECL(member) \ - .set WAKEUP_ ## member, wakeup_ ## member - wakeup_ctx - - WAKEUP_DECL(xpcb) - WAKEUP_DECL(gdt) - WAKEUP_DECL(efer) - WAKEUP_DECL(pat) - WAKEUP_DECL(star) - WAKEUP_DECL(lstar) - WAKEUP_DECL(cstar) - WAKEUP_DECL(sfmask) - WAKEUP_DECL(cpu) - -#define WAKEUP_CTX(member) WAKEUP_ ## member (%rdi) +#define WAKEUP_CTX(member) wakeup_ ## member - wakeup_ctx(%rdi) #define WAKEUP_PCB(member) PCB_ ## member(%r11) #define WAKEUP_XPCB(member) XPCB_ ## member(%r11) ==== //depot/projects/usb/src/sys/amd64/amd64/mca.c#3 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mca.c,v 1.3 2009/05/20 16:11:22 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mca.c,v 1.5 2009/12/03 16:10:21 avg Exp $"); #include #include @@ -43,6 +43,7 @@ #include #include #include +#include #include #include #include @@ -117,48 +118,6 @@ return (SYSCTL_OUT(req, &record, sizeof(record))); } -static struct mca_record * -mca_record_entry(int bank) -{ - struct mca_internal *rec; - uint64_t status; - u_int p[4]; - - status = rdmsr(MSR_MC_STATUS(bank)); - if (!(status & MC_STATUS_VAL)) - return (NULL); - - rec = malloc(sizeof(*rec), M_MCA, M_NOWAIT | M_ZERO); - if (rec == NULL) { - printf("MCA: Unable to allocate space for an event.\n"); - return (NULL); - } - - /* Save exception information. */ - rec->rec.mr_status = status; - if (status & MC_STATUS_ADDRV) - rec->rec.mr_addr = rdmsr(MSR_MC_ADDR(bank)); - if (status & MC_STATUS_MISCV) - rec->rec.mr_misc = rdmsr(MSR_MC_MISC(bank)); - rec->rec.mr_tsc = rdtsc(); - rec->rec.mr_apic_id = PCPU_GET(apic_id); - - /* - * Clear machine check. Don't do this for uncorrectable - * errors so that the BIOS can see them. - */ - if (!(rec->rec.mr_status & (MC_STATUS_PCC | MC_STATUS_UC))) { - wrmsr(MSR_MC_STATUS(bank), 0); - do_cpuid(0, p); - } - - mtx_lock_spin(&mca_lock); - STAILQ_INSERT_TAIL(&mca_records, rec, link); - mca_count++; - mtx_unlock_spin(&mca_lock); - return (&rec->rec); -} - static const char * mca_error_ttype(uint16_t mca_error) { @@ -219,11 +178,13 @@ } /* Dump details about a single machine check. */ -static void -mca_log(struct mca_record *rec) +static void __nonnull(1) +mca_log(const struct mca_record *rec) { uint16_t mca_error; + printf("MCA: bank %d, status 0x%016llx\n", rec->mr_bank, + (long long)rec->mr_status); printf("MCA: CPU %d ", rec->mr_apic_id); if (rec->mr_status & MC_STATUS_UC) printf("UNCOR "); @@ -329,6 +290,59 @@ printf("MCA: Address 0x%llx\n", (long long)rec->mr_addr); } +static int __nonnull(2) +mca_check_status(int bank, struct mca_record *rec) +{ + uint64_t status; + u_int p[4]; + + status = rdmsr(MSR_MC_STATUS(bank)); + if (!(status & MC_STATUS_VAL)) + return (0); + + /* Save exception information. */ + rec->mr_status = status; + rec->mr_bank = bank; + rec->mr_addr = 0; + if (status & MC_STATUS_ADDRV) + rec->mr_addr = rdmsr(MSR_MC_ADDR(bank)); + rec->mr_misc = 0; + if (status & MC_STATUS_MISCV) + rec->mr_misc = rdmsr(MSR_MC_MISC(bank)); + rec->mr_tsc = rdtsc(); + rec->mr_apic_id = PCPU_GET(apic_id); + + /* + * Clear machine check. Don't do this for uncorrectable + * errors so that the BIOS can see them. + */ + if (!(rec->mr_status & (MC_STATUS_PCC | MC_STATUS_UC))) { + wrmsr(MSR_MC_STATUS(bank), 0); + do_cpuid(0, p); + } + return (1); +} + +static void __nonnull(1) +mca_record_entry(const struct mca_record *record) +{ + struct mca_internal *rec; + + rec = malloc(sizeof(*rec), M_MCA, M_NOWAIT); + if (rec == NULL) { + printf("MCA: Unable to allocate space for an event.\n"); + mca_log(record); + return; + } + + rec->rec = *record; + rec->logged = 0; + mtx_lock_spin(&mca_lock); + STAILQ_INSERT_TAIL(&mca_records, rec, link); + mca_count++; + mtx_unlock_spin(&mca_lock); +} + /* * This scans all the machine check banks of the current CPU to see if * there are any machine checks. Any non-recoverable errors are @@ -341,7 +355,7 @@ static int mca_scan(int mcip) { - struct mca_record *rec; + struct mca_record rec; uint64_t mcg_cap, ucmask; int count, i, recoverable; @@ -354,13 +368,13 @@ ucmask |= MC_STATUS_OVER; mcg_cap = rdmsr(MSR_MCG_CAP); for (i = 0; i < (mcg_cap & MCG_CAP_COUNT); i++) { - rec = mca_record_entry(i); - if (rec != NULL) { + if (mca_check_status(i, &rec)) { count++; - if (rec->mr_status & ucmask) { + if (rec.mr_status & ucmask) { recoverable = 0; - mca_log(rec); + mca_log(&rec); } + mca_record_entry(&rec); } } return (mcip ? recoverable : count); @@ -465,6 +479,8 @@ mca_init(void) { uint64_t mcg_cap; + uint64_t ctl; + int skip; int i; /* MCE is required. */ @@ -482,15 +498,26 @@ wrmsr(MSR_MCG_CTL, MCG_CTL_ENABLE); for (i = 0; i < (mcg_cap & MCG_CAP_COUNT); i++) { - /* - * Enable logging of all errors. For P6 - * processors, MC0_CTL is always enabled. - * - * XXX: Better CPU test needed here? - */ - if (!(i == 0 && (cpu_id & 0xf00) == 0x600)) - wrmsr(MSR_MC_CTL(i), 0xffffffffffffffffUL); + /* By default enable logging of all errors. */ + ctl = 0xffffffffffffffffUL; + skip = 0; + + if (cpu_vendor_id == CPU_VENDOR_INTEL) { + /* + * For P6 models before Nehalem MC0_CTL is + * always enabled and reserved. + */ + if (i == 0 && CPUID_TO_FAMILY(cpu_id) == 0x6 + && CPUID_TO_MODEL(cpu_id) < 0x1a) + skip = 1; + } else if (cpu_vendor_id == CPU_VENDOR_AMD) { + /* BKDG for Family 10h: unset GartTblWkEn. */ + if (i == 4 && CPUID_TO_FAMILY(cpu_id) >= 0xf) + ctl &= ~(1UL << 10); + } + if (!skip) + wrmsr(MSR_MC_CTL(i), ctl); /* Clear all errors. */ wrmsr(MSR_MC_STATUS(i), 0); } ==== //depot/projects/usb/src/sys/amd64/amd64/vm_machdep.c#15 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.265 2009/11/10 11:43:07 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.266 2009/12/12 20:11:31 kib Exp $"); #include "opt_isa.h" #include "opt_cpu.h" @@ -330,10 +330,14 @@ case ERESTART: /* - * Reconstruct pc, we know that 'syscall' is 2 bytes. + * Reconstruct pc, we know that 'syscall' is 2 bytes, + * lcall $X,y is 7 bytes, int 0x80 is 2 bytes. + * We saved this in tf_err. * We have to do a full context restore so that %r10 * (which was holding the value of %rcx) is restored * for the next iteration. + * r10 restore is only required for freebsd/amd64 processes, + * but shall be innocent for any ia32 ABI. */ td->td_frame->tf_rip -= td->td_frame->tf_err; td->td_frame->tf_r10 = td->td_frame->tf_rcx; ==== //depot/projects/usb/src/sys/amd64/conf/DEFAULTS#12 (text+ko) ==== @@ -1,7 +1,7 @@ # # DEFAULTS -- Default kernel configuration file for FreeBSD/amd64 # -# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.19 2009/06/09 20:26:52 kmacy Exp $ +# $FreeBSD: src/sys/amd64/conf/DEFAULTS,v 1.20 2009/12/16 02:17:43 dougb Exp $ machine amd64 @@ -21,3 +21,9 @@ options GEOM_PART_EBR_COMPAT options GEOM_PART_MBR +# Store the plain version of the configuration file in the kernel itself. +# To store the entire file, including comments, put this in /etc/src.conf: +# CONFIGARGS= -C +# See config(8) for more details. +# +options INCLUDE_CONFIG_FILE # Include this file in kernel ==== //depot/projects/usb/src/sys/amd64/conf/NOTES#24 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.98 2009/11/30 11:44:03 avg Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.99 2009/12/18 16:13:21 jhb Exp $ # # @@ -277,7 +277,6 @@ # iwn: Intel Wireless WiFi Link 4965AGN 802.11 network adapters # nfe: nVidia nForce MCP on-board Ethernet Networking (BSD open source) # nve: nVidia nForce MCP on-board Ethernet Networking -# ral: Ralink Technology IEEE 802.11 wireless adapter # wpi: Intel 3945ABG Wireless LAN controller device ed @@ -289,16 +288,8 @@ device ipw device nfe device nve -device ral device wpi -device ath # Atheros pci/cardbus NIC's -device ath_hal # pci/cardbus chip support -options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors -device ath_rate_sample # SampleRate tx rate control for ath -#device ath_rate_amrr # AMRR rate control for ath driver -#device ath_rate_onoe # Onoe rate control for ath driver - # #XXX this stores pointers in a 32bit field that is defined by the hardware #device pst ==== //depot/projects/usb/src/sys/amd64/ia32/ia32_syscall.c#5 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_syscall.c,v 1.19 2007/06/10 21:59:12 attilio Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_syscall.c,v 1.20 2009/12/12 20:11:31 kib Exp $"); /* * 386 Trap and System call handling @@ -183,35 +183,7 @@ AUDIT_SYSCALL_EXIT(error, td); } - switch (error) { - case 0: - frame->tf_rax = td->td_retval[0]; - frame->tf_rdx = td->td_retval[1]; - frame->tf_rflags &= ~PSL_C; - break; - - case ERESTART: - /* - * Reconstruct pc, assuming lcall $X,y is 7 bytes, - * int 0x80 is 2 bytes. We saved this in tf_err. - */ - frame->tf_rip -= frame->tf_err; - break; - - case EJUSTRETURN: - break; - - default: - if (p->p_sysent->sv_errsize) { - if (error >= p->p_sysent->sv_errsize) - error = -1; /* XXX */ - else - error = p->p_sysent->sv_errtbl[error]; - } - frame->tf_rax = error; - frame->tf_rflags |= PSL_C; - break; - } + cpu_set_syscall_retval(td, error); /* * Traced syscall. ==== //depot/projects/usb/src/sys/amd64/include/mca.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/amd64/include/mca.h,v 1.1 2009/05/13 17:53:04 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/mca.h,v 1.2 2009/12/02 15:45:55 avg Exp $ */ #ifndef __MACHINE_MCA_H__ @@ -36,6 +36,7 @@ uint64_t mr_misc; uint64_t mr_tsc; int mr_apic_id; + int mr_bank; }; #ifdef _KERNEL ==== //depot/projects/usb/src/sys/arm/conf/AVILA#18 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/AVILA,v 1.33 2009/07/17 18:35:45 rpaulo Exp $ +# $FreeBSD: src/sys/arm/conf/AVILA,v 1.34 2009/12/02 00:38:11 thompsa Exp $ ident AVILA @@ -132,6 +132,7 @@ device ath_ar5416 options AH_SUPPORT_AR5416 device ath_ar9160 +device ath_ar9280 device usb #options USB_DEBUG ==== //depot/projects/usb/src/sys/arm/conf/CAMBRIA#10 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/CAMBRIA,v 1.14 2009/08/27 17:55:44 sam Exp $ +# $FreeBSD: src/sys/arm/conf/CAMBRIA,v 1.15 2009/12/02 00:37:03 thompsa Exp $ ident CAMBRIA @@ -135,11 +135,8 @@ # #device ath_ar5416 #options AH_SUPPORT_AR5416 # NB: for 11n descriptor format -#device ath_rf2133 #device ath_ar9160 #device ath_ar9280 -#device ath_rf9280 -#device ath_ar9285 # NB: 2 USB 2.0 ports standard device usb ==== //depot/projects/usb/src/sys/arm/conf/DEFAULTS#3 (text+ko) ==== @@ -1,7 +1,7 @@ # # DEFAULTS -- Default kernel configuration file for FreeBSD/arm # -# $FreeBSD: src/sys/arm/conf/DEFAULTS,v 1.2 2008/12/17 17:43:22 marcel Exp $ +# $FreeBSD: src/sys/arm/conf/DEFAULTS,v 1.3 2009/12/16 02:17:43 dougb Exp $ machine arm @@ -9,3 +9,10 @@ options GEOM_PART_BSD options GEOM_PART_MBR + +# Store the plain version of the configuration file in the kernel itself. +# To store the entire file, including comments, put this in /etc/src.conf: +# CONFIGARGS= -C +# See config(8) for more details. +# +options INCLUDE_CONFIG_FILE # Include this file in kernel ==== //depot/projects/usb/src/sys/arm/mv/mv_sata.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/mv/mv_sata.c,v 1.2 2009/10/31 13:24:14 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/mv/mv_sata.c,v 1.4 2009/12/08 21:42:04 mav Exp $"); #include #include @@ -136,7 +136,8 @@ static int sata_channel_begin_transaction(struct ata_request *request); static int sata_channel_end_transaction(struct ata_request *request); static int sata_channel_status(device_t dev); -static void sata_channel_setmode(device_t parent, device_t dev); +static int sata_channel_setmode(device_t dev, int target, int mode); +static int sata_channel_getrev(device_t dev, int target); static void sata_channel_reset(device_t dev); static void sata_channel_dmasetprd(void *xsc, bus_dma_segment_t *segs, int nsegs, int error); @@ -423,7 +424,7 @@ ch->dev = dev; ch->unit = device_get_unit(dev); - ch->flags |= ATA_USE_16BIT | ATA_NO_SLAVE; + ch->flags |= ATA_USE_16BIT | ATA_NO_SLAVE | ATA_SATA; /* Set legacy ATA resources. */ for (i = ATA_DATA; i <= ATA_COMMAND; i++) { @@ -748,19 +749,22 @@ SATA_OUTL(sc, SATA_EDMA_IEMR(ch->unit), 0xFFFFFFFF); } -static void -sata_channel_setmode(device_t parent, device_t dev) +static int +sata_channel_setmode(device_t parent, int target, int mode) { - struct ata_device *atadev; + + /* Disable EDMA before using legacy registers */ + sata_edma_ctrl(parent, 0); + return (ata_sata_setmode(parent, target, mode)); +} - atadev = device_get_softc(dev); +static int +sata_channel_getrev(device_t parent, int target) +{ /* Disable EDMA before using legacy registers */ sata_edma_ctrl(parent, 0); - - ata_sata_setmode(dev, ATA_PIO_MAX); - if (atadev->mode >= ATA_DMA) - ata_sata_setmode(dev, atadev->mode); + return (ata_sata_getrev(parent, target)); } static void @@ -849,6 +853,7 @@ /* ATA channel interface */ DEVMETHOD(ata_reset, sata_channel_reset), DEVMETHOD(ata_setmode, sata_channel_setmode), + DEVMETHOD(ata_getrev, sata_channel_getrev), { 0, 0 } }; ==== //depot/projects/usb/src/sys/boot/common/Makefile.inc#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/common/Makefile.inc,v 1.25 2009/11/12 01:30:17 attilio Exp $ +# $FreeBSD: src/sys/boot/common/Makefile.inc,v 1.26 2009/12/13 01:20:32 marcel Exp $ SRCS+= boot.c commands.c console.c devopen.c interp.c SRCS+= interp_backslash.c interp_parse.c ls.c misc.c @@ -23,6 +23,11 @@ SRCS+= bcache.c .endif +.if defined(MD_IMAGE_SIZE) +CFLAGS+= -DMD_IMAGE_SIZE=${MD_IMAGE_SIZE} +SRCS+= md.c +.endif + # Machine-independant ISA PnP .if defined(HAVE_ISABUS) SRCS+= isapnp.c ==== //depot/projects/usb/src/sys/boot/i386/Makefile#7 (text+ko) ==== @@ -1,9 +1,15 @@ -# $FreeBSD: src/sys/boot/i386/Makefile,v 1.27 2009/11/23 16:00:16 rnoland Exp $ +# $FreeBSD: src/sys/boot/i386/Makefile,v 1.28 2009/12/22 20:56:33 jhb Exp $ + +.include -SUBDIR= mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot zfsboot \ - gptzfsboot kgzldr libi386 libfirewire loader zfsloader +SUBDIR= mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot kgzldr \ + libi386 libfirewire loader # special boot programs, 'self-extracting boot2+loader' SUBDIR+= pxeldr +.if ${MK_ZFS} != "no" >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Dec 23 00:51:50 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 108091065670; Wed, 23 Dec 2009 00:51:50 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BA0FC106566B for ; Wed, 23 Dec 2009 00:51:49 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A5C708FC15 for ; Wed, 23 Dec 2009 00:51:49 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nBN0pnT7011627 for ; Wed, 23 Dec 2009 00:51:49 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nBN0pn5u011625 for perforce@freebsd.org; Wed, 23 Dec 2009 00:51:49 GMT (envelope-from thompsa@freebsd.org) Date: Wed, 23 Dec 2009 00:51:49 GMT Message-Id: <200912230051.nBN0pn5u011625@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 Precedence: bulk Cc: Subject: PERFORCE change 172120 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Dec 2009 00:51:50 -0000 http://p4web.freebsd.org/chv.cgi?CH=172120 Change 172120 by thompsa@thompsa_pea on 2009/12/23 00:51:46 Wrap long lines and fix mismerge. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/quirk/usb_quirk.c#12 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/quirk/usb_quirk.c#12 (text+ko) ==== @@ -66,7 +66,7 @@ #define USB_QUIRK_ENTRY(v,p,l,h,...) \ .vid = (v), .pid = (p), .lo_rev = (l), .hi_rev = (h), .quirks = { __VA_ARGS__ } -#define USB_DEV_QUIRKS_MAX 128 +#define USB_DEV_QUIRKS_MAX 256 #define USB_SUB_QUIRKS_MAX 8 struct usb_quirk_entry { @@ -183,10 +183,396 @@ {USB_QUIRK_ENTRY(USB_VENDOR_CURITEL, USB_PRODUCT_CURITEL_UM175, 0x0000, 0xFFFF, UQ_ASSUME_CM_OVER_DATA)}, + /* USB Mass Storage Class Quirks */ + {USB_QUIRK_ENTRY(USB_VENDOR_ASAHIOPTICAL, 0, + 0x0000, 0xFFFF, UQ_MSC_NO_RS_CLEAR_UA, UQ_MATCH_VENDOR_ONLY)}, + {USB_QUIRK_ENTRY(USB_VENDOR_ADDON, USB_PRODUCT_ADDON_ATTACHE, 0x0000, + 0xFFFF, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, + UQ_MSC_IGNORE_RESIDUE)}, + {USB_QUIRK_ENTRY(USB_VENDOR_ADDON, USB_PRODUCT_ADDON_A256MB, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, + UQ_MSC_IGNORE_RESIDUE)}, + {USB_QUIRK_ENTRY(USB_VENDOR_ADDON, USB_PRODUCT_ADDON_DISKPRO512, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, + UQ_MSC_IGNORE_RESIDUE)}, + {USB_QUIRK_ENTRY(USB_VENDOR_ADDONICS2, USB_PRODUCT_ADDONICS2_CABLE_205, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI)}, + {USB_QUIRK_ENTRY(USB_VENDOR_AIPTEK, USB_PRODUCT_AIPTEK_POCKETCAM3M, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI)}, + {USB_QUIRK_ENTRY(USB_VENDOR_AIPTEK2, USB_PRODUCT_AIPTEK2_SUNPLUS_TECH, + 0x0000, 0xFFFF, UQ_MSC_NO_SYNC_CACHE)}, + {USB_QUIRK_ENTRY(USB_VENDOR_ALCOR, USB_PRODUCT_ALCOR_SDCR_6335, + 0x0000, 0xFFFF, UQ_MSC_NO_TEST_UNIT_READY, UQ_MSC_NO_SYNC_CACHE)}, + {USB_QUIRK_ENTRY(USB_VENDOR_ALCOR, USB_PRODUCT_ALCOR_AU6390, + 0x0000, 0xFFFF, UQ_MSC_NO_SYNC_CACHE)}, + {USB_QUIRK_ENTRY(USB_VENDOR_ALCOR, USB_PRODUCT_ALCOR_UMCR_9361, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, + UQ_MSC_NO_GETMAXLUN)}, + {USB_QUIRK_ENTRY(USB_VENDOR_ALCOR, USB_PRODUCT_ALCOR_TRANSCEND, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, + UQ_MSC_NO_GETMAXLUN)}, + {USB_QUIRK_ENTRY(USB_VENDOR_ASAHIOPTICAL, USB_PRODUCT_ASAHIOPTICAL_OPTIO230, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, + UQ_MSC_NO_INQUIRY)}, + {USB_QUIRK_ENTRY(USB_VENDOR_ASAHIOPTICAL, USB_PRODUCT_ASAHIOPTICAL_OPTIO330, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, + UQ_MSC_NO_INQUIRY)}, + {USB_QUIRK_ENTRY(USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_USB2SCSI, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI)}, + {USB_QUIRK_ENTRY(USB_VENDOR_CASIO, USB_PRODUCT_CASIO_QV_DIGICAM, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_CBI, UQ_MSC_FORCE_PROTO_SCSI, + UQ_MSC_NO_INQUIRY)}, + {USB_QUIRK_ENTRY(USB_VENDOR_CCYU, USB_PRODUCT_CCYU_ED1064, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI)}, + {USB_QUIRK_ENTRY(USB_VENDOR_CENTURY, USB_PRODUCT_CENTURY_EX35QUAT, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, + UQ_MSC_FORCE_SHORT_INQ, UQ_MSC_NO_START_STOP, + UQ_MSC_IGNORE_RESIDUE)}, + {USB_QUIRK_ENTRY(USB_VENDOR_CYPRESS, USB_PRODUCT_CYPRESS_XX6830XX, + 0x0000, 0xFFFF, UQ_MSC_NO_GETMAXLUN, UQ_MSC_NO_SYNC_CACHE)}, + {USB_QUIRK_ENTRY(USB_VENDOR_DESKNOTE, USB_PRODUCT_DESKNOTE_UCR_61S2B, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI)}, + {USB_QUIRK_ENTRY(USB_VENDOR_DMI, USB_PRODUCT_DMI_CFSM_RW, + 0x0000, 0xFFFF, UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_NO_GETMAXLUN)}, + {USB_QUIRK_ENTRY(USB_VENDOR_EPSON, USB_PRODUCT_EPSON_STYLUS_875DC, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_CBI, UQ_MSC_FORCE_PROTO_SCSI, + UQ_MSC_NO_INQUIRY)}, + {USB_QUIRK_ENTRY(USB_VENDOR_EPSON, USB_PRODUCT_EPSON_STYLUS_895, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, + UQ_MSC_NO_GETMAXLUN)}, + {USB_QUIRK_ENTRY(USB_VENDOR_FEIYA, USB_PRODUCT_FEIYA_5IN1, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI)}, + {USB_QUIRK_ENTRY(USB_VENDOR_FREECOM, USB_PRODUCT_FREECOM_DVD, + 0x0000, 0xFFFF, UQ_MSC_FORCE_PROTO_SCSI)}, + {USB_QUIRK_ENTRY(USB_VENDOR_FUJIPHOTO, USB_PRODUCT_FUJIPHOTO_MASS0100, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_CBI_I, UQ_MSC_FORCE_PROTO_ATAPI, + UQ_MSC_NO_RS_CLEAR_UA)}, + {USB_QUIRK_ENTRY(USB_VENDOR_GENESYS, USB_PRODUCT_GENESYS_GL641USB2IDE, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, + UQ_MSC_FORCE_SHORT_INQ, UQ_MSC_NO_START_STOP, UQ_MSC_IGNORE_RESIDUE, + UQ_MSC_NO_SYNC_CACHE)}, + {USB_QUIRK_ENTRY(USB_VENDOR_GENESYS, USB_PRODUCT_GENESYS_GL641USB2IDE_2, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_ATAPI, + UQ_MSC_FORCE_SHORT_INQ, UQ_MSC_NO_START_STOP, UQ_MSC_IGNORE_RESIDUE)}, + {USB_QUIRK_ENTRY(USB_VENDOR_GENESYS, USB_PRODUCT_GENESYS_GL641USB, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, + UQ_MSC_FORCE_SHORT_INQ, UQ_MSC_NO_START_STOP, UQ_MSC_IGNORE_RESIDUE)}, + {USB_QUIRK_ENTRY(USB_VENDOR_GENESYS, USB_PRODUCT_GENESYS_GL641USB_2, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, + UQ_MSC_WRONG_CSWSIG)}, + {USB_QUIRK_ENTRY(USB_VENDOR_HAGIWARA, USB_PRODUCT_HAGIWARA_FG, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI)}, + {USB_QUIRK_ENTRY(USB_VENDOR_HAGIWARA, USB_PRODUCT_HAGIWARA_FGSM, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI)}, + {USB_QUIRK_ENTRY(USB_VENDOR_HITACHI, USB_PRODUCT_HITACHI_DVDCAM_DZ_MV100A, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_CBI, UQ_MSC_FORCE_PROTO_SCSI, + UQ_MSC_NO_GETMAXLUN)}, + {USB_QUIRK_ENTRY(USB_VENDOR_HITACHI, USB_PRODUCT_HITACHI_DVDCAM_USB, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_CBI_I, UQ_MSC_FORCE_PROTO_ATAPI, + UQ_MSC_NO_INQUIRY)}, + {USB_QUIRK_ENTRY(USB_VENDOR_HP, USB_PRODUCT_HP_CDW4E, + 0x0000, 0xFFFF, UQ_MSC_FORCE_PROTO_ATAPI)}, + {USB_QUIRK_ENTRY(USB_VENDOR_HP, USB_PRODUCT_HP_CDW8200, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_CBI_I, UQ_MSC_FORCE_PROTO_ATAPI, + UQ_MSC_NO_TEST_UNIT_READY, UQ_MSC_NO_START_STOP)}, + {USB_QUIRK_ENTRY(USB_VENDOR_IMAGINATION, USB_PRODUCT_IMAGINATION_DBX1, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, + UQ_MSC_WRONG_CSWSIG)}, + {USB_QUIRK_ENTRY(USB_VENDOR_INSYSTEM, USB_PRODUCT_INSYSTEM_USBCABLE, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_CBI, UQ_MSC_FORCE_PROTO_ATAPI, + UQ_MSC_NO_TEST_UNIT_READY, UQ_MSC_NO_START_STOP, UQ_MSC_ALT_IFACE_1)}, + {USB_QUIRK_ENTRY(USB_VENDOR_INSYSTEM, USB_PRODUCT_INSYSTEM_ATAPI, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_CBI, UQ_MSC_FORCE_PROTO_RBC)}, + {USB_QUIRK_ENTRY(USB_VENDOR_INSYSTEM, USB_PRODUCT_INSYSTEM_STORAGE_V2, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_CBI, UQ_MSC_FORCE_PROTO_RBC)}, + {USB_QUIRK_ENTRY(USB_VENDOR_IODATA, USB_PRODUCT_IODATA_IU_CD2, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI)}, + {USB_QUIRK_ENTRY(USB_VENDOR_IODATA, USB_PRODUCT_IODATA_DVR_UEH8, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI)}, + {USB_QUIRK_ENTRY(USB_VENDOR_IOMEGA, USB_PRODUCT_IOMEGA_ZIP100, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, + UQ_MSC_NO_TEST_UNIT_READY)}, /* XXX ZIP drives can also use ATAPI */ + {USB_QUIRK_ENTRY(USB_VENDOR_KYOCERA, USB_PRODUCT_KYOCERA_FINECAM_L3, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, + UQ_MSC_NO_INQUIRY)}, + {USB_QUIRK_ENTRY(USB_VENDOR_KYOCERA, USB_PRODUCT_KYOCERA_FINECAM_S3X, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_CBI, UQ_MSC_FORCE_PROTO_ATAPI, + UQ_MSC_NO_INQUIRY)}, + {USB_QUIRK_ENTRY(USB_VENDOR_KYOCERA, USB_PRODUCT_KYOCERA_FINECAM_S4, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_CBI, UQ_MSC_FORCE_PROTO_ATAPI, + UQ_MSC_NO_INQUIRY)}, + {USB_QUIRK_ENTRY(USB_VENDOR_KYOCERA, USB_PRODUCT_KYOCERA_FINECAM_S5, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, + UQ_MSC_NO_INQUIRY)}, + {USB_QUIRK_ENTRY(USB_VENDOR_LACIE, USB_PRODUCT_LACIE_HD, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_CBI, UQ_MSC_FORCE_PROTO_RBC)}, + {USB_QUIRK_ENTRY(USB_VENDOR_LEXAR, USB_PRODUCT_LEXAR_CF_READER, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, + UQ_MSC_NO_INQUIRY)}, + {USB_QUIRK_ENTRY(USB_VENDOR_LEXAR, USB_PRODUCT_LEXAR_JUMPSHOT, + 0x0000, 0xFFFF, UQ_MSC_FORCE_PROTO_SCSI)}, + {USB_QUIRK_ENTRY(USB_VENDOR_LOGITEC, USB_PRODUCT_LOGITEC_LDR_H443SU2, + 0x0000, 0xFFFF, UQ_MSC_FORCE_PROTO_SCSI)}, + {USB_QUIRK_ENTRY(USB_VENDOR_LOGITEC, USB_PRODUCT_LOGITEC_LDR_H443U2, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI,)}, + {USB_QUIRK_ENTRY(USB_VENDOR_MELCO, USB_PRODUCT_MELCO_DUBPXXG, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, + UQ_MSC_FORCE_SHORT_INQ, UQ_MSC_NO_START_STOP, UQ_MSC_IGNORE_RESIDUE)}, + {USB_QUIRK_ENTRY(USB_VENDOR_MICROTECH, USB_PRODUCT_MICROTECH_DPCM, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_CBI, UQ_MSC_FORCE_PROTO_SCSI, + UQ_MSC_NO_TEST_UNIT_READY, UQ_MSC_NO_START_STOP)}, + {USB_QUIRK_ENTRY(USB_VENDOR_MICROTECH, USB_PRODUCT_MICROTECH_SCSIDB25, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI)}, + {USB_QUIRK_ENTRY(USB_VENDOR_MICROTECH, USB_PRODUCT_MICROTECH_SCSIHD50, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI)}, + {USB_QUIRK_ENTRY(USB_VENDOR_MINOLTA, USB_PRODUCT_MINOLTA_E223, + 0x0000, 0xFFFF, UQ_MSC_FORCE_PROTO_SCSI)}, + {USB_QUIRK_ENTRY(USB_VENDOR_MINOLTA, USB_PRODUCT_MINOLTA_F300, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI)}, + {USB_QUIRK_ENTRY(USB_VENDOR_MITSUMI, USB_PRODUCT_MITSUMI_CDRRW, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_CBI | UQ_MSC_FORCE_PROTO_ATAPI)}, + {USB_QUIRK_ENTRY(USB_VENDOR_MITSUMI, USB_PRODUCT_MITSUMI_FDD, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, + UQ_MSC_NO_GETMAXLUN)}, + {USB_QUIRK_ENTRY(USB_VENDOR_MOTOROLA2, USB_PRODUCT_MOTOROLA2_E398, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, + UQ_MSC_FORCE_SHORT_INQ, UQ_MSC_NO_INQUIRY_EVPD, UQ_MSC_NO_GETMAXLUN)}, + {USB_QUIRK_ENTRY(USB_VENDOR_MPMAN, 0, + 0x0000, 0xFFFF, UQ_MSC_NO_SYNC_CACHE, UQ_MATCH_VENDOR_ONLY)}, + {USB_QUIRK_ENTRY(USB_VENDOR_MSYSTEMS, USB_PRODUCT_MSYSTEMS_DISKONKEY, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, + UQ_MSC_IGNORE_RESIDUE, UQ_MSC_NO_GETMAXLUN, UQ_MSC_NO_RS_CLEAR_UA)}, + {USB_QUIRK_ENTRY(USB_VENDOR_MSYSTEMS, USB_PRODUCT_MSYSTEMS_DISKONKEY2, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_ATAPI)}, + {USB_QUIRK_ENTRY(USB_VENDOR_MYSON, USB_PRODUCT_MYSON_HEDEN, + 0x0000, 0xFFFF, UQ_MSC_IGNORE_RESIDUE, UQ_MSC_NO_SYNC_CACHE)}, + {USB_QUIRK_ENTRY(USB_VENDOR_MYSON, USB_PRODUCT_MYSON_HEDEN_8813, + 0x0000, 0xFFFF, UQ_MSC_NO_SYNC_CACHE)}, + {USB_QUIRK_ENTRY(USB_VENDOR_MYSON, USB_PRODUCT_MYSON_STARREADER, + 0x0000, 0xFFFF, UQ_MSC_NO_SYNC_CACHE)}, + {USB_QUIRK_ENTRY(USB_VENDOR_NEODIO, USB_PRODUCT_NEODIO_ND3260, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, + UQ_MSC_FORCE_SHORT_INQ)}, + {USB_QUIRK_ENTRY(USB_VENDOR_NETAC, USB_PRODUCT_NETAC_CF_CARD, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, + UQ_MSC_NO_INQUIRY)}, + {USB_QUIRK_ENTRY(USB_VENDOR_NETAC, USB_PRODUCT_NETAC_ONLYDISK, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, + UQ_MSC_IGNORE_RESIDUE)}, + {USB_QUIRK_ENTRY(USB_VENDOR_NETCHIP, USB_PRODUCT_NETCHIP_CLIK_40, + 0x0000, 0xFFFF, UQ_MSC_FORCE_PROTO_ATAPI, UQ_MSC_NO_INQUIRY)}, + {USB_QUIRK_ENTRY(USB_VENDOR_NIKON, USB_PRODUCT_NIKON_D300, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI)}, + {USB_QUIRK_ENTRY(USB_VENDOR_OLYMPUS, USB_PRODUCT_OLYMPUS_C1, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, + UQ_MSC_WRONG_CSWSIG)}, + {USB_QUIRK_ENTRY(USB_VENDOR_OLYMPUS, USB_PRODUCT_OLYMPUS_C700, + 0x0000, 0xFFFF, UQ_MSC_NO_GETMAXLUN)}, + {USB_QUIRK_ENTRY(USB_VENDOR_ONSPEC, USB_PRODUCT_ONSPEC_SDS_HOTFIND_D, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, + UQ_MSC_NO_GETMAXLUN, UQ_MSC_NO_SYNC_CACHE)}, + {USB_QUIRK_ENTRY(USB_VENDOR_ONSPEC, USB_PRODUCT_ONSPEC_CFMS_RW, + 0x0000, 0xFFFF, UQ_MSC_FORCE_PROTO_SCSI)}, + {USB_QUIRK_ENTRY(USB_VENDOR_ONSPEC, USB_PRODUCT_ONSPEC_CFSM_COMBO, + 0x0000, 0xFFFF, UQ_MSC_FORCE_PROTO_SCSI)}, + {USB_QUIRK_ENTRY(USB_VENDOR_ONSPEC, USB_PRODUCT_ONSPEC_CFSM_READER, + 0x0000, 0xFFFF, UQ_MSC_FORCE_PROTO_SCSI)}, + {USB_QUIRK_ENTRY(USB_VENDOR_ONSPEC, USB_PRODUCT_ONSPEC_CFSM_READER2, + 0x0000, 0xFFFF, UQ_MSC_FORCE_PROTO_SCSI)}, + {USB_QUIRK_ENTRY(USB_VENDOR_ONSPEC, USB_PRODUCT_ONSPEC_MDCFE_B_CF_READER, + 0x0000, 0xFFFF, UQ_MSC_FORCE_PROTO_SCSI)}, + {USB_QUIRK_ENTRY(USB_VENDOR_ONSPEC, USB_PRODUCT_ONSPEC_MDSM_B_READER, + 0x0000, 0xFFFF, UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_NO_INQUIRY)}, + {USB_QUIRK_ENTRY(USB_VENDOR_ONSPEC, USB_PRODUCT_ONSPEC_READER, + 0x0000, 0xFFFF, UQ_MSC_FORCE_PROTO_SCSI)}, + {USB_QUIRK_ENTRY(USB_VENDOR_ONSPEC, USB_PRODUCT_ONSPEC_UCF100, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_ATAPI, + UQ_MSC_NO_INQUIRY | UQ_MSC_NO_GETMAXLUN)}, + {USB_QUIRK_ENTRY(USB_VENDOR_ONSPEC2, USB_PRODUCT_ONSPEC2_IMAGEMATE_SDDR55, + 0x0000, 0xFFFF, UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_NO_GETMAXLUN)}, + {USB_QUIRK_ENTRY(USB_VENDOR_PANASONIC, USB_PRODUCT_PANASONIC_KXL840AN, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_ATAPI, + UQ_MSC_NO_GETMAXLUN)}, + {USB_QUIRK_ENTRY(USB_VENDOR_PANASONIC, USB_PRODUCT_PANASONIC_KXLCB20AN, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI)}, + {USB_QUIRK_ENTRY(USB_VENDOR_PANASONIC, USB_PRODUCT_PANASONIC_KXLCB35AN, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI)}, + {USB_QUIRK_ENTRY(USB_VENDOR_PANASONIC, USB_PRODUCT_PANASONIC_LS120CAM, + 0x0000, 0xFFFF, UQ_MSC_FORCE_PROTO_UFI)}, + {USB_QUIRK_ENTRY(USB_VENDOR_PHILIPS, USB_PRODUCT_PHILIPS_SPE3030CC, + 0x0000, 0xFFFF, UQ_MSC_NO_SYNC_CACHE)}, + {USB_QUIRK_ENTRY(USB_VENDOR_PLEXTOR, USB_PRODUCT_PLEXTOR_40_12_40U, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, + UQ_MSC_NO_TEST_UNIT_READY)}, + {USB_QUIRK_ENTRY(USB_VENDOR_PNY, USB_PRODUCT_PNY_ATTACHE2, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, + UQ_MSC_IGNORE_RESIDUE, UQ_MSC_NO_START_STOP)}, + {USB_QUIRK_ENTRY(USB_VENDOR_SAMSUNG_TECHWIN, USB_PRODUCT_SAMSUNG_TECHWIN_DIGIMAX_410, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, + UQ_MSC_NO_INQUIRY)}, + {USB_QUIRK_ENTRY(USB_VENDOR_SANDISK, USB_PRODUCT_SANDISK_SDDR05A, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_CBI, UQ_MSC_FORCE_PROTO_SCSI, + UQ_MSC_READ_CAP_OFFBY1, UQ_MSC_NO_GETMAXLUN)}, + {USB_QUIRK_ENTRY(USB_VENDOR_SANDISK, USB_PRODUCT_SANDISK_SDDR09, + 0x0000, 0xFFFF, UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_READ_CAP_OFFBY1, + UQ_MSC_NO_GETMAXLUN)}, + {USB_QUIRK_ENTRY(USB_VENDOR_SANDISK, USB_PRODUCT_SANDISK_SDDR12, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_CBI, UQ_MSC_FORCE_PROTO_SCSI, + UQ_MSC_READ_CAP_OFFBY1, UQ_MSC_NO_GETMAXLUN)}, + {USB_QUIRK_ENTRY(USB_VENDOR_SANDISK, USB_PRODUCT_SANDISK_SDCZ2_256, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, + UQ_MSC_IGNORE_RESIDUE)}, + {USB_QUIRK_ENTRY(USB_VENDOR_SANDISK, USB_PRODUCT_SANDISK_SDCZ4_128, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, + UQ_MSC_IGNORE_RESIDUE)}, + {USB_QUIRK_ENTRY(USB_VENDOR_SANDISK, USB_PRODUCT_SANDISK_SDCZ4_256, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, + UQ_MSC_IGNORE_RESIDUE)}, + {USB_QUIRK_ENTRY(USB_VENDOR_SANDISK, USB_PRODUCT_SANDISK_SDDR31, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, + UQ_MSC_READ_CAP_OFFBY1)}, + {USB_QUIRK_ENTRY(USB_VENDOR_SCANLOGIC, USB_PRODUCT_SCANLOGIC_SL11R, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_ATAPI, + UQ_MSC_NO_INQUIRY)}, + {USB_QUIRK_ENTRY(USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_EUSB, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_CBI_I, UQ_MSC_FORCE_PROTO_ATAPI, + UQ_MSC_NO_TEST_UNIT_READY, UQ_MSC_NO_START_STOP, UQ_MSC_SHUTTLE_INIT)}, + {USB_QUIRK_ENTRY(USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_CDRW, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_CBI, UQ_MSC_FORCE_PROTO_ATAPI)}, + {USB_QUIRK_ENTRY(USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_CF, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_CBI, UQ_MSC_FORCE_PROTO_ATAPI)}, + {USB_QUIRK_ENTRY(USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_EUSBATAPI, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_CBI, UQ_MSC_FORCE_PROTO_ATAPI)}, + {USB_QUIRK_ENTRY(USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_EUSBCFSM, + 0x0000, 0xFFFF, UQ_MSC_FORCE_PROTO_SCSI)}, + {USB_QUIRK_ENTRY(USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_EUSCSI, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI)}, + {USB_QUIRK_ENTRY(USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_HIFD, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_CBI, UQ_MSC_FORCE_PROTO_SCSI, + UQ_MSC_NO_GETMAXLUN)}, + {USB_QUIRK_ENTRY(USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_SDDR09, + 0x0000, 0xFFFF, UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_NO_GETMAXLUN)}, + {USB_QUIRK_ENTRY(USB_VENDOR_SHUTTLE, USB_PRODUCT_SHUTTLE_ZIOMMC, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_CBI, UQ_MSC_FORCE_PROTO_SCSI, + UQ_MSC_NO_GETMAXLUN)}, + {USB_QUIRK_ENTRY(USB_VENDOR_SIGMATEL, USB_PRODUCT_SIGMATEL_I_BEAD100, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, + UQ_MSC_SHUTTLE_INIT)}, + {USB_QUIRK_ENTRY(USB_VENDOR_SIIG, USB_PRODUCT_SIIG_WINTERREADER, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, + UQ_MSC_IGNORE_RESIDUE)}, + {USB_QUIRK_ENTRY(USB_VENDOR_SKANHEX, USB_PRODUCT_SKANHEX_MD_7425, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, + UQ_MSC_NO_INQUIRY)}, + {USB_QUIRK_ENTRY(USB_VENDOR_SKANHEX, USB_PRODUCT_SKANHEX_SX_520Z, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, + UQ_MSC_NO_INQUIRY)}, + {USB_QUIRK_ENTRY(USB_VENDOR_SONY, USB_PRODUCT_SONY_HANDYCAM, + 0x0500, 0x0500, UQ_MSC_FORCE_WIRE_CBI, UQ_MSC_FORCE_PROTO_RBC, + UQ_MSC_RBC_PAD_TO_12)}, + {USB_QUIRK_ENTRY(USB_VENDOR_SONY, USB_PRODUCT_SONY_CLIE_40_MS, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, + UQ_MSC_NO_INQUIRY)}, + {USB_QUIRK_ENTRY(USB_VENDOR_SONY, USB_PRODUCT_SONY_DSC, + 0x0500, 0x0500, UQ_MSC_FORCE_WIRE_CBI, UQ_MSC_FORCE_PROTO_RBC, + UQ_MSC_RBC_PAD_TO_12)}, + {USB_QUIRK_ENTRY(USB_VENDOR_SONY, USB_PRODUCT_SONY_DSC, + 0x0600, 0x0600, UQ_MSC_FORCE_WIRE_CBI, UQ_MSC_FORCE_PROTO_RBC, + UQ_MSC_RBC_PAD_TO_12)}, + {USB_QUIRK_ENTRY(USB_VENDOR_SONY, USB_PRODUCT_SONY_DSC, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_CBI, UQ_MSC_FORCE_PROTO_RBC)}, + {USB_QUIRK_ENTRY(USB_VENDOR_SONY, USB_PRODUCT_SONY_HANDYCAM, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_CBI, UQ_MSC_FORCE_PROTO_RBC)}, + {USB_QUIRK_ENTRY(USB_VENDOR_SONY, USB_PRODUCT_SONY_MSC, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_CBI, UQ_MSC_FORCE_PROTO_RBC)}, + {USB_QUIRK_ENTRY(USB_VENDOR_SONY, USB_PRODUCT_SONY_MS_MSC_U03, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_CBI, UQ_MSC_FORCE_PROTO_UFI, + UQ_MSC_NO_GETMAXLUN)}, + {USB_QUIRK_ENTRY(USB_VENDOR_SONY, USB_PRODUCT_SONY_MS_NW_MS7, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, + UQ_MSC_NO_GETMAXLUN)}, + {USB_QUIRK_ENTRY(USB_VENDOR_SONY, USB_PRODUCT_SONY_MS_PEG_N760C, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, + UQ_MSC_NO_INQUIRY)}, + {USB_QUIRK_ENTRY(USB_VENDOR_SONY, USB_PRODUCT_SONY_MSACUS1, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, + UQ_MSC_NO_GETMAXLUN)}, + {USB_QUIRK_ENTRY(USB_VENDOR_SONY, USB_PRODUCT_SONY_PORTABLE_HDD_V2, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI)}, + {USB_QUIRK_ENTRY(USB_VENDOR_SUPERTOP, USB_PRODUCT_SUPERTOP_IDE, + 0x0000, 0xFFFF, UQ_MSC_IGNORE_RESIDUE, UQ_MSC_NO_SYNC_CACHE)}, + {USB_QUIRK_ENTRY(USB_VENDOR_TAUGA, USB_PRODUCT_TAUGA_CAMERAMATE, + 0x0000, 0xFFFF, UQ_MSC_FORCE_PROTO_SCSI)}, + {USB_QUIRK_ENTRY(USB_VENDOR_TEAC, USB_PRODUCT_TEAC_FD05PUB, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_CBI, UQ_MSC_FORCE_PROTO_UFI)}, + {USB_QUIRK_ENTRY(USB_VENDOR_TECLAST, USB_PRODUCT_TECLAST_TLC300, + 0x0000, 0xFFFF, UQ_MSC_NO_TEST_UNIT_READY, UQ_MSC_NO_SYNC_CACHE)}, + {USB_QUIRK_ENTRY(USB_VENDOR_TREK, USB_PRODUCT_TREK_MEMKEY, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, + UQ_MSC_NO_INQUIRY)}, + {USB_QUIRK_ENTRY(USB_VENDOR_TREK, USB_PRODUCT_TREK_THUMBDRIVE_8MB, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_ATAPI, + UQ_MSC_IGNORE_RESIDUE)}, + {USB_QUIRK_ENTRY(USB_VENDOR_TRUMPION, USB_PRODUCT_TRUMPION_C3310, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_CBI, UQ_MSC_FORCE_PROTO_UFI)}, + {USB_QUIRK_ENTRY(USB_VENDOR_TRUMPION, USB_PRODUCT_TRUMPION_MP3, + 0x0000, 0xFFFF, UQ_MSC_FORCE_PROTO_RBC)}, + {USB_QUIRK_ENTRY(USB_VENDOR_TRUMPION, USB_PRODUCT_TRUMPION_T33520, + 0x0000, 0xFFFF, UQ_MSC_FORCE_PROTO_SCSI)}, + {USB_QUIRK_ENTRY(USB_VENDOR_TWINMOS, USB_PRODUCT_TWINMOS_MDIV, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI)}, + {USB_QUIRK_ENTRY(USB_VENDOR_VIA, USB_PRODUCT_VIA_USB2IDEBRIDGE, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, + UQ_MSC_NO_SYNC_CACHE)}, + {USB_QUIRK_ENTRY(USB_VENDOR_VIVITAR, USB_PRODUCT_VIVITAR_35XX, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, + UQ_MSC_NO_INQUIRY)}, + {USB_QUIRK_ENTRY(USB_VENDOR_WESTERN, USB_PRODUCT_WESTERN_COMBO, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, + UQ_MSC_FORCE_SHORT_INQ, UQ_MSC_NO_START_STOP, UQ_MSC_IGNORE_RESIDUE)}, + {USB_QUIRK_ENTRY(USB_VENDOR_WESTERN, USB_PRODUCT_WESTERN_EXTHDD, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, + UQ_MSC_FORCE_SHORT_INQ, UQ_MSC_NO_START_STOP, UQ_MSC_IGNORE_RESIDUE)}, + {USB_QUIRK_ENTRY(USB_VENDOR_WESTERN, USB_PRODUCT_WESTERN_MYBOOK, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, + UQ_MSC_NO_INQUIRY_EVPD)}, + {USB_QUIRK_ENTRY(USB_VENDOR_WESTERN, USB_PRODUCT_WESTERN_MYPASSWORD, + 0x0000, 0xFFFF, UQ_MSC_FORCE_SHORT_INQ)}, + {USB_QUIRK_ENTRY(USB_VENDOR_WINMAXGROUP, USB_PRODUCT_WINMAXGROUP_FLASH64MC, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, + UQ_MSC_NO_INQUIRY)}, + {USB_QUIRK_ENTRY(USB_VENDOR_YANO, USB_PRODUCT_YANO_FW800HD, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, + UQ_MSC_FORCE_SHORT_INQ, UQ_MSC_NO_START_STOP, UQ_MSC_IGNORE_RESIDUE)}, + {USB_QUIRK_ENTRY(USB_VENDOR_YANO, USB_PRODUCT_YANO_U640MO, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_CBI_I, UQ_MSC_FORCE_PROTO_ATAPI, + UQ_MSC_FORCE_SHORT_INQ)}, + {USB_QUIRK_ENTRY(USB_VENDOR_YEDATA, USB_PRODUCT_YEDATA_FLASHBUSTERU, + 0x0000, 0x007F, UQ_MSC_FORCE_WIRE_CBI, UQ_MSC_FORCE_PROTO_UFI, + UQ_MSC_NO_RS_CLEAR_UA, UQ_MSC_FLOPPY_SPEED, + UQ_MSC_NO_TEST_UNIT_READY, UQ_MSC_NO_GETMAXLUN)}, + {USB_QUIRK_ENTRY(USB_VENDOR_YEDATA, USB_PRODUCT_YEDATA_FLASHBUSTERU, + 0x0080, 0x0080, UQ_MSC_FORCE_WIRE_CBI_I, UQ_MSC_FORCE_PROTO_UFI, + UQ_MSC_NO_RS_CLEAR_UA, UQ_MSC_FLOPPY_SPEED, + UQ_MSC_NO_TEST_UNIT_READY, UQ_MSC_NO_GETMAXLUN)}, + {USB_QUIRK_ENTRY(USB_VENDOR_YEDATA, USB_PRODUCT_YEDATA_FLASHBUSTERU, + 0x0081, 0xFFFF, UQ_MSC_FORCE_WIRE_CBI_I, UQ_MSC_FORCE_PROTO_UFI, + UQ_MSC_NO_RS_CLEAR_UA, UQ_MSC_FLOPPY_SPEED, UQ_MSC_NO_GETMAXLUN)}, + {USB_QUIRK_ENTRY(USB_VENDOR_ZORAN, USB_PRODUCT_ZORAN_EX20DSC, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_CBI, UQ_MSC_FORCE_PROTO_ATAPI)}, + {USB_QUIRK_ENTRY(USB_VENDOR_MEIZU, USB_PRODUCT_MEIZU_M6_SL, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, + UQ_MSC_NO_INQUIRY, UQ_MSC_NO_SYNC_CACHE)}, + {USB_QUIRK_ENTRY(USB_VENDOR_ACTIONS, USB_PRODUCT_ACTIONS_MP4, + 0x0000, 0xFFFF, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, + UQ_MSC_NO_SYNC_CACHE)}, + {USB_QUIRK_ENTRY(USB_VENDOR_ASUS, USB_PRODUCT_ASUS_GMSC, + 0x0000, 0xFFFF, UQ_MSC_NO_SYNC_CACHE)}, }; static const char *usb_quirk_str[USB_QUIRK_MAX] = { [UQ_NONE] = "UQ_NONE", + [UQ_MATCH_VENDOR_ONLY] = "UQ_MATCH_VENDOR_ONLY", [UQ_AUDIO_SWAP_LR] = "UQ_AUDIO_SWAP_LR", [UQ_AU_INP_ASYNC] = "UQ_AU_INP_ASYNC", [UQ_AU_NO_FRAC] = "UQ_AU_NO_FRAC", @@ -210,7 +596,29 @@ [UQ_CFG_INDEX_3] = "UQ_CFG_INDEX_3", [UQ_CFG_INDEX_4] = "UQ_CFG_INDEX_4", [UQ_CFG_INDEX_0] = "UQ_CFG_INDEX_0", - [UQ_ASSUME_CM_OVER_DATA]= "UQ_ASSUME_CM_OVER_DATA", + [UQ_ASSUME_CM_OVER_DATA] = "UQ_ASSUME_CM_OVER_DATA", + [UQ_MSC_NO_TEST_UNIT_READY] = "UQ_MSC_NO_TEST_UNIT_READY", + [UQ_MSC_NO_RS_CLEAR_UA] = "UQ_MSC_NO_RS_CLEAR_UA", + [UQ_MSC_NO_START_STOP] = "UQ_MSC_NO_START_STOP", + [UQ_MSC_NO_GETMAXLUN] = "UQ_MSC_NO_GETMAXLUN", + [UQ_MSC_NO_INQUIRY] = "UQ_MSC_NO_INQUIRY", + [UQ_MSC_NO_INQUIRY_EVPD] = "UQ_MSC_NO_INQUIRY_EVPD", + [UQ_MSC_NO_SYNC_CACHE] = "UQ_MSC_NO_SYNC_CACHE", + [UQ_MSC_SHUTTLE_INIT] = "UQ_MSC_SHUTTLE_INIT", + [UQ_MSC_ALT_IFACE_1] = "UQ_MSC_ALT_IFACE_1", + [UQ_MSC_FLOPPY_SPEED] = "UQ_MSC_FLOPPY_SPEED", + [UQ_MSC_IGNORE_RESIDUE] = "UQ_MSC_IGNORE_RESIDUE", + [UQ_MSC_WRONG_CSWSIG] = "UQ_MSC_WRONG_CSWSIG", + [UQ_MSC_RBC_PAD_TO_12] = "UQ_MSC_RBC_PAD_TO_12", + [UQ_MSC_READ_CAP_OFFBY1] = "UQ_MSC_READ_CAP_OFFBY1", + [UQ_MSC_FORCE_SHORT_INQ] = "UQ_MSC_FORCE_SHORT_INQ", + [UQ_MSC_FORCE_WIRE_BBB] = "UQ_MSC_FORCE_WIRE_BBB", + [UQ_MSC_FORCE_WIRE_CBI] = "UQ_MSC_FORCE_WIRE_CBI", + [UQ_MSC_FORCE_WIRE_CBI_I] = "UQ_MSC_FORCE_WIRE_CBI_I", + [UQ_MSC_FORCE_PROTO_SCSI] = "UQ_MSC_FORCE_PROTO_SCSI", + [UQ_MSC_FORCE_PROTO_ATAPI] = "UQ_MSC_FORCE_PROTO_ATAPI", + [UQ_MSC_FORCE_PROTO_UFI] = "UQ_MSC_FORCE_PROTO_UFI", + [UQ_MSC_FORCE_PROTO_RBC] = "UQ_MSC_FORCE_PROTO_RBC", }; /*------------------------------------------------------------------------* @@ -246,11 +654,22 @@ for (x = 0; x != USB_DEV_QUIRKS_MAX; x++) { /* see if quirk information does not match */ if ((usb_quirks[x].vid != info->idVendor) || - (usb_quirks[x].pid != info->idProduct) || (usb_quirks[x].lo_rev > info->bcdDevice) || (usb_quirks[x].hi_rev < info->bcdDevice)) { continue; } + /* see if quirk only should match vendor ID */ + if (usb_quirks[x].pid != info->idProduct) { + if (usb_quirks[x].pid != 0) + continue; + + for (y = 0; y != USB_SUB_QUIRKS_MAX; y++) { + if (usb_quirks[x].quirks[y] == UQ_MATCH_VENDOR_ONLY) + break; + } + if (y == USB_SUB_QUIRKS_MAX) + continue; + } /* lookup quirk */ for (y = 0; y != USB_SUB_QUIRKS_MAX; y++) { if (usb_quirks[x].quirks[y] == quirk) { From owner-p4-projects@FreeBSD.ORG Wed Dec 23 01:01:06 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 05494106568B; Wed, 23 Dec 2009 01:01:06 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B3A95106566C for ; Wed, 23 Dec 2009 01:01:05 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A156F8FC08 for ; Wed, 23 Dec 2009 01:01:05 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nBN1156S012308 for ; Wed, 23 Dec 2009 01:01:05 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nBN115MQ012306 for perforce@freebsd.org; Wed, 23 Dec 2009 01:01:05 GMT (envelope-from thompsa@freebsd.org) Date: Wed, 23 Dec 2009 01:01:05 GMT Message-Id: <200912230101.nBN115MQ012306@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 Precedence: bulk Cc: Subject: PERFORCE change 172121 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Dec 2009 01:01:06 -0000 http://p4web.freebsd.org/chv.cgi?CH=172121 Change 172121 by thompsa@thompsa_pea on 2009/12/23 01:01:05 Remove entry that came in from svn under another name. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usbdevs#91 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usbdevs#91 (text+ko) ==== @@ -2230,7 +2230,6 @@ product QUALCOMM2 AC8700 0x6000 AC8700 product QUALCOMM2 MF330 0x6613 MF330 product QUALCOMMINC CDMA_MSM 0x0001 CDMA Technologies MSM modem -product QUALCOMMINC CDMA_ZTE 0x0052 CDMA Technologies MSM modem product QUALCOMMINC ZTE_STOR 0x2000 USB ZTE Storage product QUALCOMMINC AC8710 0xfff1 3G modem product QUALCOMMINC AC2726 0xfff5 3G modem From owner-p4-projects@FreeBSD.ORG Wed Dec 23 01:09:15 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4838D106568B; Wed, 23 Dec 2009 01:09:14 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 031CC1065676 for ; Wed, 23 Dec 2009 01:09:14 +0000 (UTC) (envelope-from thompsa@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E510C8FC13 for ; Wed, 23 Dec 2009 01:09:13 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nBN19Dkc013873 for ; Wed, 23 Dec 2009 01:09:13 GMT (envelope-from thompsa@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nBN19DfR013870 for perforce@freebsd.org; Wed, 23 Dec 2009 01:09:13 GMT (envelope-from thompsa@freebsd.org) Date: Wed, 23 Dec 2009 01:09:13 GMT Message-Id: <200912230109.nBN19DfR013870@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 Precedence: bulk Cc: Subject: PERFORCE change 172122 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Dec 2009 01:09:15 -0000 http://p4web.freebsd.org/chv.cgi?CH=172122 Change 172122 by thompsa@thompsa_pea on 2009/12/23 01:08:46 Shorten quirk names. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/quirk/usb_quirk.h#7 edit .. //depot/projects/usb/src/sys/dev/usb/storage/umass.c#42 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/quirk/usb_quirk.h#7 (text+ko) ==== @@ -67,15 +67,15 @@ UQ_MSC_NO_GETMAXLUN, UQ_MSC_NO_INQUIRY, UQ_MSC_NO_INQUIRY_EVPD, - UQ_MSC_NO_SYNCHRONIZE_CACHE, + UQ_MSC_NO_SYNC_CACHE, UQ_MSC_SHUTTLE_INIT, UQ_MSC_ALT_IFACE_1, UQ_MSC_FLOPPY_SPEED, UQ_MSC_IGNORE_RESIDUE, UQ_MSC_WRONG_CSWSIG, UQ_MSC_RBC_PAD_TO_12, - UQ_MSC_READ_CAPACITY_OFFBY1, - UQ_MSC_FORCE_SHORT_INQUIRY, + UQ_MSC_READ_CAP_OFFBY1, + UQ_MSC_FORCE_SHORT_INQ, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_WIRE_CBI, UQ_MSC_FORCE_WIRE_CBI_I, ==== //depot/projects/usb/src/sys/dev/usb/storage/umass.c#42 (text+ko) ==== @@ -837,7 +837,7 @@ quirks |= NO_INQUIRY; if (usb_test_quirk(uaa, UQ_MSC_NO_INQUIRY_EVPD)) quirks |= NO_INQUIRY_EVPD; - if (usb_test_quirk(uaa, UQ_MSC_NO_SYNCHRONIZE_CACHE)) + if (usb_test_quirk(uaa, UQ_MSC_NO_SYNC_CACHE)) quirks |= NO_SYNCHRONIZE_CACHE; if (usb_test_quirk(uaa, UQ_MSC_SHUTTLE_INIT)) quirks |= SHUTTLE_INIT; @@ -851,9 +851,9 @@ quirks |= WRONG_CSWSIG; if (usb_test_quirk(uaa, UQ_MSC_RBC_PAD_TO_12)) quirks |= RBC_PAD_TO_12; - if (usb_test_quirk(uaa, UQ_MSC_READ_CAPACITY_OFFBY1)) + if (usb_test_quirk(uaa, UQ_MSC_READ_CAP_OFFBY1)) quirks |= READ_CAPACITY_OFFBY1; - if (usb_test_quirk(uaa, UQ_MSC_FORCE_SHORT_INQUIRY)) + if (usb_test_quirk(uaa, UQ_MSC_FORCE_SHORT_INQ)) quirks |= FORCE_SHORT_INQUIRY; done: From owner-p4-projects@FreeBSD.ORG Wed Dec 23 09:18:01 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BB8901065693; Wed, 23 Dec 2009 09:18:00 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7DC95106566C; Wed, 23 Dec 2009 09:18:00 +0000 (UTC) (envelope-from hselasky@freebsd.org) Received: from swip.net (mailfe13.tele2.se [212.247.155.129]) by mx1.freebsd.org (Postfix) with ESMTP id BE5348FC1E; Wed, 23 Dec 2009 09:17:59 +0000 (UTC) X-Cloudmark-Score: 0.000000 [] X-Cloudmark-Analysis: v=1.0 c=1 a=O_X9WWNOezwA:10 a=RERtC8nhXGhYvIZhK0yWrQ==:17 a=6eJ9-gBDi7DbQl2ODK4A:9 a=v7Xb_v66ba7LW4nwBMmvATbaWpkA:4 Received: from [90.149.203.35] (account mc467741@c2i.net HELO laptop.adsl.tele2.no) by mailfe13.swip.net (CommuniGate Pro SMTP 5.2.16) with ESMTPA id 966459827; Wed, 23 Dec 2009 10:17:57 +0100 Received-SPF: softfail receiver=mailfe13.swip.net; client-ip=90.149.203.35; envelope-from=hselasky@freebsd.org From: Hans Petter Selasky To: Andrew Thompson Date: Wed, 23 Dec 2009 10:19:59 +0100 User-Agent: KMail/1.11.4 (FreeBSD/9.0-CURRENT; KDE/4.2.4; i386; ; ) References: <200912230109.nBN19DfR013870@repoman.freebsd.org> In-Reply-To: <200912230109.nBN19DfR013870@repoman.freebsd.org> X-Face: (%:6u[ldzJ`0qjD7sCkfdMmD*RxpOwEEQ+KWt[{J#x6ow~JO:,zwp.(t; @Aq :4:&nFCgDb8[3oIeTb^'",;u{5{}C9>"PuY\)!=#\u9SSM-nz8+SR~B\!qBv MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200912231020.00751.hselasky@freebsd.org> Cc: Perforce Change Reviews Subject: Re: PERFORCE change 172122 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, 23 Dec 2009 09:18:01 -0000 Looks good! A future optimisation is to sort the quirks and perform a binary search. --HPS From owner-p4-projects@FreeBSD.ORG Wed Dec 23 09:59:04 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DF5FC106568F; Wed, 23 Dec 2009 09:59:03 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A3CB4106568B for ; Wed, 23 Dec 2009 09:59:03 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 912518FC18 for ; Wed, 23 Dec 2009 09:59:03 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nBN9x32r081734 for ; Wed, 23 Dec 2009 09:59:03 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nBN9x3Jt081732 for perforce@freebsd.org; Wed, 23 Dec 2009 09:59:03 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 23 Dec 2009 09:59:03 GMT Message-Id: <200912230959.nBN9x3Jt081732@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 172130 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Dec 2009 09:59:04 -0000 http://p4web.freebsd.org/chv.cgi?CH=172130 Change 172130 by hselasky@hselasky_laptop001 on 2009/12/23 09:59:02 usbconfig: - improve command line parsing - add new convenience commands that can add and remove quirks based on -u and -a options. - patch by: HPS Affected files ... .. //depot/projects/usb/src/usr.sbin/usbconfig/usbconfig.c#17 edit Differences ... ==== //depot/projects/usb/src/usr.sbin/usbconfig/usbconfig.c#17 (text+ko) ==== @@ -1,6 +1,6 @@ /* $FreeBSD: src/usr.sbin/usbconfig/usbconfig.c,v 1.8 2009/03/17 21:21:33 delphij Exp $ */ /*- - * Copyright (c) 2008 Hans Petter Selasky. All rights reserved. + * Copyright (c) 2008-2009 Hans Petter Selasky. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -81,6 +81,8 @@ uint8_t got_show_iface_driver:1; uint8_t got_remove_device_quirk:1; uint8_t got_add_device_quirk:1; + uint8_t got_remove_quirk:1; + uint8_t got_add_quirk:1; uint8_t got_dump_string:1; uint8_t got_do_request:1; }; @@ -101,6 +103,8 @@ T_GET_TEMPLATE, T_ADD_DEVICE_QUIRK, T_REMOVE_DEVICE_QUIRK, + T_ADD_QUIRK, + T_REMOVE_QUIRK, T_SHOW_IFACE_DRIVER, T_DUMP_QUIRK_NAMES, T_DUMP_DEVICE_QUIRKS, @@ -131,6 +135,8 @@ {"get_template", T_GET_TEMPLATE, 0}, {"add_dev_quirk_vplh", T_ADD_DEVICE_QUIRK, 5}, {"remove_dev_quirk_vplh", T_REMOVE_DEVICE_QUIRK, 5}, + {"add_quirk", T_ADD_QUIRK, 1}, + {"remove_quirk", T_REMOVE_QUIRK, 1}, {"dump_quirk_names", T_DUMP_QUIRK_NAMES, 0}, {"dump_device_quirks", T_DUMP_DEVICE_QUIRKS, 0}, {"dump_device_desc", T_DUMP_DEVICE_DESC, 0}, @@ -259,6 +265,8 @@ " get_template" "\n" " add_dev_quirk_vplh " "\n" " remove_dev_quirk_vplh " "\n" + " add_quirk " "\n" + " remove_quirk " "\n" " dump_quirk_names" "\n" " dump_device_quirks" "\n" " dump_device_desc" "\n" @@ -360,6 +368,28 @@ } matches++; + if (opt->got_remove_quirk) { + struct LIBUSB20_DEVICE_DESC_DECODED *ddesc; + + ddesc = libusb20_dev_get_device_desc(pdev); + + be_dev_remove_quirk(pbe, + ddesc->idVendor, ddesc->idProduct, + ddesc->bcdDevice, ddesc->bcdDevice, + opt->quirkname); + } + + if (opt->got_add_quirk) { + struct LIBUSB20_DEVICE_DESC_DECODED *ddesc; + + ddesc = libusb20_dev_get_device_desc(pdev); + + be_dev_add_quirk(pbe, + ddesc->idVendor, ddesc->idProduct, + ddesc->bcdDevice, ddesc->bcdDevice, + opt->quirkname); + } + if (libusb20_dev_open(pdev, 0)) { err(1, "could not open device"); } @@ -518,6 +548,28 @@ if (t > 255) t = 255; switch (get_token(argv[n], t)) { + case T_ADD_QUIRK: + if (opt->got_add_quirk) { + flush_command(pbe, opt); + } + opt->quirkname = argv[n + 1]; + n++; + + opt->got_add_quirk = 1; + opt->got_any++; + break; + + case T_REMOVE_QUIRK: + if (opt->got_remove_quirk) { + flush_command(pbe, opt); + } + opt->quirkname = argv[n + 1]; + n++; + + opt->got_remove_quirk = 1; + opt->got_any++; + break; + case T_ADD_DEVICE_QUIRK: if (opt->got_add_device_quirk) { flush_command(pbe, opt); @@ -548,11 +600,15 @@ break; case T_DUMP_QUIRK_NAMES: + if (opt->got_dump_quirk_names) + break; opt->got_dump_quirk_names = 1; opt->got_any++; break; case T_DUMP_DEVICE_QUIRKS: + if (opt->got_dump_device_quirks) + break; opt->got_dump_device_quirks = 1; opt->got_any++; break; @@ -581,40 +637,56 @@ n++; break; case T_SET_CONFIG: + if (opt->got_set_config) + break; opt->config_index = num_id(argv[n + 1], "cfg_index"); opt->got_set_config = 1; opt->got_any++; n++; break; case T_SET_ALT: + if (opt->got_set_alt) + break; opt->alt_index = num_id(argv[n + 1], "cfg_index"); opt->got_set_alt = 1; opt->got_any++; n++; break; case T_SET_TEMPLATE: + if (opt->got_set_template) + break; opt->template = get_int(argv[n + 1]); opt->got_set_template = 1; opt->got_any++; n++; break; case T_GET_TEMPLATE: + if (opt->got_get_template) + break; opt->got_get_template = 1; opt->got_any++; break; case T_DUMP_DEVICE_DESC: + if (opt->got_dump_device_desc) + break; opt->got_dump_device_desc = 1; opt->got_any++; break; case T_DUMP_CURR_CONFIG_DESC: + if (opt->got_dump_curr_config) + break; opt->got_dump_curr_config = 1; opt->got_any++; break; case T_DUMP_ALL_CONFIG_DESC: + if (opt->got_dump_all_config) + break; opt->got_dump_all_config = 1; opt->got_any++; break; case T_DUMP_INFO: + if (opt->got_dump_info) + break; opt->got_dump_info = 1; opt->got_any++; break; @@ -628,30 +700,44 @@ n++; break; case T_SUSPEND: + if (opt->got_suspend) + break; opt->got_suspend = 1; opt->got_any++; break; case T_RESUME: + if (opt->got_resume) + break; opt->got_resume = 1; opt->got_any++; break; case T_POWER_OFF: + if (opt->got_power_off) + break; opt->got_power_off = 1; opt->got_any++; break; case T_POWER_SAVE: + if (opt->got_power_save) + break; opt->got_power_save = 1; opt->got_any++; break; case T_POWER_ON: + if (opt->got_power_on) + break; opt->got_power_on = 1; opt->got_any++; break; case T_RESET: + if (opt->got_reset) + break; opt->got_reset = 1; opt->got_any++; break; case T_LIST: + if (opt->got_list) + break; opt->got_list = 1; opt->got_any++; break; From owner-p4-projects@FreeBSD.ORG Wed Dec 23 15:41:48 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1F6CB10656B8; Wed, 23 Dec 2009 15:41:48 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D6D8610656B4 for ; Wed, 23 Dec 2009 15:41:47 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BF2328FC1D for ; Wed, 23 Dec 2009 15:41:47 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nBNFfled023887 for ; Wed, 23 Dec 2009 15:41:47 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nBNFflxX023885 for perforce@freebsd.org; Wed, 23 Dec 2009 15:41:47 GMT (envelope-from jhb@freebsd.org) Date: Wed, 23 Dec 2009 15:41:47 GMT Message-Id: <200912231541.nBNFflxX023885@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 172141 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Dec 2009 15:41:48 -0000 http://p4web.freebsd.org/chv.cgi?CH=172141 Change 172141 by jhb@jhb_jhbbsd on 2009/12/23 15:41:08 IFC @172136 Affected files ... .. //depot/projects/smpng/share/man/man9/Makefile#13 integrate .. //depot/projects/smpng/share/man/man9/usbdi.9#3 integrate .. //depot/projects/smpng/sys/amd64/conf/NOTES#57 integrate .. //depot/projects/smpng/sys/boot/i386/Makefile#11 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/biosdisk.c#24 integrate .. //depot/projects/smpng/sys/boot/pc98/kgzldr/crt.s#5 integrate .. //depot/projects/smpng/sys/boot/pc98/libpc98/biosdisk.c#17 integrate .. //depot/projects/smpng/sys/boot/uboot/lib/glue.c#6 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_cd.c#41 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#3 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#4 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#4 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#5 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#3 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#4 integrate .. //depot/projects/smpng/sys/compat/linux/linux_signal.c#27 integrate .. //depot/projects/smpng/sys/conf/NOTES#180 integrate .. //depot/projects/smpng/sys/dev/agp/agp_via.c#5 integrate .. //depot/projects/smpng/sys/dev/ahci/ahci.c#5 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.h#69 integrate .. //depot/projects/smpng/sys/dev/ata/chipsets/ata-amd.c#4 integrate .. //depot/projects/smpng/sys/dev/ata/chipsets/ata-intel.c#8 integrate .. //depot/projects/smpng/sys/dev/ata/chipsets/ata-ite.c#4 integrate .. //depot/projects/smpng/sys/dev/ata/chipsets/ata-serverworks.c#6 integrate .. //depot/projects/smpng/sys/dev/ata/chipsets/ata-via.c#7 integrate .. //depot/projects/smpng/sys/dev/atkbdc/psm.c#18 integrate .. //depot/projects/smpng/sys/dev/auxio/auxio.c#6 integrate .. //depot/projects/smpng/sys/dev/ciss/ciss.c#65 integrate .. //depot/projects/smpng/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#5 integrate .. //depot/projects/smpng/sys/dev/e1000/if_igb.c#16 integrate .. //depot/projects/smpng/sys/dev/hwpmc/hwpmc_intel.c#6 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndis_usb.c#14 integrate .. //depot/projects/smpng/sys/dev/ipmi/ipmi.c#11 integrate .. //depot/projects/smpng/sys/dev/ips/ips_pci.c#15 integrate .. //depot/projects/smpng/sys/dev/mii/ip1000phy.c#5 integrate .. //depot/projects/smpng/sys/dev/mxge/if_mxge.c#36 integrate .. //depot/projects/smpng/sys/dev/sound/usb/uaudio.c#35 integrate .. //depot/projects/smpng/sys/dev/ste/if_ste.c#5 integrate .. //depot/projects/smpng/sys/dev/ste/if_stereg.h#3 integrate .. //depot/projects/smpng/sys/dev/uart/uart_bus_acpi.c#4 integrate .. //depot/projects/smpng/sys/dev/usb/controller/ehci_pci.c#11 integrate .. //depot/projects/smpng/sys/dev/usb/controller/ohci_pci.c#9 integrate .. //depot/projects/smpng/sys/dev/usb/quirk/usb_quirk.c#8 integrate .. //depot/projects/smpng/sys/dev/usb/quirk/usb_quirk.h#5 integrate .. //depot/projects/smpng/sys/dev/usb/serial/u3g.c#14 integrate .. //depot/projects/smpng/sys/dev/usb/serial/uftdi.c#11 integrate .. //depot/projects/smpng/sys/dev/usb/storage/umass.c#17 integrate .. //depot/projects/smpng/sys/dev/usb/usb_device.c#18 integrate .. //depot/projects/smpng/sys/dev/usb/usb_dynamic.c#8 integrate .. //depot/projects/smpng/sys/dev/usb/usb_dynamic.h#7 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#148 integrate .. //depot/projects/smpng/sys/dev/usb/usbdi.h#29 integrate .. //depot/projects/smpng/sys/dev/vge/if_vge.c#28 integrate .. //depot/projects/smpng/sys/dev/vge/if_vgereg.h#4 integrate .. //depot/projects/smpng/sys/dev/vge/if_vgevar.h#5 integrate .. //depot/projects/smpng/sys/fs/devfs/devfs_vnops.c#84 integrate .. //depot/projects/smpng/sys/geom/raid3/g_raid3.c#41 integrate .. //depot/projects/smpng/sys/geom/raid3/g_raid3.h#15 integrate .. //depot/projects/smpng/sys/i386/conf/NOTES#149 integrate .. //depot/projects/smpng/sys/ia64/ia64/clock.c#23 integrate .. //depot/projects/smpng/sys/ia64/ia64/machdep.c#121 integrate .. //depot/projects/smpng/sys/ia64/include/clock.h#9 integrate .. //depot/projects/smpng/sys/ia64/include/mca.h#6 integrate .. //depot/projects/smpng/sys/ia64/include/md_var.h#27 integrate .. //depot/projects/smpng/sys/kern/kern_exit.c#147 integrate .. //depot/projects/smpng/sys/kern/kern_proc.c#110 integrate .. //depot/projects/smpng/sys/kern/subr_acl_nfs4.c#3 integrate .. //depot/projects/smpng/sys/kern/subr_eventhandler.c#24 integrate .. //depot/projects/smpng/sys/kern/subr_turnstile.c#43 integrate .. //depot/projects/smpng/sys/kern/tty_pts.c#25 integrate .. //depot/projects/smpng/sys/kern/uipc_syscalls.c#124 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#174 integrate .. //depot/projects/smpng/sys/modules/ipfw/Makefile#14 integrate .. //depot/projects/smpng/sys/net/if_bridge.c#65 integrate .. //depot/projects/smpng/sys/net/if_ethersubr.c#105 integrate .. //depot/projects/smpng/sys/net/if_var.h#73 integrate .. //depot/projects/smpng/sys/net/netisr.c#21 integrate .. //depot/projects/smpng/sys/netgraph/ng_ipfw.c#9 integrate .. //depot/projects/smpng/sys/netgraph/ng_ipfw.h#4 integrate .. //depot/projects/smpng/sys/netinet/ip_dummynet.h#28 integrate .. //depot/projects/smpng/sys/netinet/ip_fw.h#54 integrate .. //depot/projects/smpng/sys/netinet/ipfw/ip_dummynet.c#6 integrate .. //depot/projects/smpng/sys/netinet/ipfw/ip_fw2.c#10 integrate .. //depot/projects/smpng/sys/netinet/ipfw/ip_fw_log.c#2 integrate .. //depot/projects/smpng/sys/netinet/ipfw/ip_fw_nat.c#6 integrate .. //depot/projects/smpng/sys/netinet/ipfw/ip_fw_pfil.c#8 integrate .. //depot/projects/smpng/sys/netinet/ipfw/ip_fw_private.h#2 integrate .. //depot/projects/smpng/sys/netinet/ipfw/ip_fw_sockopt.c#2 integrate .. //depot/projects/smpng/sys/netinet/ipfw/ip_fw_table.c#2 integrate .. //depot/projects/smpng/sys/netinet/tcp.h#21 integrate .. //depot/projects/smpng/sys/netinet/tcp_usrreq.c#84 integrate .. //depot/projects/smpng/sys/netinet6/mld6.c#36 integrate .. //depot/projects/smpng/sys/netinet6/mld6_var.h#8 integrate .. //depot/projects/smpng/sys/pc98/conf/NOTES#72 integrate .. //depot/projects/smpng/sys/powerpc/booke/clock.c#6 integrate .. //depot/projects/smpng/sys/sparc64/central/central.c#11 integrate .. //depot/projects/smpng/sys/sparc64/ebus/ebus.c#27 integrate .. //depot/projects/smpng/sys/sparc64/fhc/fhc.c#14 integrate .. //depot/projects/smpng/sys/sparc64/include/bus_common.h#8 integrate .. //depot/projects/smpng/sys/sparc64/isa/ofw_isa.c#12 integrate .. //depot/projects/smpng/sys/sparc64/pci/apb.c#17 integrate .. //depot/projects/smpng/sys/sparc64/pci/ofw_pcib.c#12 integrate .. //depot/projects/smpng/sys/sparc64/pci/ofw_pcibus.c#16 integrate .. //depot/projects/smpng/sys/sparc64/sbus/dma_sbus.c#9 integrate .. //depot/projects/smpng/sys/sparc64/sbus/sbus.c#34 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/identcpu.c#19 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/nexus.c#21 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/upa.c#11 integrate .. //depot/projects/smpng/sys/sys/acl.h#16 integrate .. //depot/projects/smpng/sys/sys/mount.h#78 integrate .. //depot/projects/smpng/sys/sys/proc.h#203 integrate .. //depot/projects/smpng/sys/sys/vnode.h#105 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_rawread.c#23 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#116 integrate .. //depot/projects/smpng/sys/ufs/ffs/fs.h#22 integrate .. //depot/projects/smpng/sys/ufs/ufs/acl.h#6 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_acl.c#20 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_lookup.c#37 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_vnops.c#81 integrate .. //depot/projects/smpng/sys/vm/vm_object.c#114 integrate .. //depot/projects/smpng/sys/vm/vm_object.h#42 integrate Differences ... ==== //depot/projects/smpng/share/man/man9/Makefile#13 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/man/man9/Makefile,v 1.364 2009/10/27 14:37:25 emaste Exp $ +# $FreeBSD: src/share/man/man9/Makefile,v 1.366 2009/12/22 16:05:28 ru Exp $ MAN= accept_filter.9 \ accf_data.9 \ @@ -394,14 +394,14 @@ atomic.9 atomic_set.9 \ atomic.9 atomic_store.9 \ atomic.9 atomic_subtract.9 -MLINKS+=bpf.9 bpf_filter.9 \ +MLINKS+=bpf.9 bpfattach.9 \ + bpf.9 bpfattach2.9 \ + bpf.9 bpfdetach.9 \ + bpf.9 bpf_filter.9 \ bpf.9 bpf_mtap.9 \ bpf.9 bpf_mtap2.9 \ bpf.9 bpf_tap.9 \ - bpf.9 bpf_validate.9 \ - bpf.9 bpfattach.9 \ - bpf.9 bpfattach2.9 \ - bpf.9 bpfdetach.9 + bpf.9 bpf_validate.9 MLINKS+=buf.9 bp.9 MLINKS+=bus_activate_resource.9 bus_deactivate_resource.9 MLINKS+=bus_alloc_resource.9 bus_alloc_resource_any.9 @@ -563,11 +563,11 @@ crypto.9 crypto_unblock.9 \ crypto.9 crypto_unregister.9 \ crypto.9 crypto_unregister_all.9 -MLINKS+=DB_COMMAND.9 DB_SHOW_COMMAND.9 \ - DB_COMMAND.9 DB_SHOW_ALL_COMMAND.9 +MLINKS+=DB_COMMAND.9 DB_SHOW_ALL_COMMAND.9 \ + DB_COMMAND.9 DB_SHOW_COMMAND.9 MLINKS+=dev_clone.9 drain_dev_clone_events.9 -MLINKS+=devfs_set_cdevpriv.9 devfs_get_cdevpriv.9 \ - devfs_set_cdevpriv.9 devfs_clear_cdevpriv.9 +MLINKS+=devfs_set_cdevpriv.9 devfs_clear_cdevpriv.9 \ + devfs_set_cdevpriv.9 devfs_get_cdevpriv.9 MLINKS+=device_add_child.9 device_add_child_ordered.9 MLINKS+=device_enable.9 device_disable.9 \ device_enable.9 device_is_enabled.9 @@ -591,8 +591,8 @@ devstat.9 devstat_start_transaction.9 MLINKS+=disk.9 disk_alloc.9 \ disk.9 disk_create.9 \ - disk.9 disk_gone.9 \ - disk.9 disk_destroy.9 + disk.9 disk_destroy.9 \ + disk.9 disk_gone.9 MLINKS+=domain.9 DOMAIN_SET.9 \ domain.9 net_add_domain.9 \ domain.9 pfctlinput.9 \ @@ -642,60 +642,60 @@ hashinit.9 phashinit.9 MLINKS+=ieee80211.9 ieee80211_ifattach.9 \ ieee80211.9 ieee80211_ifdetach.9 -MLINKS+=ieee80211_amrr.9 ieee80211_amrr_init.9 \ - ieee80211_amrr.9 ieee80211_amrr_cleanup.9 \ +MLINKS+=ieee80211_amrr.9 ieee80211_amrr_cleanup.9 \ + ieee80211_amrr.9 ieee80211_amrr_init.9 \ + ieee80211_amrr.9 ieee80211_amrr_node_init.9 \ ieee80211_amrr.9 ieee80211_amrr_setinterval.9 \ - ieee80211_amrr.9 ieee80211_amrr_node_init.9 \ ieee80211_amrr.9 ieee80211_amrr_tx_complete.9 \ ieee80211_amrr.9 ieee80211_amrr_tx_update.9 MLINKS+=ieee80211_beacon.9 ieee80211_beacon_alloc.9 \ - ieee80211_beacon.9 ieee80211_beacon_update.9 \ - ieee80211_beacon.9 ieee80211_beacon_notify.9 + ieee80211_beacon.9 ieee80211_beacon_notify.9 \ + ieee80211_beacon.9 ieee80211_beacon_update.9 MLINKS+=ieee80211_bmiss.9 ieee80211_beacon_miss.9 -MLINKS+=ieee80211_crypto.9 ieee80211_key_update_begin.9 \ - ieee80211_crypto.9 ieee80211_key_update_end.9 \ - ieee80211_crypto.9 ieee80211_crypto_newkey.9 \ - ieee80211_crypto.9 ieee80211_crypto_setkey.9 \ +MLINKS+=ieee80211_crypto.9 ieee80211_crypto_available.9 \ + ieee80211_crypto.9 ieee80211_crypto_decap.9 \ ieee80211_crypto.9 ieee80211_crypto_delglobalkeys.9 \ - ieee80211_crypto.9 ieee80211_crypto_reload_keys.9 \ - ieee80211_crypto.9 ieee80211_crypto_decap.9 \ + ieee80211_crypto.9 ieee80211_crypto_demic.9 \ ieee80211_crypto.9 ieee80211_crypto_encap.9 \ - ieee80211_crypto.9 ieee80211_crypto_demic.9 \ ieee80211_crypto.9 ieee80211_crypto_enmic.9 \ - ieee80211_crypto.9 ieee80211_notify_michael_failure.9 \ - ieee80211_crypto.9 ieee80211_notify_replay_failure.9 \ + ieee80211_crypto.9 ieee80211_crypto_newkey.9 \ ieee80211_crypto.9 ieee80211_crypto_register.9 \ + ieee80211_crypto.9 ieee80211_crypto_reload_keys.9 \ + ieee80211_crypto.9 ieee80211_crypto_setkey.9 \ ieee80211_crypto.9 ieee80211_crypto_unregister.9 \ - ieee80211_crypto.9 ieee80211_crypto_available.9 + ieee80211_crypto.9 ieee80211_key_update_begin.9 \ + ieee80211_crypto.9 ieee80211_key_update_end.9 \ + ieee80211_crypto.9 ieee80211_notify_michael_failure.9 \ + ieee80211_crypto.9 ieee80211_notify_replay_failure.9 MLINKS+=ieee80211_input.9 ieee80211_input_all.9 -MLINKS+=ieee80211_node.9 ieee80211_find_rxnode.9 \ +MLINKS+=ieee80211_node.9 ieee80211_dump_node.9 \ + ieee80211_node.9 ieee80211_dump_nodes.9 \ + ieee80211_node.9 ieee80211_find_rxnode.9 \ ieee80211_node.9 ieee80211_find_rxnode_withkey.9 \ - ieee80211_node.9 ieee80211_ref_node.9 \ - ieee80211_node.9 ieee80211_unref_node.9 \ ieee80211_node.9 ieee80211_free_node.9 \ ieee80211_node.9 ieee80211_iterate_nodes.9 \ - ieee80211_node.9 ieee80211_dump_node.9 \ - ieee80211_node.9 ieee80211_dump_nodes.9 -MLINKS+=ieee80211_output.9 M_WME_GETAC.9 \ + ieee80211_node.9 ieee80211_ref_node.9 \ + ieee80211_node.9 ieee80211_unref_node.9 +MLINKS+=ieee80211_output.9 ieee80211_process_callback.9 \ ieee80211_output.9 M_SEQNO_GET.9 \ - ieee80211_output.9 ieee80211_process_callback.9 + ieee80211_output.9 M_WME_GETAC.9 MLINKS+=ieee80211_proto.9 ieee80211_new_state.9 \ + ieee80211_proto.9 ieee80211_resume_all.9 \ ieee80211_proto.9 ieee80211_start_all.9 \ ieee80211_proto.9 ieee80211_stop_all.9 \ ieee80211_proto.9 ieee80211_suspend_all.9 \ - ieee80211_proto.9 ieee80211_resume_all.9 \ ieee80211_proto.9 ieee80211_waitfor_parent.9 -MLINKS+=ieee80211_radiotap.9 radiotap.9 \ +MLINKS+=ieee80211_radiotap.9 ieee80211_radiotap_active.9 \ + ieee80211_radiotap.9 ieee80211_radiotap_active_vap.9 \ ieee80211_radiotap.9 ieee80211_radiotap_attach.9 \ - ieee80211_radiotap.9 ieee80211_radiotap_active_vap.9 \ - ieee80211_radiotap.9 ieee80211_radiotap_active.9 \ - ieee80211_radiotap.9 ieee80211_radiotap_tx.9 -MLINKS+=ieee80211_regdomain.9 ieee80211_init_channels.9 \ - ieee80211_regdomain.9 ieee80211_sort_channels.9 \ - ieee80211_regdomain.9 ieee80211_alloc_countryie.9 -MLINKS+=ieee80211_vap.9 ieee80211_vap_setup.9 \ - ieee80211_vap.9 ieee80211_vap_attach.9 \ - ieee80211_vap.9 ieee80211_vap_detach.9 + ieee80211_radiotap.9 ieee80211_radiotap_tx.9 \ + ieee80211_radiotap.9 radiotap.9 +MLINKS+=ieee80211_regdomain.9 ieee80211_alloc_countryie.9 \ + ieee80211_regdomain.9 ieee80211_init_channels.9 \ + ieee80211_regdomain.9 ieee80211_sort_channels.9 +MLINKS+=ieee80211_vap.9 ieee80211_vap_attach.9 \ + ieee80211_vap.9 ieee80211_vap_detach.9 \ + ieee80211_vap.9 ieee80211_vap_setup.9 MLINKS+=ifnet.9 ifaddr.9 \ ifnet.9 if_data.9 \ ifnet.9 ifqueue.9 @@ -720,13 +720,13 @@ kobj.9 kobj_delete.9 \ kobj.9 kobj_init.9 MLINKS+=kproc.9 kproc_create.9 \ - kproc.9 kthread_create.9 \ kproc.9 kproc_exit.9 \ kproc.9 kproc_resume.9 \ kproc.9 kproc_shutdown.9 \ kproc.9 kproc_start.9 \ kproc.9 kproc_suspend.9 \ - kproc.9 kproc_suspend_check.9 + kproc.9 kproc_suspend_check.9 \ + kproc.9 kthread_create.9 MLINKS+=kqueue.9 knlist_add.9 \ kqueue.9 knlist_clear.9 \ kqueue.9 knlist_delete.9 \ @@ -1237,23 +1237,7 @@ uidinfo.9 uihashinit.9 \ uidinfo.9 uihold.9 MLINKS+=uio.9 uiomove.9 -MLINKS+=usbdi.9 usb_fifo_alloc_buffer.9 \ - usbdi.9 usb_fifo_attach.9 \ - usbdi.9 usb_fifo_detach.9 \ - usbdi.9 usb_fifo_free_buffer.9 \ - usbdi.9 usb_fifo_get_data.9 \ - usbdi.9 usb_fifo_get_data_buffer.9 \ - usbdi.9 usb_fifo_get_data_error.9 \ - usbdi.9 usb_fifo_get_data_linear.9 \ - usbdi.9 usb_fifo_put_bytes_max.9 \ - usbdi.9 usb_fifo_put_data.9 \ - usbdi.9 usb_fifo_put_data_buffer.9 \ - usbdi.9 usb_fifo_put_data_error.9 \ - usbdi.9 usb_fifo_put_data_linear.9 \ - usbdi.9 usb_fifo_reset.9 \ - usbdi.9 usb_fifo_softc.9 \ - usbdi.9 usb_fifo_wakeup.9 \ - usbdi.9 usbd_do_request.9 \ +MLINKS+=usbdi.9 usbd_do_request.9 \ usbdi.9 usbd_do_request_flags.9 \ usbdi.9 usbd_errstr.9 \ usbdi.9 usbd_lookup_id_by_info.9 \ @@ -1287,8 +1271,23 @@ usbdi.9 usbd_xfer_set_timeout.9 \ usbdi.9 usbd_xfer_softc.9 \ usbdi.9 usbd_xfer_state.9 \ - usbdi.9 usbd_xfer_state.9 \ - usbdi.9 usbd_xfer_status.9 + usbdi.9 usbd_xfer_status.9 \ + usbdi.9 usb_fifo_alloc_buffer.9 \ + usbdi.9 usb_fifo_attach.9 \ + usbdi.9 usb_fifo_detach.9 \ + usbdi.9 usb_fifo_free_buffer.9 \ + usbdi.9 usb_fifo_get_data.9 \ + usbdi.9 usb_fifo_get_data_buffer.9 \ + usbdi.9 usb_fifo_get_data_error.9 \ + usbdi.9 usb_fifo_get_data_linear.9 \ + usbdi.9 usb_fifo_put_bytes_max.9 \ + usbdi.9 usb_fifo_put_data.9 \ + usbdi.9 usb_fifo_put_data_buffer.9 \ + usbdi.9 usb_fifo_put_data_error.9 \ + usbdi.9 usb_fifo_put_data_linear.9 \ + usbdi.9 usb_fifo_reset.9 \ + usbdi.9 usb_fifo_softc.9 \ + usbdi.9 usb_fifo_wakeup.9 MLINKS+=vcount.9 count_dev.9 MLINKS+=vfsconf.9 vfs_modevent.9 \ vfsconf.9 vfs_register.9 \ @@ -1304,8 +1303,8 @@ MLINKS+=VFS_LOCK_GIANT.9 VFS_UNLOCK_GIANT.9 MLINKS+=vgone.9 vgonel.9 MLINKS+=vhold.9 vdrop.9 \ - vhold.9 vholdl.9 \ - vhold.9 vdropl.9 + vhold.9 vdropl.9 \ + vhold.9 vholdl.9 MLINKS+=vm_map_lock.9 vm_map_lock_downgrade.9 \ vm_map_lock.9 vm_map_lock_read.9 \ vm_map_lock.9 vm_map_lock_upgrade.9 \ ==== //depot/projects/smpng/share/man/man9/usbdi.9#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/share/man/man9/usbdi.9,v 1.3 2009/06/24 17:01:17 thompsa Exp $ +.\" $FreeBSD: src/share/man/man9/usbdi.9,v 1.4 2009/12/22 16:05:28 ru Exp $ .Dd June 24, 2009 .Os .Dt USBDI 9 @@ -78,7 +78,6 @@ .Nm usbd_xfer_set_timeout , .Nm usbd_xfer_softc , .Nm usbd_xfer_state , -.Nm usbd_xfer_state , .Nm usbd_xfer_status .Nd Universal Serial Bus driver programming interface .Sh SYNOPSIS ==== //depot/projects/smpng/sys/amd64/conf/NOTES#57 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.98 2009/11/30 11:44:03 avg Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.99 2009/12/18 16:13:21 jhb Exp $ # # @@ -277,7 +277,6 @@ # iwn: Intel Wireless WiFi Link 4965AGN 802.11 network adapters # nfe: nVidia nForce MCP on-board Ethernet Networking (BSD open source) # nve: nVidia nForce MCP on-board Ethernet Networking -# ral: Ralink Technology IEEE 802.11 wireless adapter # wpi: Intel 3945ABG Wireless LAN controller device ed @@ -289,16 +288,8 @@ device ipw device nfe device nve -device ral device wpi -device ath # Atheros pci/cardbus NIC's -device ath_hal # pci/cardbus chip support -options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors -device ath_rate_sample # SampleRate tx rate control for ath -#device ath_rate_amrr # AMRR rate control for ath driver -#device ath_rate_onoe # Onoe rate control for ath driver - # #XXX this stores pointers in a 32bit field that is defined by the hardware #device pst ==== //depot/projects/smpng/sys/boot/i386/Makefile#11 (text+ko) ==== @@ -1,9 +1,15 @@ -# $FreeBSD: src/sys/boot/i386/Makefile,v 1.27 2009/11/23 16:00:16 rnoland Exp $ +# $FreeBSD: src/sys/boot/i386/Makefile,v 1.28 2009/12/22 20:56:33 jhb Exp $ + +.include -SUBDIR= mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot zfsboot \ - gptzfsboot kgzldr libi386 libfirewire loader zfsloader +SUBDIR= mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot kgzldr \ + libi386 libfirewire loader # special boot programs, 'self-extracting boot2+loader' SUBDIR+= pxeldr +.if ${MK_ZFS} != "no" +SUBDIR+= zfsboot gptzfsboot zfsloader +.endif + .include ==== //depot/projects/smpng/sys/boot/i386/libi386/biosdisk.c#24 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biosdisk.c,v 1.62 2009/06/26 09:32:31 rpaulo Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biosdisk.c,v 1.63 2009/12/17 13:14:11 nyan Exp $"); /* * BIOS disk device handling. @@ -1266,11 +1266,11 @@ } if (write) - DEBUG("%d sectors from %lld to %p (0x%x) %s", x, dblk, p, VTOP(p), - result ? "failed" : "ok"); + DEBUG("Write %d sector(s) from %p (0x%x) to %lld %s", x, + p, VTOP(p), dblk, result ? "failed" : "ok"); else - DEBUG("%d sectors from %p (0x%x) to %lld %s", x, p, VTOP(p), dblk, - result ? "failed" : "ok"); + DEBUG("Read %d sector(s) from %lld to %p (0x%x) %s", x, + dblk, p, VTOP(p), result ? "failed" : "ok"); if (result) { return(-1); } ==== //depot/projects/smpng/sys/boot/pc98/kgzldr/crt.s#5 (text+ko) ==== @@ -24,7 +24,7 @@ # EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # # From: btx.s 1.10 1999/02/25 16:27:41 rnordier -# $FreeBSD: src/sys/boot/pc98/kgzldr/crt.s,v 1.5 2005/05/08 14:17:28 nyan Exp $ +# $FreeBSD: src/sys/boot/pc98/kgzldr/crt.s,v 1.6 2009/12/21 14:59:23 nyan Exp $ # # Screen defaults and assumptions. @@ -75,5 +75,15 @@ stosw # line movw $(SCR_ROW-1)*SCR_COL*2,%dx crt_putchr.4: movw %dx,(%ebx) # Update position + shrw $1,%dx +crt_putchr.5: inb $0x60,%al # Move cursor + testb $0x04,%al + jz crt_putchr.5 + movb $0x49,%al + outb %al,$0x62 + movb %dl,%al + outb %al,$0x60 + movb %dh,%al + outb %al,$0x60 popa # Restore ret # To caller ==== //depot/projects/smpng/sys/boot/pc98/libpc98/biosdisk.c#17 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/pc98/libpc98/biosdisk.c,v 1.41 2009/03/20 05:33:58 nyan Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/pc98/libpc98/biosdisk.c,v 1.42 2009/12/17 13:14:11 nyan Exp $"); /* * BIOS disk device handling. @@ -906,11 +906,11 @@ } if (write) - DEBUG("%d sectors from %lld to %p (0x%x) %s", x, dblk, p, VTOP(p), - result ? "failed" : "ok"); + DEBUG("Write %d sector(s) from %p (0x%x) to %lld %s", x, + p, VTOP(p), dblk, result ? "failed" : "ok"); else - DEBUG("%d sectors from %p (0x%x) to %lld %s", x, p, VTOP(p), dblk, - result ? "failed" : "ok"); + DEBUG("Read %d sector(s) from %lld to %p (0x%x) %s", x, + dblk, p, VTOP(p), result ? "failed" : "ok"); if (result) { return(-1); } ==== //depot/projects/smpng/sys/boot/uboot/lib/glue.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/uboot/lib/glue.c,v 1.10 2009/11/11 19:39:45 antoine Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/uboot/lib/glue.c,v 1.11 2009/12/18 21:12:37 marcel Exp $"); #include #include "api_public.h" @@ -568,17 +568,16 @@ const char *env, *str; int i; - env = NULL; - /* * It's OK to pass only the name piece as last (and not the whole * 'name=val' string), since the API_ENUM_ENV call uses envmatch() * internally, which handles such case */ - if (!syscall(API_ENV_ENUM, NULL, (uint32_t)last, (uint32_t)&env)) + env = NULL; + if (syscall(API_ENV_ENUM, NULL, (uint32_t)last, (uint32_t)&env) != 0) return (NULL); - if (!env) + if (env == NULL) /* no more env. variables to enumerate */ return (NULL); ==== //depot/projects/smpng/sys/cam/scsi/scsi_cd.c#41 (text+ko) ==== @@ -46,7 +46,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.115 2009/12/09 14:21:21 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.116 2009/12/18 14:41:30 mav Exp $"); #include "opt_cd.h" @@ -1464,8 +1464,6 @@ } else { bioq_remove(&softc->bio_queue, bp); - devstat_start_transaction_bio(softc->disk->d_devstat, bp); - scsi_read_write(&start_ccb->csio, /*retries*/cd_retry_count, /* cbfcnp */ cddone, ==== //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#3 (text+ko) ==== @@ -19,12 +19,10 @@ * CDDL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include #include #include @@ -108,19 +106,51 @@ int dmu_object_reclaim(objset_t *os, uint64_t object, dmu_object_type_t ot, - int blocksize, dmu_object_type_t bonustype, int bonuslen, dmu_tx_t *tx) + int blocksize, dmu_object_type_t bonustype, int bonuslen) { dnode_t *dn; + dmu_tx_t *tx; + int nblkptr; int err; - if (object == DMU_META_DNODE_OBJECT && !dmu_tx_private_ok(tx)) + if (object == DMU_META_DNODE_OBJECT) return (EBADF); err = dnode_hold_impl(os->os, object, DNODE_MUST_BE_ALLOCATED, FTAG, &dn); if (err) return (err); + + if (dn->dn_type == ot && dn->dn_datablksz == blocksize && + dn->dn_bonustype == bonustype && dn->dn_bonuslen == bonuslen) { + /* nothing is changing, this is a noop */ + dnode_rele(dn, FTAG); + return (0); + } + + tx = dmu_tx_create(os); + dmu_tx_hold_bonus(tx, object); + err = dmu_tx_assign(tx, TXG_WAIT); + if (err) { + dmu_tx_abort(tx); + dnode_rele(dn, FTAG); + return (err); + } + + nblkptr = 1 + ((DN_MAX_BONUSLEN - bonuslen) >> SPA_BLKPTRSHIFT); + + /* + * If we are losing blkptrs or changing the block size this must + * be a new file instance. We must clear out the previous file + * contents before we can change this type of metadata in the dnode. + */ + if (dn->dn_nblkptr > nblkptr || dn->dn_datablksz != blocksize) + dmu_free_long_range(os, object, 0, DMU_OBJECT_END); + dnode_reallocate(dn, ot, blocksize, bonustype, bonuslen, tx); + + dmu_tx_commit(tx); + dnode_rele(dn, FTAG); return (0); ==== //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#4 (text+ko) ==== @@ -828,12 +828,8 @@ { int err; dmu_tx_t *tx; - - err = dmu_object_info(os, drro->drr_object, NULL); + void *data = NULL; - if (err != 0 && err != ENOENT) - return (EINVAL); - if (drro->drr_type == DMU_OT_NONE || drro->drr_type >= DMU_OT_NUMTYPES || drro->drr_bonustype >= DMU_OT_NUMTYPES || @@ -846,12 +842,15 @@ return (EINVAL); } - tx = dmu_tx_create(os); + err = dmu_object_info(os, drro->drr_object, NULL); + + if (err != 0 && err != ENOENT) + return (EINVAL); if (err == ENOENT) { /* currently free, want to be allocated */ + tx = dmu_tx_create(os); dmu_tx_hold_bonus(tx, DMU_NEW_OBJECT); - dmu_tx_hold_write(tx, DMU_NEW_OBJECT, 0, 1); err = dmu_tx_assign(tx, TXG_WAIT); if (err) { dmu_tx_abort(tx); @@ -860,45 +859,41 @@ err = dmu_object_claim(os, drro->drr_object, drro->drr_type, drro->drr_blksz, drro->drr_bonustype, drro->drr_bonuslen, tx); + dmu_tx_commit(tx); } else { /* currently allocated, want to be allocated */ - dmu_tx_hold_bonus(tx, drro->drr_object); - /* - * We may change blocksize and delete old content, - * so need to hold_write and hold_free. - */ - dmu_tx_hold_write(tx, drro->drr_object, 0, 1); - dmu_tx_hold_free(tx, drro->drr_object, 0, DMU_OBJECT_END); - err = dmu_tx_assign(tx, TXG_WAIT); - if (err) { - dmu_tx_abort(tx); - return (err); - } err = dmu_object_reclaim(os, drro->drr_object, drro->drr_type, drro->drr_blksz, - drro->drr_bonustype, drro->drr_bonuslen, tx); + drro->drr_bonustype, drro->drr_bonuslen); + } + if (err) + return (EINVAL); + + if (drro->drr_bonuslen) { + data = restore_read(ra, P2ROUNDUP(drro->drr_bonuslen, 8)); + if (ra->err) + return (ra->err); } + + tx = dmu_tx_create(os); + dmu_tx_hold_bonus(tx, drro->drr_object); + err = dmu_tx_assign(tx, TXG_WAIT); if (err) { - dmu_tx_commit(tx); - return (EINVAL); + dmu_tx_abort(tx); + return (err); } dmu_object_set_checksum(os, drro->drr_object, drro->drr_checksum, tx); dmu_object_set_compress(os, drro->drr_object, drro->drr_compress, tx); - if (drro->drr_bonuslen) { + if (data != NULL) { dmu_buf_t *db; - void *data; + VERIFY(0 == dmu_bonus_hold(os, drro->drr_object, FTAG, &db)); dmu_buf_will_dirty(db, tx); ASSERT3U(db->db_size, >=, drro->drr_bonuslen); - data = restore_read(ra, P2ROUNDUP(drro->drr_bonuslen, 8)); - if (data == NULL) { - dmu_tx_commit(tx); - return (ra->err); - } bcopy(data, db->db_data, drro->drr_bonuslen); if (ra->byteswap) { dmu_ot[drro->drr_bonustype].ot_byteswap(db->db_data, ==== //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#4 (text+ko) ==== @@ -415,8 +415,7 @@ dnode_reallocate(dnode_t *dn, dmu_object_type_t ot, int blocksize, dmu_object_type_t bonustype, int bonuslen, dmu_tx_t *tx) { - int i, nblkptr; - dmu_buf_impl_t *db = NULL; + int nblkptr; ASSERT3U(blocksize, >=, SPA_MINBLOCKSIZE); ASSERT3U(blocksize, <=, SPA_MAXBLOCKSIZE); @@ -428,42 +427,25 @@ ASSERT3U(bonustype, <, DMU_OT_NUMTYPES); ASSERT3U(bonuslen, <=, DN_MAX_BONUSLEN); - for (i = 0; i < TXG_SIZE; i++) - ASSERT(!list_link_active(&dn->dn_dirty_link[i])); - /* clean up any unreferenced dbufs */ dnode_evict_dbufs(dn); - ASSERT3P(list_head(&dn->dn_dbufs), ==, NULL); - /* - * XXX I should really have a generation number to tell if we - * need to do this... - */ - if (blocksize != dn->dn_datablksz || - dn->dn_bonustype != bonustype || dn->dn_bonuslen != bonuslen) { - /* free all old data */ - dnode_free_range(dn, 0, -1ULL, tx); + rw_enter(&dn->dn_struct_rwlock, RW_WRITER); + dnode_setdirty(dn, tx); + if (dn->dn_datablksz != blocksize) { + /* change blocksize */ + ASSERT(dn->dn_maxblkid == 0 && + (BP_IS_HOLE(&dn->dn_phys->dn_blkptr[0]) || + dnode_block_freed(dn, 0))); + dnode_setdblksz(dn, blocksize); + dn->dn_next_blksz[tx->tx_txg&TXG_MASK] = blocksize; } - + if (dn->dn_bonuslen != bonuslen) + dn->dn_next_bonuslen[tx->tx_txg&TXG_MASK] = bonuslen; nblkptr = 1 + ((DN_MAX_BONUSLEN - bonuslen) >> SPA_BLKPTRSHIFT); - - /* change blocksize */ - rw_enter(&dn->dn_struct_rwlock, RW_WRITER); - if (blocksize != dn->dn_datablksz && - (!BP_IS_HOLE(&dn->dn_phys->dn_blkptr[0]) || - list_head(&dn->dn_dbufs) != NULL)) { - db = dbuf_hold(dn, 0, FTAG); - dbuf_new_size(db, blocksize, tx); - } - dnode_setdblksz(dn, blocksize); - dnode_setdirty(dn, tx); - dn->dn_next_bonuslen[tx->tx_txg&TXG_MASK] = bonuslen; - dn->dn_next_blksz[tx->tx_txg&TXG_MASK] = blocksize; if (dn->dn_nblkptr != nblkptr) dn->dn_next_nblkptr[tx->tx_txg&TXG_MASK] = nblkptr; rw_exit(&dn->dn_struct_rwlock); - if (db) - dbuf_rele(db, FTAG); /* change type */ dn->dn_type = ot; @@ -1187,11 +1169,6 @@ if (dn->dn_free_txg) return (TRUE); - /* - * If dn_datablkshift is not set, then there's only a single - * block, in which case there will never be a free range so it - * won't matter. - */ range_tofind.fr_blkid = blkid; mutex_enter(&dn->dn_mtx); for (i = 0; i < TXG_SIZE; i++) { ==== //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#5 (text+ko) ==== @@ -19,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -237,7 +237,7 @@ int dmu_object_claim(objset_t *os, uint64_t object, dmu_object_type_t ot, int blocksize, dmu_object_type_t bonus_type, int bonus_len, dmu_tx_t *tx); int dmu_object_reclaim(objset_t *os, uint64_t object, dmu_object_type_t ot, - int blocksize, dmu_object_type_t bonustype, int bonuslen, dmu_tx_t *tx); + int blocksize, dmu_object_type_t bonustype, int bonuslen); /* * Free an object from this objset. ==== //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#3 (text+ko) ==== @@ -19,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -56,10 +56,16 @@ uint64_t zh_replay_seq; /* highest replayed sequence number */ blkptr_t zh_log; /* log chain */ uint64_t zh_claim_seq; /* highest claimed sequence number */ - uint64_t zh_pad[5]; + uint64_t zh_flags; /* header flags */ + uint64_t zh_pad[4]; } zil_header_t; /* + * zh_flags bit settings + */ +#define ZIL_REPLAY_NEEDED 0x1 /* replay needed - internal only */ + +/* * Log block trailer - structure at the end of the header and each log block * * The zit_bt contains a zbt_cksum which for the intent log is ==== //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#4 (text+ko) ==== @@ -502,6 +502,25 @@ tx, zh->zh_claim_txg); } +/* + * return true if the initial log block is not valid + */ +static boolean_t +zil_empty(zilog_t *zilog) +{ + const zil_header_t *zh = zilog->zl_header; + arc_buf_t *abuf = NULL; + + if (BP_IS_HOLE(&zh->zh_log)) + return (B_TRUE); + + if (zil_read_log_block(zilog, &zh->zh_log, &abuf) != 0) + return (B_TRUE); + + VERIFY(arc_buf_remove_ref(abuf, &abuf) == 1); + return (B_FALSE); +} + int zil_claim(char *osname, void *txarg) { @@ -522,6 +541,21 @@ zh = zil_header_in_syncing_context(zilog); /* + * Record here whether the zil has any records to replay. + * If the header block pointer is null or the block points + * to the stubby then we know there are no valid log records. + * We use the header to store this state as the the zilog gets + * freed later in dmu_objset_close(). + * The flags (and the rest of the header fields) are cleared in + * zil_sync() as a result of a zil_destroy(), after replaying the log. + * + * Note, the intent log can be empty but still need the + * stubby to be claimed. + */ + if (!zil_empty(zilog)) + zh->zh_flags |= ZIL_REPLAY_NEEDED; + + /* * Claim all log blocks if we haven't already done so, and remember * the highest claimed sequence number. This ensures that if we can * read only part of the log now (e.g. due to a missing device), @@ -1345,25 +1379,6 @@ } /* - * return true if the initial log block is not valid - */ -static boolean_t -zil_empty(zilog_t *zilog) -{ - const zil_header_t *zh = zilog->zl_header; - arc_buf_t *abuf = NULL; - - if (BP_IS_HOLE(&zh->zh_log)) - return (B_TRUE); - - if (zil_read_log_block(zilog, &zh->zh_log, &abuf) != 0) - return (B_TRUE); - - VERIFY(arc_buf_remove_ref(abuf, &abuf) == 1); - return (B_FALSE); -} - -/* * Open an intent log. */ zilog_t * @@ -1418,7 +1433,7 @@ const zil_header_t *zh = zilog->zl_header; mutex_enter(&zilog->zl_lock); - if (zh->zh_claim_txg != 0) { /* unplayed log */ + if (zh->zh_flags & ZIL_REPLAY_NEEDED) { /* unplayed log */ mutex_exit(&zilog->zl_lock); return (EBUSY); } @@ -1645,7 +1660,7 @@ const zil_header_t *zh = zilog->zl_header; zil_replay_arg_t zr; - if (zil_empty(zilog)) { + if ((zh->zh_flags & ZIL_REPLAY_NEEDED) == 0) { zil_destroy(zilog, B_TRUE); return; } ==== //depot/projects/smpng/sys/compat/linux/linux_signal.c#27 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_signal.c,v 1.67 2009/06/27 13:58:44 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_signal.c,v 1.68 2009/12/18 14:27:18 kib Exp $"); #include #include @@ -565,7 +565,7 @@ AUDIT_ARG_PROCESS(p); error = p_cansignal(td, p, signum); - if (error) + if (error != 0 || signum == 0) goto out; error = ESRCH; ==== //depot/projects/smpng/sys/conf/NOTES#180 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/NOTES,v 1.1567 2009/12/16 16:24:32 jhb Exp $ +# $FreeBSD: src/sys/conf/NOTES,v 1.1568 2009/12/18 16:13:21 jhb Exp $ # # NOTES -- Lines that can be cut/pasted into kernel and hints configs. # @@ -1862,6 +1862,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Dec 23 15:56:03 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2A5DC1065679; Wed, 23 Dec 2009 15:56:03 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E3E4D106566C for ; Wed, 23 Dec 2009 15:56:02 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D02BB8FC19 for ; Wed, 23 Dec 2009 15:56:02 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nBNFu2ZK024941 for ; Wed, 23 Dec 2009 15:56:02 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nBNFu2Uo024939 for perforce@freebsd.org; Wed, 23 Dec 2009 15:56:02 GMT (envelope-from jhb@freebsd.org) Date: Wed, 23 Dec 2009 15:56:02 GMT Message-Id: <200912231556.nBNFu2Uo024939@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 172143 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Dec 2009 15:56:03 -0000 http://p4web.freebsd.org/chv.cgi?CH=172143 Change 172143 by jhb@jhb_jhbbsd on 2009/12/23 15:55:53 IFC @172139 Affected files ... .. //depot/projects/multipass/share/man/man9/Makefile#3 integrate .. //depot/projects/multipass/share/man/man9/usbdi.9#2 integrate .. //depot/projects/multipass/sys/amd64/conf/NOTES#7 integrate .. //depot/projects/multipass/sys/boot/i386/Makefile#4 integrate .. //depot/projects/multipass/sys/boot/i386/libi386/biosdisk.c#5 integrate .. //depot/projects/multipass/sys/boot/pc98/kgzldr/crt.s#2 integrate .. //depot/projects/multipass/sys/boot/pc98/libpc98/biosdisk.c#3 integrate .. //depot/projects/multipass/sys/boot/uboot/lib/glue.c#4 integrate .. //depot/projects/multipass/sys/cam/scsi/scsi_cd.c#6 integrate .. //depot/projects/multipass/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#2 integrate .. //depot/projects/multipass/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#3 integrate .. //depot/projects/multipass/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#3 integrate .. //depot/projects/multipass/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#3 integrate .. //depot/projects/multipass/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#2 integrate .. //depot/projects/multipass/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#3 integrate .. //depot/projects/multipass/sys/compat/freebsd32/freebsd32_proto.h#9 integrate .. //depot/projects/multipass/sys/compat/linux/linux_signal.c#3 integrate .. //depot/projects/multipass/sys/conf/NOTES#11 integrate .. //depot/projects/multipass/sys/dev/agp/agp_via.c#3 integrate .. //depot/projects/multipass/sys/dev/ahci/ahci.c#4 integrate .. //depot/projects/multipass/sys/dev/ata/ata-pci.h#8 integrate .. //depot/projects/multipass/sys/dev/ata/chipsets/ata-amd.c#4 integrate .. //depot/projects/multipass/sys/dev/ata/chipsets/ata-intel.c#6 integrate .. //depot/projects/multipass/sys/dev/ata/chipsets/ata-ite.c#4 integrate .. //depot/projects/multipass/sys/dev/ata/chipsets/ata-serverworks.c#5 integrate .. //depot/projects/multipass/sys/dev/ata/chipsets/ata-via.c#6 integrate .. //depot/projects/multipass/sys/dev/atkbdc/psm.c#4 integrate .. //depot/projects/multipass/sys/dev/auxio/auxio.c#2 integrate .. //depot/projects/multipass/sys/dev/ciss/ciss.c#8 integrate .. //depot/projects/multipass/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#4 integrate .. //depot/projects/multipass/sys/dev/e1000/if_igb.c#9 integrate .. //depot/projects/multipass/sys/dev/hwpmc/hwpmc_intel.c#3 integrate .. //depot/projects/multipass/sys/dev/if_ndis/if_ndis_usb.c#7 integrate .. //depot/projects/multipass/sys/dev/ipmi/ipmi.c#2 integrate .. //depot/projects/multipass/sys/dev/ips/ips_pci.c#3 integrate .. //depot/projects/multipass/sys/dev/mii/ip1000phy.c#3 integrate .. //depot/projects/multipass/sys/dev/mxge/if_mxge.c#9 integrate .. //depot/projects/multipass/sys/dev/sound/usb/uaudio.c#9 integrate .. //depot/projects/multipass/sys/dev/ste/if_ste.c#5 integrate .. //depot/projects/multipass/sys/dev/ste/if_stereg.h#3 integrate .. //depot/projects/multipass/sys/dev/uart/uart_bus_acpi.c#2 integrate .. //depot/projects/multipass/sys/dev/usb/controller/ehci_pci.c#6 integrate .. //depot/projects/multipass/sys/dev/usb/controller/ohci_pci.c#5 integrate .. //depot/projects/multipass/sys/dev/usb/quirk/usb_quirk.c#6 integrate .. //depot/projects/multipass/sys/dev/usb/quirk/usb_quirk.h#4 integrate .. //depot/projects/multipass/sys/dev/usb/serial/u3g.c#8 integrate .. //depot/projects/multipass/sys/dev/usb/serial/uftdi.c#7 integrate .. //depot/projects/multipass/sys/dev/usb/storage/umass.c#8 integrate .. //depot/projects/multipass/sys/dev/usb/usb_device.c#9 integrate .. //depot/projects/multipass/sys/dev/usb/usb_dynamic.c#5 integrate .. //depot/projects/multipass/sys/dev/usb/usb_dynamic.h#5 integrate .. //depot/projects/multipass/sys/dev/usb/usbdevs#9 integrate .. //depot/projects/multipass/sys/dev/usb/usbdi.h#7 integrate .. //depot/projects/multipass/sys/dev/vge/if_vge.c#7 integrate .. //depot/projects/multipass/sys/dev/vge/if_vgereg.h#3 integrate .. //depot/projects/multipass/sys/dev/vge/if_vgevar.h#3 integrate .. //depot/projects/multipass/sys/fs/devfs/devfs_vnops.c#7 integrate .. //depot/projects/multipass/sys/geom/raid3/g_raid3.c#3 integrate .. //depot/projects/multipass/sys/geom/raid3/g_raid3.h#2 integrate .. //depot/projects/multipass/sys/i386/conf/NOTES#8 integrate .. //depot/projects/multipass/sys/ia64/ia64/clock.c#3 integrate .. //depot/projects/multipass/sys/ia64/ia64/machdep.c#6 integrate .. //depot/projects/multipass/sys/ia64/include/clock.h#2 integrate .. //depot/projects/multipass/sys/ia64/include/mca.h#3 integrate .. //depot/projects/multipass/sys/ia64/include/md_var.h#4 integrate .. //depot/projects/multipass/sys/kern/kern_exit.c#9 integrate .. //depot/projects/multipass/sys/kern/kern_proc.c#7 integrate .. //depot/projects/multipass/sys/kern/subr_acl_nfs4.c#3 integrate .. //depot/projects/multipass/sys/kern/subr_eventhandler.c#2 integrate .. //depot/projects/multipass/sys/kern/subr_turnstile.c#2 integrate .. //depot/projects/multipass/sys/kern/tty_pts.c#8 integrate .. //depot/projects/multipass/sys/kern/uipc_syscalls.c#9 integrate .. //depot/projects/multipass/sys/kern/vfs_subr.c#9 integrate .. //depot/projects/multipass/sys/modules/ipfw/Makefile#5 integrate .. //depot/projects/multipass/sys/net/if_bridge.c#10 integrate .. //depot/projects/multipass/sys/net/if_ethersubr.c#10 integrate .. //depot/projects/multipass/sys/net/if_var.h#11 integrate .. //depot/projects/multipass/sys/net/netisr.c#7 integrate .. //depot/projects/multipass/sys/netgraph/ng_ipfw.c#5 integrate .. //depot/projects/multipass/sys/netgraph/ng_ipfw.h#3 integrate .. //depot/projects/multipass/sys/netinet/ip_dummynet.h#6 integrate .. //depot/projects/multipass/sys/netinet/ip_fw.h#9 integrate .. //depot/projects/multipass/sys/netinet/ipfw/ip_dummynet.c#6 integrate .. //depot/projects/multipass/sys/netinet/ipfw/ip_fw2.c#8 integrate .. //depot/projects/multipass/sys/netinet/ipfw/ip_fw_log.c#2 integrate .. //depot/projects/multipass/sys/netinet/ipfw/ip_fw_nat.c#6 integrate .. //depot/projects/multipass/sys/netinet/ipfw/ip_fw_pfil.c#6 integrate .. //depot/projects/multipass/sys/netinet/ipfw/ip_fw_private.h#2 integrate .. //depot/projects/multipass/sys/netinet/ipfw/ip_fw_sockopt.c#2 integrate .. //depot/projects/multipass/sys/netinet/ipfw/ip_fw_table.c#2 integrate .. //depot/projects/multipass/sys/netinet/tcp.h#2 integrate .. //depot/projects/multipass/sys/netinet/tcp_usrreq.c#6 integrate .. //depot/projects/multipass/sys/netinet6/mld6.c#9 integrate .. //depot/projects/multipass/sys/netinet6/mld6_var.h#3 integrate .. //depot/projects/multipass/sys/pc98/conf/NOTES#6 integrate .. //depot/projects/multipass/sys/powerpc/booke/clock.c#4 integrate .. //depot/projects/multipass/sys/sparc64/central/central.c#3 integrate .. //depot/projects/multipass/sys/sparc64/ebus/ebus.c#3 integrate .. //depot/projects/multipass/sys/sparc64/fhc/fhc.c#3 integrate .. //depot/projects/multipass/sys/sparc64/include/bus_common.h#2 integrate .. //depot/projects/multipass/sys/sparc64/isa/ofw_isa.c#3 integrate .. //depot/projects/multipass/sys/sparc64/pci/apb.c#3 integrate .. //depot/projects/multipass/sys/sparc64/pci/ofw_pcib.c#3 integrate .. //depot/projects/multipass/sys/sparc64/pci/ofw_pcibus.c#3 integrate .. //depot/projects/multipass/sys/sparc64/sbus/dma_sbus.c#3 integrate .. //depot/projects/multipass/sys/sparc64/sbus/sbus.c#3 integrate .. //depot/projects/multipass/sys/sparc64/sparc64/identcpu.c#2 integrate .. //depot/projects/multipass/sys/sparc64/sparc64/nexus.c#3 integrate .. //depot/projects/multipass/sys/sparc64/sparc64/upa.c#3 integrate .. //depot/projects/multipass/sys/sys/acl.h#5 integrate .. //depot/projects/multipass/sys/sys/mount.h#7 integrate .. //depot/projects/multipass/sys/sys/proc.h#9 integrate .. //depot/projects/multipass/sys/sys/sysproto.h#7 integrate .. //depot/projects/multipass/sys/sys/vnode.h#7 integrate .. //depot/projects/multipass/sys/ufs/ffs/ffs_rawread.c#2 integrate .. //depot/projects/multipass/sys/ufs/ffs/ffs_vfsops.c#6 integrate .. //depot/projects/multipass/sys/ufs/ffs/fs.h#2 integrate .. //depot/projects/multipass/sys/ufs/ufs/acl.h#2 integrate .. //depot/projects/multipass/sys/ufs/ufs/ufs_acl.c#4 integrate .. //depot/projects/multipass/sys/ufs/ufs/ufs_lookup.c#5 integrate .. //depot/projects/multipass/sys/ufs/ufs/ufs_vnops.c#8 integrate .. //depot/projects/multipass/sys/vm/vm_object.c#8 integrate .. //depot/projects/multipass/sys/vm/vm_object.h#6 integrate Differences ... ==== //depot/projects/multipass/share/man/man9/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/man/man9/Makefile,v 1.364 2009/10/27 14:37:25 emaste Exp $ +# $FreeBSD: src/share/man/man9/Makefile,v 1.366 2009/12/22 16:05:28 ru Exp $ MAN= accept_filter.9 \ accf_data.9 \ @@ -394,14 +394,14 @@ atomic.9 atomic_set.9 \ atomic.9 atomic_store.9 \ atomic.9 atomic_subtract.9 -MLINKS+=bpf.9 bpf_filter.9 \ +MLINKS+=bpf.9 bpfattach.9 \ + bpf.9 bpfattach2.9 \ + bpf.9 bpfdetach.9 \ + bpf.9 bpf_filter.9 \ bpf.9 bpf_mtap.9 \ bpf.9 bpf_mtap2.9 \ bpf.9 bpf_tap.9 \ - bpf.9 bpf_validate.9 \ - bpf.9 bpfattach.9 \ - bpf.9 bpfattach2.9 \ - bpf.9 bpfdetach.9 + bpf.9 bpf_validate.9 MLINKS+=buf.9 bp.9 MLINKS+=bus_activate_resource.9 bus_deactivate_resource.9 MLINKS+=bus_alloc_resource.9 bus_alloc_resource_any.9 @@ -563,11 +563,11 @@ crypto.9 crypto_unblock.9 \ crypto.9 crypto_unregister.9 \ crypto.9 crypto_unregister_all.9 -MLINKS+=DB_COMMAND.9 DB_SHOW_COMMAND.9 \ - DB_COMMAND.9 DB_SHOW_ALL_COMMAND.9 +MLINKS+=DB_COMMAND.9 DB_SHOW_ALL_COMMAND.9 \ + DB_COMMAND.9 DB_SHOW_COMMAND.9 MLINKS+=dev_clone.9 drain_dev_clone_events.9 -MLINKS+=devfs_set_cdevpriv.9 devfs_get_cdevpriv.9 \ - devfs_set_cdevpriv.9 devfs_clear_cdevpriv.9 +MLINKS+=devfs_set_cdevpriv.9 devfs_clear_cdevpriv.9 \ + devfs_set_cdevpriv.9 devfs_get_cdevpriv.9 MLINKS+=device_add_child.9 device_add_child_ordered.9 MLINKS+=device_enable.9 device_disable.9 \ device_enable.9 device_is_enabled.9 @@ -591,8 +591,8 @@ devstat.9 devstat_start_transaction.9 MLINKS+=disk.9 disk_alloc.9 \ disk.9 disk_create.9 \ - disk.9 disk_gone.9 \ - disk.9 disk_destroy.9 + disk.9 disk_destroy.9 \ + disk.9 disk_gone.9 MLINKS+=domain.9 DOMAIN_SET.9 \ domain.9 net_add_domain.9 \ domain.9 pfctlinput.9 \ @@ -642,60 +642,60 @@ hashinit.9 phashinit.9 MLINKS+=ieee80211.9 ieee80211_ifattach.9 \ ieee80211.9 ieee80211_ifdetach.9 -MLINKS+=ieee80211_amrr.9 ieee80211_amrr_init.9 \ - ieee80211_amrr.9 ieee80211_amrr_cleanup.9 \ +MLINKS+=ieee80211_amrr.9 ieee80211_amrr_cleanup.9 \ + ieee80211_amrr.9 ieee80211_amrr_init.9 \ + ieee80211_amrr.9 ieee80211_amrr_node_init.9 \ ieee80211_amrr.9 ieee80211_amrr_setinterval.9 \ - ieee80211_amrr.9 ieee80211_amrr_node_init.9 \ ieee80211_amrr.9 ieee80211_amrr_tx_complete.9 \ ieee80211_amrr.9 ieee80211_amrr_tx_update.9 MLINKS+=ieee80211_beacon.9 ieee80211_beacon_alloc.9 \ - ieee80211_beacon.9 ieee80211_beacon_update.9 \ - ieee80211_beacon.9 ieee80211_beacon_notify.9 + ieee80211_beacon.9 ieee80211_beacon_notify.9 \ + ieee80211_beacon.9 ieee80211_beacon_update.9 MLINKS+=ieee80211_bmiss.9 ieee80211_beacon_miss.9 -MLINKS+=ieee80211_crypto.9 ieee80211_key_update_begin.9 \ - ieee80211_crypto.9 ieee80211_key_update_end.9 \ - ieee80211_crypto.9 ieee80211_crypto_newkey.9 \ - ieee80211_crypto.9 ieee80211_crypto_setkey.9 \ +MLINKS+=ieee80211_crypto.9 ieee80211_crypto_available.9 \ + ieee80211_crypto.9 ieee80211_crypto_decap.9 \ ieee80211_crypto.9 ieee80211_crypto_delglobalkeys.9 \ - ieee80211_crypto.9 ieee80211_crypto_reload_keys.9 \ - ieee80211_crypto.9 ieee80211_crypto_decap.9 \ + ieee80211_crypto.9 ieee80211_crypto_demic.9 \ ieee80211_crypto.9 ieee80211_crypto_encap.9 \ - ieee80211_crypto.9 ieee80211_crypto_demic.9 \ ieee80211_crypto.9 ieee80211_crypto_enmic.9 \ - ieee80211_crypto.9 ieee80211_notify_michael_failure.9 \ - ieee80211_crypto.9 ieee80211_notify_replay_failure.9 \ + ieee80211_crypto.9 ieee80211_crypto_newkey.9 \ ieee80211_crypto.9 ieee80211_crypto_register.9 \ + ieee80211_crypto.9 ieee80211_crypto_reload_keys.9 \ + ieee80211_crypto.9 ieee80211_crypto_setkey.9 \ ieee80211_crypto.9 ieee80211_crypto_unregister.9 \ - ieee80211_crypto.9 ieee80211_crypto_available.9 + ieee80211_crypto.9 ieee80211_key_update_begin.9 \ + ieee80211_crypto.9 ieee80211_key_update_end.9 \ + ieee80211_crypto.9 ieee80211_notify_michael_failure.9 \ + ieee80211_crypto.9 ieee80211_notify_replay_failure.9 MLINKS+=ieee80211_input.9 ieee80211_input_all.9 -MLINKS+=ieee80211_node.9 ieee80211_find_rxnode.9 \ +MLINKS+=ieee80211_node.9 ieee80211_dump_node.9 \ + ieee80211_node.9 ieee80211_dump_nodes.9 \ + ieee80211_node.9 ieee80211_find_rxnode.9 \ ieee80211_node.9 ieee80211_find_rxnode_withkey.9 \ - ieee80211_node.9 ieee80211_ref_node.9 \ - ieee80211_node.9 ieee80211_unref_node.9 \ ieee80211_node.9 ieee80211_free_node.9 \ ieee80211_node.9 ieee80211_iterate_nodes.9 \ - ieee80211_node.9 ieee80211_dump_node.9 \ - ieee80211_node.9 ieee80211_dump_nodes.9 -MLINKS+=ieee80211_output.9 M_WME_GETAC.9 \ + ieee80211_node.9 ieee80211_ref_node.9 \ + ieee80211_node.9 ieee80211_unref_node.9 +MLINKS+=ieee80211_output.9 ieee80211_process_callback.9 \ ieee80211_output.9 M_SEQNO_GET.9 \ - ieee80211_output.9 ieee80211_process_callback.9 + ieee80211_output.9 M_WME_GETAC.9 MLINKS+=ieee80211_proto.9 ieee80211_new_state.9 \ + ieee80211_proto.9 ieee80211_resume_all.9 \ ieee80211_proto.9 ieee80211_start_all.9 \ ieee80211_proto.9 ieee80211_stop_all.9 \ ieee80211_proto.9 ieee80211_suspend_all.9 \ - ieee80211_proto.9 ieee80211_resume_all.9 \ ieee80211_proto.9 ieee80211_waitfor_parent.9 -MLINKS+=ieee80211_radiotap.9 radiotap.9 \ +MLINKS+=ieee80211_radiotap.9 ieee80211_radiotap_active.9 \ + ieee80211_radiotap.9 ieee80211_radiotap_active_vap.9 \ ieee80211_radiotap.9 ieee80211_radiotap_attach.9 \ - ieee80211_radiotap.9 ieee80211_radiotap_active_vap.9 \ - ieee80211_radiotap.9 ieee80211_radiotap_active.9 \ - ieee80211_radiotap.9 ieee80211_radiotap_tx.9 -MLINKS+=ieee80211_regdomain.9 ieee80211_init_channels.9 \ - ieee80211_regdomain.9 ieee80211_sort_channels.9 \ - ieee80211_regdomain.9 ieee80211_alloc_countryie.9 -MLINKS+=ieee80211_vap.9 ieee80211_vap_setup.9 \ - ieee80211_vap.9 ieee80211_vap_attach.9 \ - ieee80211_vap.9 ieee80211_vap_detach.9 + ieee80211_radiotap.9 ieee80211_radiotap_tx.9 \ + ieee80211_radiotap.9 radiotap.9 +MLINKS+=ieee80211_regdomain.9 ieee80211_alloc_countryie.9 \ + ieee80211_regdomain.9 ieee80211_init_channels.9 \ + ieee80211_regdomain.9 ieee80211_sort_channels.9 +MLINKS+=ieee80211_vap.9 ieee80211_vap_attach.9 \ + ieee80211_vap.9 ieee80211_vap_detach.9 \ + ieee80211_vap.9 ieee80211_vap_setup.9 MLINKS+=ifnet.9 ifaddr.9 \ ifnet.9 if_data.9 \ ifnet.9 ifqueue.9 @@ -720,13 +720,13 @@ kobj.9 kobj_delete.9 \ kobj.9 kobj_init.9 MLINKS+=kproc.9 kproc_create.9 \ - kproc.9 kthread_create.9 \ kproc.9 kproc_exit.9 \ kproc.9 kproc_resume.9 \ kproc.9 kproc_shutdown.9 \ kproc.9 kproc_start.9 \ kproc.9 kproc_suspend.9 \ - kproc.9 kproc_suspend_check.9 + kproc.9 kproc_suspend_check.9 \ + kproc.9 kthread_create.9 MLINKS+=kqueue.9 knlist_add.9 \ kqueue.9 knlist_clear.9 \ kqueue.9 knlist_delete.9 \ @@ -1237,23 +1237,7 @@ uidinfo.9 uihashinit.9 \ uidinfo.9 uihold.9 MLINKS+=uio.9 uiomove.9 -MLINKS+=usbdi.9 usb_fifo_alloc_buffer.9 \ - usbdi.9 usb_fifo_attach.9 \ - usbdi.9 usb_fifo_detach.9 \ - usbdi.9 usb_fifo_free_buffer.9 \ - usbdi.9 usb_fifo_get_data.9 \ - usbdi.9 usb_fifo_get_data_buffer.9 \ - usbdi.9 usb_fifo_get_data_error.9 \ - usbdi.9 usb_fifo_get_data_linear.9 \ - usbdi.9 usb_fifo_put_bytes_max.9 \ - usbdi.9 usb_fifo_put_data.9 \ - usbdi.9 usb_fifo_put_data_buffer.9 \ - usbdi.9 usb_fifo_put_data_error.9 \ - usbdi.9 usb_fifo_put_data_linear.9 \ - usbdi.9 usb_fifo_reset.9 \ - usbdi.9 usb_fifo_softc.9 \ - usbdi.9 usb_fifo_wakeup.9 \ - usbdi.9 usbd_do_request.9 \ +MLINKS+=usbdi.9 usbd_do_request.9 \ usbdi.9 usbd_do_request_flags.9 \ usbdi.9 usbd_errstr.9 \ usbdi.9 usbd_lookup_id_by_info.9 \ @@ -1287,8 +1271,23 @@ usbdi.9 usbd_xfer_set_timeout.9 \ usbdi.9 usbd_xfer_softc.9 \ usbdi.9 usbd_xfer_state.9 \ - usbdi.9 usbd_xfer_state.9 \ - usbdi.9 usbd_xfer_status.9 + usbdi.9 usbd_xfer_status.9 \ + usbdi.9 usb_fifo_alloc_buffer.9 \ + usbdi.9 usb_fifo_attach.9 \ + usbdi.9 usb_fifo_detach.9 \ + usbdi.9 usb_fifo_free_buffer.9 \ + usbdi.9 usb_fifo_get_data.9 \ + usbdi.9 usb_fifo_get_data_buffer.9 \ + usbdi.9 usb_fifo_get_data_error.9 \ + usbdi.9 usb_fifo_get_data_linear.9 \ + usbdi.9 usb_fifo_put_bytes_max.9 \ + usbdi.9 usb_fifo_put_data.9 \ + usbdi.9 usb_fifo_put_data_buffer.9 \ + usbdi.9 usb_fifo_put_data_error.9 \ + usbdi.9 usb_fifo_put_data_linear.9 \ + usbdi.9 usb_fifo_reset.9 \ + usbdi.9 usb_fifo_softc.9 \ + usbdi.9 usb_fifo_wakeup.9 MLINKS+=vcount.9 count_dev.9 MLINKS+=vfsconf.9 vfs_modevent.9 \ vfsconf.9 vfs_register.9 \ @@ -1304,8 +1303,8 @@ MLINKS+=VFS_LOCK_GIANT.9 VFS_UNLOCK_GIANT.9 MLINKS+=vgone.9 vgonel.9 MLINKS+=vhold.9 vdrop.9 \ - vhold.9 vholdl.9 \ - vhold.9 vdropl.9 + vhold.9 vdropl.9 \ + vhold.9 vholdl.9 MLINKS+=vm_map_lock.9 vm_map_lock_downgrade.9 \ vm_map_lock.9 vm_map_lock_read.9 \ vm_map_lock.9 vm_map_lock_upgrade.9 \ ==== //depot/projects/multipass/share/man/man9/usbdi.9#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/share/man/man9/usbdi.9,v 1.3 2009/06/24 17:01:17 thompsa Exp $ +.\" $FreeBSD: src/share/man/man9/usbdi.9,v 1.4 2009/12/22 16:05:28 ru Exp $ .Dd June 24, 2009 .Os .Dt USBDI 9 @@ -78,7 +78,6 @@ .Nm usbd_xfer_set_timeout , .Nm usbd_xfer_softc , .Nm usbd_xfer_state , -.Nm usbd_xfer_state , .Nm usbd_xfer_status .Nd Universal Serial Bus driver programming interface .Sh SYNOPSIS ==== //depot/projects/multipass/sys/amd64/conf/NOTES#7 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.98 2009/11/30 11:44:03 avg Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.99 2009/12/18 16:13:21 jhb Exp $ # # @@ -277,7 +277,6 @@ # iwn: Intel Wireless WiFi Link 4965AGN 802.11 network adapters # nfe: nVidia nForce MCP on-board Ethernet Networking (BSD open source) # nve: nVidia nForce MCP on-board Ethernet Networking -# ral: Ralink Technology IEEE 802.11 wireless adapter # wpi: Intel 3945ABG Wireless LAN controller device ed @@ -289,16 +288,8 @@ device ipw device nfe device nve -device ral device wpi -device ath # Atheros pci/cardbus NIC's -device ath_hal # pci/cardbus chip support -options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors -device ath_rate_sample # SampleRate tx rate control for ath -#device ath_rate_amrr # AMRR rate control for ath driver -#device ath_rate_onoe # Onoe rate control for ath driver - # #XXX this stores pointers in a 32bit field that is defined by the hardware #device pst ==== //depot/projects/multipass/sys/boot/i386/Makefile#4 (text+ko) ==== @@ -1,9 +1,15 @@ -# $FreeBSD: src/sys/boot/i386/Makefile,v 1.27 2009/11/23 16:00:16 rnoland Exp $ +# $FreeBSD: src/sys/boot/i386/Makefile,v 1.28 2009/12/22 20:56:33 jhb Exp $ + +.include -SUBDIR= mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot zfsboot \ - gptzfsboot kgzldr libi386 libfirewire loader zfsloader +SUBDIR= mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot kgzldr \ + libi386 libfirewire loader # special boot programs, 'self-extracting boot2+loader' SUBDIR+= pxeldr +.if ${MK_ZFS} != "no" +SUBDIR+= zfsboot gptzfsboot zfsloader +.endif + .include ==== //depot/projects/multipass/sys/boot/i386/libi386/biosdisk.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biosdisk.c,v 1.62 2009/06/26 09:32:31 rpaulo Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biosdisk.c,v 1.63 2009/12/17 13:14:11 nyan Exp $"); /* * BIOS disk device handling. @@ -1266,11 +1266,11 @@ } if (write) - DEBUG("%d sectors from %lld to %p (0x%x) %s", x, dblk, p, VTOP(p), - result ? "failed" : "ok"); + DEBUG("Write %d sector(s) from %p (0x%x) to %lld %s", x, + p, VTOP(p), dblk, result ? "failed" : "ok"); else - DEBUG("%d sectors from %p (0x%x) to %lld %s", x, p, VTOP(p), dblk, - result ? "failed" : "ok"); + DEBUG("Read %d sector(s) from %lld to %p (0x%x) %s", x, + dblk, p, VTOP(p), result ? "failed" : "ok"); if (result) { return(-1); } ==== //depot/projects/multipass/sys/boot/pc98/kgzldr/crt.s#2 (text+ko) ==== @@ -24,7 +24,7 @@ # EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # # From: btx.s 1.10 1999/02/25 16:27:41 rnordier -# $FreeBSD: src/sys/boot/pc98/kgzldr/crt.s,v 1.5 2005/05/08 14:17:28 nyan Exp $ +# $FreeBSD: src/sys/boot/pc98/kgzldr/crt.s,v 1.6 2009/12/21 14:59:23 nyan Exp $ # # Screen defaults and assumptions. @@ -75,5 +75,15 @@ stosw # line movw $(SCR_ROW-1)*SCR_COL*2,%dx crt_putchr.4: movw %dx,(%ebx) # Update position + shrw $1,%dx +crt_putchr.5: inb $0x60,%al # Move cursor + testb $0x04,%al + jz crt_putchr.5 + movb $0x49,%al + outb %al,$0x62 + movb %dl,%al + outb %al,$0x60 + movb %dh,%al + outb %al,$0x60 popa # Restore ret # To caller ==== //depot/projects/multipass/sys/boot/pc98/libpc98/biosdisk.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/pc98/libpc98/biosdisk.c,v 1.41 2009/03/20 05:33:58 nyan Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/pc98/libpc98/biosdisk.c,v 1.42 2009/12/17 13:14:11 nyan Exp $"); /* * BIOS disk device handling. @@ -906,11 +906,11 @@ } if (write) - DEBUG("%d sectors from %lld to %p (0x%x) %s", x, dblk, p, VTOP(p), - result ? "failed" : "ok"); + DEBUG("Write %d sector(s) from %p (0x%x) to %lld %s", x, + p, VTOP(p), dblk, result ? "failed" : "ok"); else - DEBUG("%d sectors from %p (0x%x) to %lld %s", x, p, VTOP(p), dblk, - result ? "failed" : "ok"); + DEBUG("Read %d sector(s) from %lld to %p (0x%x) %s", x, + dblk, p, VTOP(p), result ? "failed" : "ok"); if (result) { return(-1); } ==== //depot/projects/multipass/sys/boot/uboot/lib/glue.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/uboot/lib/glue.c,v 1.10 2009/11/11 19:39:45 antoine Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/uboot/lib/glue.c,v 1.11 2009/12/18 21:12:37 marcel Exp $"); #include #include "api_public.h" @@ -568,17 +568,16 @@ const char *env, *str; int i; - env = NULL; - /* * It's OK to pass only the name piece as last (and not the whole * 'name=val' string), since the API_ENUM_ENV call uses envmatch() * internally, which handles such case */ - if (!syscall(API_ENV_ENUM, NULL, (uint32_t)last, (uint32_t)&env)) + env = NULL; + if (syscall(API_ENV_ENUM, NULL, (uint32_t)last, (uint32_t)&env) != 0) return (NULL); - if (!env) + if (env == NULL) /* no more env. variables to enumerate */ return (NULL); ==== //depot/projects/multipass/sys/cam/scsi/scsi_cd.c#6 (text+ko) ==== @@ -46,7 +46,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.115 2009/12/09 14:21:21 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.116 2009/12/18 14:41:30 mav Exp $"); #include "opt_cd.h" @@ -1464,8 +1464,6 @@ } else { bioq_remove(&softc->bio_queue, bp); - devstat_start_transaction_bio(softc->disk->d_devstat, bp); - scsi_read_write(&start_ccb->csio, /*retries*/cd_retry_count, /* cbfcnp */ cddone, ==== //depot/projects/multipass/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#2 (text+ko) ==== @@ -19,12 +19,10 @@ * CDDL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include #include #include @@ -108,19 +106,51 @@ int dmu_object_reclaim(objset_t *os, uint64_t object, dmu_object_type_t ot, - int blocksize, dmu_object_type_t bonustype, int bonuslen, dmu_tx_t *tx) + int blocksize, dmu_object_type_t bonustype, int bonuslen) { dnode_t *dn; + dmu_tx_t *tx; + int nblkptr; int err; - if (object == DMU_META_DNODE_OBJECT && !dmu_tx_private_ok(tx)) + if (object == DMU_META_DNODE_OBJECT) return (EBADF); err = dnode_hold_impl(os->os, object, DNODE_MUST_BE_ALLOCATED, FTAG, &dn); if (err) return (err); + + if (dn->dn_type == ot && dn->dn_datablksz == blocksize && + dn->dn_bonustype == bonustype && dn->dn_bonuslen == bonuslen) { + /* nothing is changing, this is a noop */ + dnode_rele(dn, FTAG); + return (0); + } + + tx = dmu_tx_create(os); + dmu_tx_hold_bonus(tx, object); + err = dmu_tx_assign(tx, TXG_WAIT); + if (err) { + dmu_tx_abort(tx); + dnode_rele(dn, FTAG); + return (err); + } + + nblkptr = 1 + ((DN_MAX_BONUSLEN - bonuslen) >> SPA_BLKPTRSHIFT); + + /* + * If we are losing blkptrs or changing the block size this must + * be a new file instance. We must clear out the previous file + * contents before we can change this type of metadata in the dnode. + */ + if (dn->dn_nblkptr > nblkptr || dn->dn_datablksz != blocksize) + dmu_free_long_range(os, object, 0, DMU_OBJECT_END); + dnode_reallocate(dn, ot, blocksize, bonustype, bonuslen, tx); + + dmu_tx_commit(tx); + dnode_rele(dn, FTAG); return (0); ==== //depot/projects/multipass/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#3 (text+ko) ==== @@ -828,12 +828,8 @@ { int err; dmu_tx_t *tx; - - err = dmu_object_info(os, drro->drr_object, NULL); + void *data = NULL; - if (err != 0 && err != ENOENT) - return (EINVAL); - if (drro->drr_type == DMU_OT_NONE || drro->drr_type >= DMU_OT_NUMTYPES || drro->drr_bonustype >= DMU_OT_NUMTYPES || @@ -846,12 +842,15 @@ return (EINVAL); } - tx = dmu_tx_create(os); + err = dmu_object_info(os, drro->drr_object, NULL); + + if (err != 0 && err != ENOENT) + return (EINVAL); if (err == ENOENT) { /* currently free, want to be allocated */ + tx = dmu_tx_create(os); dmu_tx_hold_bonus(tx, DMU_NEW_OBJECT); - dmu_tx_hold_write(tx, DMU_NEW_OBJECT, 0, 1); err = dmu_tx_assign(tx, TXG_WAIT); if (err) { dmu_tx_abort(tx); @@ -860,45 +859,41 @@ err = dmu_object_claim(os, drro->drr_object, drro->drr_type, drro->drr_blksz, drro->drr_bonustype, drro->drr_bonuslen, tx); + dmu_tx_commit(tx); } else { /* currently allocated, want to be allocated */ - dmu_tx_hold_bonus(tx, drro->drr_object); - /* - * We may change blocksize and delete old content, - * so need to hold_write and hold_free. - */ - dmu_tx_hold_write(tx, drro->drr_object, 0, 1); - dmu_tx_hold_free(tx, drro->drr_object, 0, DMU_OBJECT_END); - err = dmu_tx_assign(tx, TXG_WAIT); - if (err) { - dmu_tx_abort(tx); - return (err); - } err = dmu_object_reclaim(os, drro->drr_object, drro->drr_type, drro->drr_blksz, - drro->drr_bonustype, drro->drr_bonuslen, tx); + drro->drr_bonustype, drro->drr_bonuslen); + } + if (err) + return (EINVAL); + + if (drro->drr_bonuslen) { + data = restore_read(ra, P2ROUNDUP(drro->drr_bonuslen, 8)); + if (ra->err) + return (ra->err); } + + tx = dmu_tx_create(os); + dmu_tx_hold_bonus(tx, drro->drr_object); + err = dmu_tx_assign(tx, TXG_WAIT); if (err) { - dmu_tx_commit(tx); - return (EINVAL); + dmu_tx_abort(tx); + return (err); } dmu_object_set_checksum(os, drro->drr_object, drro->drr_checksum, tx); dmu_object_set_compress(os, drro->drr_object, drro->drr_compress, tx); - if (drro->drr_bonuslen) { + if (data != NULL) { dmu_buf_t *db; - void *data; + VERIFY(0 == dmu_bonus_hold(os, drro->drr_object, FTAG, &db)); dmu_buf_will_dirty(db, tx); ASSERT3U(db->db_size, >=, drro->drr_bonuslen); - data = restore_read(ra, P2ROUNDUP(drro->drr_bonuslen, 8)); - if (data == NULL) { - dmu_tx_commit(tx); - return (ra->err); - } bcopy(data, db->db_data, drro->drr_bonuslen); if (ra->byteswap) { dmu_ot[drro->drr_bonustype].ot_byteswap(db->db_data, ==== //depot/projects/multipass/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#3 (text+ko) ==== @@ -415,8 +415,7 @@ dnode_reallocate(dnode_t *dn, dmu_object_type_t ot, int blocksize, dmu_object_type_t bonustype, int bonuslen, dmu_tx_t *tx) { - int i, nblkptr; - dmu_buf_impl_t *db = NULL; + int nblkptr; ASSERT3U(blocksize, >=, SPA_MINBLOCKSIZE); ASSERT3U(blocksize, <=, SPA_MAXBLOCKSIZE); @@ -428,42 +427,25 @@ ASSERT3U(bonustype, <, DMU_OT_NUMTYPES); ASSERT3U(bonuslen, <=, DN_MAX_BONUSLEN); - for (i = 0; i < TXG_SIZE; i++) - ASSERT(!list_link_active(&dn->dn_dirty_link[i])); - /* clean up any unreferenced dbufs */ dnode_evict_dbufs(dn); - ASSERT3P(list_head(&dn->dn_dbufs), ==, NULL); - /* - * XXX I should really have a generation number to tell if we - * need to do this... - */ - if (blocksize != dn->dn_datablksz || - dn->dn_bonustype != bonustype || dn->dn_bonuslen != bonuslen) { - /* free all old data */ - dnode_free_range(dn, 0, -1ULL, tx); + rw_enter(&dn->dn_struct_rwlock, RW_WRITER); + dnode_setdirty(dn, tx); + if (dn->dn_datablksz != blocksize) { + /* change blocksize */ + ASSERT(dn->dn_maxblkid == 0 && + (BP_IS_HOLE(&dn->dn_phys->dn_blkptr[0]) || + dnode_block_freed(dn, 0))); + dnode_setdblksz(dn, blocksize); + dn->dn_next_blksz[tx->tx_txg&TXG_MASK] = blocksize; } - + if (dn->dn_bonuslen != bonuslen) + dn->dn_next_bonuslen[tx->tx_txg&TXG_MASK] = bonuslen; nblkptr = 1 + ((DN_MAX_BONUSLEN - bonuslen) >> SPA_BLKPTRSHIFT); - - /* change blocksize */ - rw_enter(&dn->dn_struct_rwlock, RW_WRITER); - if (blocksize != dn->dn_datablksz && - (!BP_IS_HOLE(&dn->dn_phys->dn_blkptr[0]) || - list_head(&dn->dn_dbufs) != NULL)) { - db = dbuf_hold(dn, 0, FTAG); - dbuf_new_size(db, blocksize, tx); - } - dnode_setdblksz(dn, blocksize); - dnode_setdirty(dn, tx); - dn->dn_next_bonuslen[tx->tx_txg&TXG_MASK] = bonuslen; - dn->dn_next_blksz[tx->tx_txg&TXG_MASK] = blocksize; if (dn->dn_nblkptr != nblkptr) dn->dn_next_nblkptr[tx->tx_txg&TXG_MASK] = nblkptr; rw_exit(&dn->dn_struct_rwlock); - if (db) - dbuf_rele(db, FTAG); /* change type */ dn->dn_type = ot; @@ -1187,11 +1169,6 @@ if (dn->dn_free_txg) return (TRUE); - /* - * If dn_datablkshift is not set, then there's only a single - * block, in which case there will never be a free range so it - * won't matter. - */ range_tofind.fr_blkid = blkid; mutex_enter(&dn->dn_mtx); for (i = 0; i < TXG_SIZE; i++) { ==== //depot/projects/multipass/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#3 (text+ko) ==== @@ -19,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -237,7 +237,7 @@ int dmu_object_claim(objset_t *os, uint64_t object, dmu_object_type_t ot, int blocksize, dmu_object_type_t bonus_type, int bonus_len, dmu_tx_t *tx); int dmu_object_reclaim(objset_t *os, uint64_t object, dmu_object_type_t ot, - int blocksize, dmu_object_type_t bonustype, int bonuslen, dmu_tx_t *tx); + int blocksize, dmu_object_type_t bonustype, int bonuslen); /* * Free an object from this objset. ==== //depot/projects/multipass/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#2 (text+ko) ==== @@ -19,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -56,10 +56,16 @@ uint64_t zh_replay_seq; /* highest replayed sequence number */ blkptr_t zh_log; /* log chain */ uint64_t zh_claim_seq; /* highest claimed sequence number */ - uint64_t zh_pad[5]; + uint64_t zh_flags; /* header flags */ + uint64_t zh_pad[4]; } zil_header_t; /* + * zh_flags bit settings + */ +#define ZIL_REPLAY_NEEDED 0x1 /* replay needed - internal only */ + +/* * Log block trailer - structure at the end of the header and each log block * * The zit_bt contains a zbt_cksum which for the intent log is ==== //depot/projects/multipass/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#3 (text+ko) ==== @@ -502,6 +502,25 @@ tx, zh->zh_claim_txg); } +/* + * return true if the initial log block is not valid + */ +static boolean_t +zil_empty(zilog_t *zilog) +{ + const zil_header_t *zh = zilog->zl_header; + arc_buf_t *abuf = NULL; + + if (BP_IS_HOLE(&zh->zh_log)) + return (B_TRUE); + + if (zil_read_log_block(zilog, &zh->zh_log, &abuf) != 0) + return (B_TRUE); + + VERIFY(arc_buf_remove_ref(abuf, &abuf) == 1); + return (B_FALSE); +} + int zil_claim(char *osname, void *txarg) { @@ -522,6 +541,21 @@ zh = zil_header_in_syncing_context(zilog); /* + * Record here whether the zil has any records to replay. + * If the header block pointer is null or the block points + * to the stubby then we know there are no valid log records. + * We use the header to store this state as the the zilog gets + * freed later in dmu_objset_close(). + * The flags (and the rest of the header fields) are cleared in + * zil_sync() as a result of a zil_destroy(), after replaying the log. + * + * Note, the intent log can be empty but still need the + * stubby to be claimed. + */ + if (!zil_empty(zilog)) + zh->zh_flags |= ZIL_REPLAY_NEEDED; + + /* * Claim all log blocks if we haven't already done so, and remember * the highest claimed sequence number. This ensures that if we can * read only part of the log now (e.g. due to a missing device), @@ -1345,25 +1379,6 @@ } /* - * return true if the initial log block is not valid - */ -static boolean_t -zil_empty(zilog_t *zilog) -{ - const zil_header_t *zh = zilog->zl_header; - arc_buf_t *abuf = NULL; - - if (BP_IS_HOLE(&zh->zh_log)) - return (B_TRUE); - - if (zil_read_log_block(zilog, &zh->zh_log, &abuf) != 0) - return (B_TRUE); - - VERIFY(arc_buf_remove_ref(abuf, &abuf) == 1); - return (B_FALSE); -} - -/* * Open an intent log. */ zilog_t * @@ -1418,7 +1433,7 @@ const zil_header_t *zh = zilog->zl_header; mutex_enter(&zilog->zl_lock); - if (zh->zh_claim_txg != 0) { /* unplayed log */ + if (zh->zh_flags & ZIL_REPLAY_NEEDED) { /* unplayed log */ mutex_exit(&zilog->zl_lock); return (EBUSY); } @@ -1645,7 +1660,7 @@ const zil_header_t *zh = zilog->zl_header; zil_replay_arg_t zr; - if (zil_empty(zilog)) { + if ((zh->zh_flags & ZIL_REPLAY_NEEDED) == 0) { zil_destroy(zilog, B_TRUE); return; } ==== //depot/projects/multipass/sys/compat/freebsd32/freebsd32_proto.h#9 (text+ko) ==== @@ -2,7 +2,7 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.111 2009/12/16 17:17:40 imp Exp $ + * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.112 2009/12/16 21:53:56 imp Exp $ * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 200111 2009-12-04 21:52:31Z kib */ @@ -692,8 +692,7 @@ #endif /* COMPAT_FREEBSD6 */ -#if defined(COMPAT_FREEBSD4) || defined(COMPAT_FREEBSD5) || \ - defined(COMPAT_FREEBSD6) || defined(COMPAT_FREEBSD7) +#ifdef COMPAT_FREEBSD7 struct freebsd7_freebsd32_semctl_args { char semid_l_[PADL_(int)]; int semid; char semid_r_[PADR_(int)]; @@ -715,7 +714,7 @@ int freebsd7_freebsd32_msgctl(struct thread *, struct freebsd7_freebsd32_msgctl_args *); int freebsd7_freebsd32_shmctl(struct thread *, struct freebsd7_freebsd32_shmctl_args *); -#endif +#endif /* COMPAT_FREEBSD7 */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Dec 24 13:32:03 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7CD9E10656A3; Thu, 24 Dec 2009 13:32:03 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4127D1065694 for ; Thu, 24 Dec 2009 13:32:03 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2F1AC8FC15 for ; Thu, 24 Dec 2009 13:32:03 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nBODW3R7004945 for ; Thu, 24 Dec 2009 13:32:03 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nBODW3gr004943 for perforce@freebsd.org; Thu, 24 Dec 2009 13:32:03 GMT (envelope-from hselasky@FreeBSD.org) Date: Thu, 24 Dec 2009 13:32:03 GMT Message-Id: <200912241332.nBODW3gr004943@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 172191 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 24 Dec 2009 13:32:03 -0000 http://p4web.freebsd.org/chv.cgi?CH=172191 Change 172191 by hselasky@hselasky_laptop001 on 2009/12/24 13:31:55 USB serial: - add new device ID to uipaq driver - patch by: HASHI Hiroaki PR: usb/141936 Affected files ... .. //depot/projects/usb/src/sys/dev/usb/serial/uipaq.c#17 edit .. //depot/projects/usb/src/sys/dev/usb/usbdevs#92 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/serial/uipaq.c#17 (text+ko) ==== @@ -1015,6 +1015,8 @@ /**/ {USB_VPI(USB_VENDOR_SHARP, USB_PRODUCT_SHARP_WZERO3ES, 0)}, /**/ + {USB_VPI(USB_VENDOR_SHARP, USB_PRODUCT_SHARP_WZERO3ADES, 0)}, + /**/ {USB_VPI(USB_VENDOR_SHARP, USB_PRODUCT_SHARP_WILLCOM03, 0)}, /* Symbol USB Sync */ {USB_VPI(USB_VENDOR_SYMBOL, 0x2000, 0)}, ==== //depot/projects/usb/src/sys/dev/usb/usbdevs#92 (text+ko) ==== @@ -2404,6 +2404,7 @@ product SHARP SLC700 0x8007 Zaurus SL-C700 PDA product SHARP SLC750 0x9031 Zaurus SL-C750 PDA product SHARP WZERO3ES 0x9123 W-ZERO3 ES Smartphone +product SHARP WZERO3ADES 0x91ac Advanced W-ZERO3 ES Smartphone product SHARP WILLCOM03 0x9242 WILLCOM03 /* Shuttle Technology products */ From owner-p4-projects@FreeBSD.ORG Sat Dec 26 00:05:24 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 216AC106568D; Sat, 26 Dec 2009 00:05:24 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D965A10656A7 for ; Sat, 26 Dec 2009 00:05:23 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C5EFE8FC2B for ; Sat, 26 Dec 2009 00:05:23 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nBQ05NcM081349 for ; Sat, 26 Dec 2009 00:05:23 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nBQ05NbM081347 for perforce@freebsd.org; Sat, 26 Dec 2009 00:05:23 GMT (envelope-from mav@freebsd.org) Date: Sat, 26 Dec 2009 00:05:23 GMT Message-Id: <200912260005.nBQ05NbM081347@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 172250 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Dec 2009 00:05:24 -0000 http://p4web.freebsd.org/chv.cgi?CH=172250 Change 172250 by mav@mav_mavbook on 2009/12/26 00:04:36 IFC Affected files ... .. //depot/projects/scottl-camlock/src/UPDATING#25 integrate .. //depot/projects/scottl-camlock/src/bin/pax/sel_subs.c#3 integrate .. //depot/projects/scottl-camlock/src/bin/sh/alias.c#4 integrate .. //depot/projects/scottl-camlock/src/bin/sh/alias.h#2 integrate .. //depot/projects/scottl-camlock/src/bin/sh/arith.h#3 integrate .. //depot/projects/scottl-camlock/src/bin/sh/arith.y#3 integrate .. //depot/projects/scottl-camlock/src/bin/sh/cd.c#4 integrate .. //depot/projects/scottl-camlock/src/bin/sh/error.c#3 integrate .. //depot/projects/scottl-camlock/src/bin/sh/error.h#3 integrate .. //depot/projects/scottl-camlock/src/bin/sh/exec.c#7 integrate .. //depot/projects/scottl-camlock/src/bin/sh/exec.h#3 integrate .. //depot/projects/scottl-camlock/src/bin/sh/expand.c#5 integrate .. //depot/projects/scottl-camlock/src/bin/sh/expand.h#2 integrate .. //depot/projects/scottl-camlock/src/bin/sh/histedit.c#5 integrate .. //depot/projects/scottl-camlock/src/bin/sh/input.c#5 integrate .. //depot/projects/scottl-camlock/src/bin/sh/input.h#4 integrate .. //depot/projects/scottl-camlock/src/bin/sh/jobs.c#3 integrate .. //depot/projects/scottl-camlock/src/bin/sh/mail.c#2 integrate .. //depot/projects/scottl-camlock/src/bin/sh/main.c#4 integrate .. //depot/projects/scottl-camlock/src/bin/sh/main.h#2 integrate .. //depot/projects/scottl-camlock/src/bin/sh/memalloc.c#3 integrate .. //depot/projects/scottl-camlock/src/bin/sh/memalloc.h#3 integrate .. //depot/projects/scottl-camlock/src/bin/sh/myhistedit.h#2 integrate .. //depot/projects/scottl-camlock/src/bin/sh/options.c#3 integrate .. //depot/projects/scottl-camlock/src/bin/sh/options.h#2 integrate .. //depot/projects/scottl-camlock/src/bin/sh/output.c#4 integrate .. //depot/projects/scottl-camlock/src/bin/sh/output.h#3 integrate .. //depot/projects/scottl-camlock/src/bin/sh/parser.c#9 integrate .. //depot/projects/scottl-camlock/src/bin/sh/parser.h#3 integrate .. //depot/projects/scottl-camlock/src/bin/sh/show.c#2 integrate .. //depot/projects/scottl-camlock/src/bin/sh/show.h#2 integrate .. //depot/projects/scottl-camlock/src/bin/sh/trap.h#3 integrate .. //depot/projects/scottl-camlock/src/bin/sh/var.c#6 integrate .. //depot/projects/scottl-camlock/src/bin/sh/var.h#2 integrate .. //depot/projects/scottl-camlock/src/contrib/pf/man/pf.conf.5#3 integrate .. //depot/projects/scottl-camlock/src/contrib/pf/pfctl/parse.y#3 integrate .. //depot/projects/scottl-camlock/src/contrib/pf/pfctl/pf_print_state.c#3 integrate .. //depot/projects/scottl-camlock/src/contrib/pf/pfctl/pfctl_parser.c#3 integrate .. //depot/projects/scottl-camlock/src/contrib/top/username.c#2 integrate .. //depot/projects/scottl-camlock/src/etc/rc.subr#8 integrate .. //depot/projects/scottl-camlock/src/include/signal.h#4 integrate .. //depot/projects/scottl-camlock/src/lib/libc/posix1e/acl_delete_entry.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/stdio/sprintf.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/stdio/sscanf.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/stdio/vsscanf.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/stdtime/localtime.c#6 integrate .. //depot/projects/scottl-camlock/src/lib/libc/stdtime/tzfile.5#3 integrate .. //depot/projects/scottl-camlock/src/lib/libpmc/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/lib/libpmc/libpmc.c#6 integrate .. //depot/projects/scottl-camlock/src/lib/libpmc/pmc.xscale.3#1 branch .. //depot/projects/scottl-camlock/src/lib/libstand/bzipfs.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libstand/gzipfs.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libulog/ulog_pututxline.c#2 integrate .. //depot/projects/scottl-camlock/src/libexec/atrun/atrun.c#3 integrate .. //depot/projects/scottl-camlock/src/libexec/talkd/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/libexec/talkd/process.c#2 integrate .. //depot/projects/scottl-camlock/src/release/Makefile#8 integrate .. //depot/projects/scottl-camlock/src/sbin/dumpfs/dumpfs.c#4 integrate .. //depot/projects/scottl-camlock/src/sbin/mount/mntopts.h#2 integrate .. //depot/projects/scottl-camlock/src/sbin/mount/mount.8#5 integrate .. //depot/projects/scottl-camlock/src/sbin/mount/mount.c#6 integrate .. //depot/projects/scottl-camlock/src/sbin/tunefs/tunefs.8#4 integrate .. //depot/projects/scottl-camlock/src/sbin/tunefs/tunefs.c#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/Makefile#17 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/gem.4#4 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/mk48txx.4#1 branch .. //depot/projects/scottl-camlock/src/share/man/man4/ste.4#2 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/watchdog.4#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/Makefile#13 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/usbdi.9#3 integrate .. //depot/projects/scottl-camlock/src/share/zoneinfo/asia#10 integrate .. //depot/projects/scottl-camlock/src/share/zoneinfo/europe#6 integrate .. //depot/projects/scottl-camlock/src/share/zoneinfo/zone.tab#5 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/AVILA#11 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/CAMBRIA#7 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/pmc_mdep.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/files.ixp425#6 integrate .. //depot/projects/scottl-camlock/src/sys/boot/common/dev_net.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/boot/i386/Makefile#6 integrate .. //depot/projects/scottl-camlock/src/sys/boot/pc98/kgzldr/crt.s#3 integrate .. //depot/projects/scottl-camlock/src/sys/boot/sparc64/loader/main.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_da.c#45 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.arm#11 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.sun4v#7 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/pf/net/if_pfsync.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/pf/net/if_pfsync.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/pf/net/pf.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/contrib/pf/net/pfvar.h#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ae/if_ae.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#91 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-pci.h#29 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-amd.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-intel.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/dev/auxio/auxio.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hwpmc/hwpmc_arm.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/hwpmc/hwpmc_xscale.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/hwpmc/hwpmc_xscale.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/hwpmc/pmc_events.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/if_ndis/if_ndis_usb.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/jme/if_jme.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mc146818/mc146818.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mc146818/mc146818reg.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mc146818/mc146818var.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mk48txx/mk48txx.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mk48txx/mk48txxreg.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mk48txx/mk48txxvar.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mxge/if_mxge.c#23 integrate .. //depot/projects/scottl-camlock/src/sys/dev/sound/usb/uaudio.c#26 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ste/if_ste.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ste/if_stereg.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/twe/twe.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/twe/twe_freebsd.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/twe/twevar.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/uart/uart_bus_acpi.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/uart/uart_bus_ebus.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/uart/uart_cpu_sparc64.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ehci_pci.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/controller/ohci_pci.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/quirk/usb_quirk.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/quirk/usb_quirk.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/uftdi.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/storage/umass.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usbdevs#35 integrate .. //depot/projects/scottl-camlock/src/sys/dev/vge/if_vge.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nfs/nfs_commonacl.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nfs/nfs_var.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nfsserver/nfs_nfsdport.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/fs/nfsserver/nfs_nfsdserv.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/geom/concat/g_concat.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/geom/geom_dev.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/geom/mirror/g_mirror.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/geom/raid3/g_raid3.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/geom/raid3/g_raid3.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/geom/stripe/g_stripe.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/clock.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/machdep.c#23 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/include/clock.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/include/mca.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/include/md_var.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_proc.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_rmlock.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_bridge.c#25 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_ethersubr.c#26 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_var.h#29 integrate .. //depot/projects/scottl-camlock/src/sys/net/netisr.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_ipfw.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/netgraph/ng_ipfw.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_dummynet.h#11 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_fw.h#19 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_dummynet.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw2.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw_log.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw_nat.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw_pfil.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw_private.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw_sockopt.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw_table.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp.h#12 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_usrreq.c#27 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/mld6.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/mld6_var.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/central/central.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/ebus/ebus.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/fhc/fhc.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/include/bus_common.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/include/intr_machdep.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/include/iommureg.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/include/iommuvar.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/isa/ofw_isa.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/pci/apb.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/pci/ofw_pci.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/pci/ofw_pcib.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/pci/ofw_pcibus.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/pci/psycho.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/pci/schizo.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sbus/dma_sbus.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sbus/sbus.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/eeprom.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/identcpu.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/interrupt.S#5 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/intr_machdep.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/iommu.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/nexus.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/ofw_machdep.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/rtc.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/upa.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/sun4v/conf/NOTES#4 integrate .. //depot/projects/scottl-camlock/src/sys/sys/acl.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/sys/disk.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/sys/mount.h#22 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ffs/ffs_vfsops.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ffs/fs.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ufs/acl.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ufs/ufs_acl.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ufs/ufs_lookup.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/ufs/ufs/ufs_vnops.c#21 integrate .. //depot/projects/scottl-camlock/src/tools/regression/acltools/02.t#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/bin/sh/builtins/fc2.0#1 branch .. //depot/projects/scottl-camlock/src/tools/tools/README#4 integrate .. //depot/projects/scottl-camlock/src/tools/tools/notescheck/Makefile#1 branch .. //depot/projects/scottl-camlock/src/tools/tools/notescheck/notescheck.py#1 branch .. //depot/projects/scottl-camlock/src/usr.bin/finger/finger.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/killall/killall.1#4 integrate .. //depot/projects/scottl-camlock/src/usr.bin/rwho/rwho.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/sockstat/sockstat.1#4 integrate .. //depot/projects/scottl-camlock/src/usr.bin/truss/amd64-fbsd32.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/truss/i386-fbsd.c#5 integrate .. //depot/projects/scottl-camlock/src/usr.bin/truss/syscalls.c#5 integrate .. //depot/projects/scottl-camlock/src/usr.bin/unzip/unzip.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/apm/apm.8#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/apm/apm.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_scalars.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/burncd/burncd.8#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/burncd/burncd.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/diskinfo/diskinfo.8#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/diskinfo/diskinfo.c#4 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/newsyslog/newsyslog.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/powerd/powerd.8#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/service/service.8#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/service/service.sh#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/syslogd/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/syslogd/syslogd.c#4 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/watchdogd/watchdogd.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/zic/Theory#4 integrate Differences ... ==== //depot/projects/scottl-camlock/src/UPDATING#25 (text+ko) ==== @@ -161,7 +161,7 @@ 20090712: Padding has been added to struct tcpcb, sackhint and tcpstat in to facilitate future MFCs and bug fixes whilst - maintainig the ABI. However, this change breaks the ABI, so bump + maintaining the ABI. However, this change breaks the ABI, so bump __FreeBSD_version to 800102. User space tools that rely on the size of any of these structs (e.g. sockstat) need to be recompiled. @@ -895,7 +895,7 @@ ------------- Avoid using make -j when upgrading. While generally safe, there are sometimes problems using -j to upgrade. If your upgrade fails with - -j, please try again wtihout -j. From time to time in the past there + -j, please try again without -j. From time to time in the past there have been problems using -j with buildworld and/or installworld. This is especially true when upgrading between "distant" versions (eg one that cross a major release boundary or several minor releases, or when @@ -1089,4 +1089,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.649 2009/12/18 16:35:28 ume Exp $ +$FreeBSD: src/UPDATING,v 1.650 2009/12/25 21:14:34 ru Exp $ ==== //depot/projects/scottl-camlock/src/bin/pax/sel_subs.c#3 (text+ko) ==== @@ -37,7 +37,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/pax/sel_subs.c,v 1.21 2007/05/25 17:53:38 brian Exp $"); +__FBSDID("$FreeBSD: src/bin/pax/sel_subs.c,v 1.22 2009/12/21 19:18:27 delphij Exp $"); #include #include @@ -396,6 +396,7 @@ default: paxwarn(1, "Bad option %c with time range %s", *flgpt, str); + free(pt); goto out; } ++flgpt; ==== //depot/projects/scottl-camlock/src/bin/sh/alias.c#4 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/alias.c,v 1.25 2009/06/01 10:50:17 rse Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/alias.c,v 1.26 2009/12/24 18:41:14 jilles Exp $"); #include #include "shell.h" @@ -52,13 +52,13 @@ STATIC struct alias *atab[ATABSIZE]; STATIC int aliases; -STATIC void setalias(char *, char *); +STATIC void setalias(const char *, const char *); STATIC int unalias(const char *); STATIC struct alias **hashalias(const char *); STATIC void -setalias(char *name, char *val) +setalias(const char *name, const char *val) { struct alias *ap, **app; @@ -176,7 +176,7 @@ } struct alias * -lookupalias(char *name, int check) +lookupalias(const char *name, int check) { struct alias *ap = *hashalias(name); ==== //depot/projects/scottl-camlock/src/bin/sh/alias.h#2 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * @(#)alias.h 8.2 (Berkeley) 5/4/95 - * $FreeBSD: src/bin/sh/alias.h,v 1.8 2004/04/06 20:06:51 markm Exp $ + * $FreeBSD: src/bin/sh/alias.h,v 1.9 2009/12/24 18:41:14 jilles Exp $ */ #define ALIASINUSE 1 @@ -42,7 +42,7 @@ int flag; }; -struct alias *lookupalias(char *, int); +struct alias *lookupalias(const char *, int); int aliascmd(int, char **); int unaliascmd(int, char **); void rmaliases(void); ==== //depot/projects/scottl-camlock/src/bin/sh/arith.h#3 (text+ko) ==== @@ -27,15 +27,15 @@ * SUCH DAMAGE. * * @(#)arith.h 1.1 (Berkeley) 5/4/95 - * $FreeBSD: src/bin/sh/arith.h,v 1.12 2008/04/27 20:46:45 stefanf Exp $ + * $FreeBSD: src/bin/sh/arith.h,v 1.13 2009/12/24 18:41:14 jilles Exp $ */ #include "shell.h" #define DIGITS(var) (3 + (2 + CHAR_BIT * sizeof((var))) / 3) -extern char *arith_buf, *arith_startbuf; +extern const char *arith_buf, *arith_startbuf; -arith_t arith(char *); +arith_t arith(const char *); void arith_lex_reset(void); int expcmd(int, char **); ==== //depot/projects/scottl-camlock/src/bin/sh/arith.y#3 (text+ko) ==== @@ -38,7 +38,7 @@ #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/arith.y,v 1.22 2008/04/27 20:46:45 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/arith.y,v 1.23 2009/12/24 18:41:14 jilles Exp $"); #include #include @@ -265,7 +265,7 @@ #define YYPARSE_PARAM_TYPE arith_t * #define YYPARSE_PARAM result -char *arith_buf, *arith_startbuf; +const char *arith_buf, *arith_startbuf; int yylex(void); int yyparse(YYPARSE_PARAM_TYPE); @@ -284,7 +284,7 @@ } arith_t -arith(char *s) +arith(const char *s) { arith_t result; @@ -299,7 +299,7 @@ } static void -yyerror(char *s) +yyerror(const char *s) { yyerrok; @@ -354,7 +354,7 @@ printf("%d\n", exp(argv[1])); } -error(char *s) +error(const char *s) { fprintf(stderr, "exp: %s\n", s); exit(1); ==== //depot/projects/scottl-camlock/src/bin/sh/cd.c#4 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/cd.c,v 1.37 2009/11/21 14:53:22 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/cd.c,v 1.38 2009/12/24 18:41:14 jilles Exp $"); #include #include @@ -80,7 +80,7 @@ cdcmd(int argc, char **argv) { char *dest; - char *path; + const char *path; char *p; struct stat statb; int ch, phys, print = 0; ==== //depot/projects/scottl-camlock/src/bin/sh/error.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/error.c,v 1.27 2009/11/22 18:23:30 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/error.c,v 1.28 2009/12/24 20:55:14 jilles Exp $"); /* * Errors and exceptions. @@ -67,7 +67,7 @@ char *commandname; -static void exverror(int, const char *, va_list) __printf0like(2, 0); +static void exverror(int, const char *, va_list) __printf0like(2, 0) __dead2; /* * Called to raise an exception. Since C doesn't include exceptions, we ==== //depot/projects/scottl-camlock/src/bin/sh/error.h#3 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * @(#)error.h 8.2 (Berkeley) 5/4/95 - * $FreeBSD: src/bin/sh/error.h,v 1.18 2009/11/22 18:23:30 jilles Exp $ + * $FreeBSD: src/bin/sh/error.h,v 1.19 2009/12/24 20:55:14 jilles Exp $ */ /* @@ -78,10 +78,10 @@ #define CLEAR_PENDING_INT intpending = 0 #define int_pending() intpending -void exraise(int); +void exraise(int) __dead2; void onint(void); -void error(const char *, ...) __printf0like(1, 2); -void exerror(int, const char *, ...) __printf0like(2, 3); +void error(const char *, ...) __printf0like(1, 2) __dead2; +void exerror(int, const char *, ...) __printf0like(2, 3) __dead2; /* ==== //depot/projects/scottl-camlock/src/bin/sh/exec.c#7 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/exec.c,v 1.37 2009/10/06 22:00:14 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/exec.c,v 1.38 2009/12/24 18:41:14 jilles Exp $"); #include #include @@ -98,7 +98,7 @@ STATIC void tryexec(char *, char **, char **); STATIC void printentry(struct tblentry *, int); -STATIC struct tblentry *cmdlookup(char *, int); +STATIC struct tblentry *cmdlookup(const char *, int); STATIC void delete_cmd_entry(void); @@ -109,7 +109,7 @@ */ void -shellexec(char **argv, char **envp, char *path, int index) +shellexec(char **argv, char **envp, const char *path, int index) { char *cmdname; int e; @@ -175,13 +175,13 @@ * NULL. */ -char *pathopt; +const char *pathopt; char * -padvance(char **path, char *name) +padvance(const char **path, const char *name) { - char *p, *q; - char *start; + const char *p, *start; + char *q; int len; if (*path == NULL) @@ -269,7 +269,7 @@ printentry(struct tblentry *cmdp, int verbose) { int index; - char *path; + const char *path; char *name; if (cmdp->cmdtype == CMDNORMAL) { @@ -310,7 +310,8 @@ */ void -find_command(char *name, struct cmdentry *entry, int printerr, char *path) +find_command(const char *name, struct cmdentry *entry, int printerr, + const char *path) { struct tblentry *cmdp; int index; @@ -446,7 +447,7 @@ */ int -find_builtin(char *name, int *special) +find_builtin(const char *name, int *special) { const struct builtincmd *bp; @@ -608,10 +609,10 @@ STATIC struct tblentry * -cmdlookup(char *name, int add) +cmdlookup(const char *name, int add) { int hashval; - char *p; + const char *p; struct tblentry *cmdp; struct tblentry **pp; @@ -664,7 +665,7 @@ */ void -addcmdentry(char *name, struct cmdentry *entry) +addcmdentry(const char *name, struct cmdentry *entry) { struct tblentry *cmdp; @@ -684,7 +685,7 @@ */ void -defun(char *name, union node *func) +defun(const char *name, union node *func) { struct cmdentry entry; @@ -701,7 +702,7 @@ */ int -unsetfunc(char *name) +unsetfunc(const char *name) { struct tblentry *cmdp; @@ -767,7 +768,8 @@ switch (entry.cmdtype) { case CMDNORMAL: { if (strchr(argv[i], '/') == NULL) { - char *path = pathval(), *name; + const char *path = pathval(); + char *name; int j = entry.u.index; do { name = padvance(&path, argv[i]); ==== //depot/projects/scottl-camlock/src/bin/sh/exec.h#3 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * @(#)exec.h 8.3 (Berkeley) 6/8/95 - * $FreeBSD: src/bin/sh/exec.h,v 1.16 2009/08/23 21:09:46 jilles Exp $ + * $FreeBSD: src/bin/sh/exec.h,v 1.18 2009/12/24 20:55:14 jilles Exp $ */ /* values of cmdtype */ @@ -57,20 +57,20 @@ }; -extern char *pathopt; /* set by padvance */ +extern const char *pathopt; /* set by padvance */ extern int exerrno; /* last exec error */ -void shellexec(char **, char **, char *, int); -char *padvance(char **, char *); +void shellexec(char **, char **, const char *, int) __dead2; +char *padvance(const char **, const char *); int hashcmd(int, char **); -void find_command(char *, struct cmdentry *, int, char *); -int find_builtin(char *, int *); +void find_command(const char *, struct cmdentry *, int, const char *); +int find_builtin(const char *, int *); void hashcd(void); void changepath(const char *); void deletefuncs(void); -void addcmdentry(char *, struct cmdentry *); -void defun(char *, union node *); -int unsetfunc(char *); +void addcmdentry(const char *, struct cmdentry *); +void defun(const char *, union node *); +int unsetfunc(const char *); int typecmd_impl(int, char **, int); int typecmd(int, char **); void clearcmdentry(int); ==== //depot/projects/scottl-camlock/src/bin/sh/expand.c#5 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.56 2009/10/24 21:20:04 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.58 2009/12/25 15:29:18 jilles Exp $"); #include #include @@ -107,7 +107,7 @@ STATIC void addfname(char *); STATIC struct strlist *expsort(struct strlist *); STATIC struct strlist *msort(struct strlist *, int); -STATIC int pmatch(char *, char *, int); +STATIC int pmatch(const char *, const char *, int); STATIC char *cvtnum(int, char *); STATIC int collate_range_cmp(int, int); @@ -271,8 +271,13 @@ while ((c = *p) != '\0') { switch(c) { - case CTLESC: - return (startp); + case CTLESC: /* This means CTL* are always considered quoted. */ + case CTLVAR: + case CTLENDVAR: + case CTLBACKQ: + case CTLBACKQ | CTLQUOTE: + case CTLARI: + case CTLENDARI: case CTLQUOTEMARK: return (startp); case ':': @@ -1338,7 +1343,7 @@ */ int -patmatch(char *pattern, char *string, int squoted) +patmatch(const char *pattern, const char *string, int squoted) { #ifdef notdef if (pattern[0] == '!' && pattern[1] == '!') @@ -1350,9 +1355,9 @@ STATIC int -pmatch(char *pattern, char *string, int squoted) +pmatch(const char *pattern, const char *string, int squoted) { - char *p, *q; + const char *p, *q; char c; p = pattern; @@ -1400,7 +1405,7 @@ } while (*q++ != '\0'); return 0; case '[': { - char *endp; + const char *endp; int invert, found; char chr; @@ -1504,7 +1509,7 @@ */ int -casematch(union node *pattern, char *val) +casematch(union node *pattern, const char *val) { struct stackmark smark; int result; ==== //depot/projects/scottl-camlock/src/bin/sh/expand.h#2 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * @(#)expand.h 8.2 (Berkeley) 5/4/95 - * $FreeBSD: src/bin/sh/expand.h,v 1.12 2004/04/06 20:06:51 markm Exp $ + * $FreeBSD: src/bin/sh/expand.h,v 1.13 2009/12/24 18:41:14 jilles Exp $ */ struct strlist { @@ -58,7 +58,7 @@ void expandhere(union node *, int); void expandarg(union node *, struct arglist *, int); void expari(int); -int patmatch(char *, char *, int); +int patmatch(const char *, const char *, int); void rmescapes(char *); -int casematch(union node *, char *); +int casematch(union node *, const char *); int wordexpcmd(int, char **); ==== //depot/projects/scottl-camlock/src/bin/sh/histedit.c#5 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/histedit.c,v 1.32 2009/11/21 14:28:32 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/histedit.c,v 1.33 2009/12/24 18:41:14 jilles Exp $"); #include #include @@ -406,7 +406,7 @@ } int -not_fcnumber(char *s) +not_fcnumber(const char *s) { if (s == NULL) return (0); @@ -416,10 +416,10 @@ } int -str_to_event(char *str, int last) +str_to_event(const char *str, int last) { HistEvent he; - char *s = str; + const char *s = str; int relative = 0; int i, retval; ==== //depot/projects/scottl-camlock/src/bin/sh/input.c#5 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/input.c,v 1.27 2009/11/22 14:04:20 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/input.c,v 1.28 2009/12/24 18:41:14 jilles Exp $"); #include /* defines BUFSIZ */ #include @@ -401,7 +401,7 @@ */ void -setinputfile(char *fname, int push) +setinputfile(const char *fname, int push) { int fd; int fd2; ==== //depot/projects/scottl-camlock/src/bin/sh/input.h#4 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * @(#)input.h 8.2 (Berkeley) 5/4/95 - * $FreeBSD: src/bin/sh/input.h,v 1.11 2009/11/22 14:04:20 jilles Exp $ + * $FreeBSD: src/bin/sh/input.h,v 1.12 2009/12/24 18:41:14 jilles Exp $ */ /* PEOF (the end of file marker) is defined in syntax.h */ @@ -54,7 +54,7 @@ void pungetc(void); void pushstring(char *, int, void *); void popstring(void); -void setinputfile(char *, int); +void setinputfile(const char *, int); void setinputfd(int, int); void setinputstring(char *, int); void popfile(void); ==== //depot/projects/scottl-camlock/src/bin/sh/jobs.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.73 2009/11/21 14:28:32 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.74 2009/12/25 20:21:35 jilles Exp $"); #include #include @@ -757,6 +757,7 @@ TRACE(("Child shell %d\n", (int)getpid())); wasroot = rootshell; rootshell = 0; + handler = &main_handler; closescript(); INTON; clear_traps(); ==== //depot/projects/scottl-camlock/src/bin/sh/mail.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/mail.c,v 1.14 2005/08/13 08:26:58 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/mail.c,v 1.15 2009/12/24 18:41:14 jilles Exp $"); /* * Routines to check for mail. (Perhaps make part of main.c?) @@ -72,7 +72,7 @@ chkmail(int silent) { int i; - char *mpath; + const char *mpath; char *p; char *q; struct stackmark smark; ==== //depot/projects/scottl-camlock/src/bin/sh/main.c#4 (text+ko) ==== @@ -42,7 +42,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/main.c,v 1.32 2009/11/21 14:28:32 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/main.c,v 1.35 2009/12/25 20:21:35 jilles Exp $"); #include #include @@ -75,6 +75,7 @@ int rootpid; int rootshell; +struct jmploc main_handler; STATIC void read_profile(char *); STATIC char *find_dot_file(char *); @@ -90,14 +91,13 @@ int main(int argc, char *argv[]) { - struct jmploc jmploc; struct stackmark smark; volatile int state; char *shinit; (void) setlocale(LC_ALL, ""); state = 0; - if (setjmp(jmploc.loc)) { + if (setjmp(main_handler.loc)) { /* * When a shell procedure is executed, we raise the * exception EXSHELLPROC to clean up before executing @@ -143,7 +143,7 @@ else goto state4; } - handler = &jmploc; + handler = &main_handler; #ifdef DEBUG opentrace(); trputs("Shell args: "); trargs(argv); @@ -269,7 +269,7 @@ */ void -readcmdfile(char *name) +readcmdfile(const char *name) { int fd; @@ -296,7 +296,7 @@ { static char localname[FILENAME_MAX+1]; char *fullname; - char *path = pathval(); + const char *path = pathval(); struct stat statb; /* don't try this for absolute or relative paths */ @@ -315,7 +315,6 @@ int dotcmd(int argc, char **argv) { - struct strlist *sp; char *fullname; if (argc < 2) @@ -323,9 +322,6 @@ exitstatus = 0; - for (sp = cmdenviron; sp ; sp = sp->next) - setvareq(savestr(sp->text), VSTRFIXED|VTEXTFIXED); - fullname = find_dot_file(argv[1]); setinputfile(fullname, 1); commandname = fullname; ==== //depot/projects/scottl-camlock/src/bin/sh/main.h#2 (text+ko) ==== @@ -30,13 +30,14 @@ * SUCH DAMAGE. * * @(#)main.h 8.2 (Berkeley) 5/4/95 - * $FreeBSD: src/bin/sh/main.h,v 1.8 2004/04/06 20:06:51 markm Exp $ + * $FreeBSD: src/bin/sh/main.h,v 1.10 2009/12/25 20:21:35 jilles Exp $ */ extern int rootpid; /* pid of main shell */ extern int rootshell; /* true if we aren't a child of the main shell */ +extern struct jmploc main_handler; /* top level exception handler */ -void readcmdfile(char *); +void readcmdfile(const char *); void cmdloop(int); int dotcmd(int, char **); int exitcmd(int, char **); ==== //depot/projects/scottl-camlock/src/bin/sh/memalloc.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/memalloc.c,v 1.28 2009/06/01 10:50:17 rse Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/memalloc.c,v 1.29 2009/12/24 18:41:14 jilles Exp $"); #include #include "shell.h" @@ -95,7 +95,7 @@ */ char * -savestr(char *s) +savestr(const char *s) { char *p; ==== //depot/projects/scottl-camlock/src/bin/sh/memalloc.h#3 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * @(#)memalloc.h 8.2 (Berkeley) 5/4/95 - * $FreeBSD: src/bin/sh/memalloc.h,v 1.11 2009/06/01 10:50:17 rse Exp $ + * $FreeBSD: src/bin/sh/memalloc.h,v 1.12 2009/12/24 18:41:14 jilles Exp $ */ #include @@ -51,7 +51,7 @@ pointer ckmalloc(size_t); pointer ckrealloc(pointer, int); void ckfree(pointer); -char *savestr(char *); +char *savestr(const char *); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Dec 26 12:16:36 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E60FF1065672; Sat, 26 Dec 2009 12:16:35 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A9CB6106566B for ; Sat, 26 Dec 2009 12:16:35 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9619F8FC1F for ; Sat, 26 Dec 2009 12:16:35 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nBQCGZ5J079202 for ; Sat, 26 Dec 2009 12:16:35 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nBQCGZ72079198 for perforce@freebsd.org; Sat, 26 Dec 2009 12:16:35 GMT (envelope-from trasz@freebsd.org) Date: Sat, 26 Dec 2009 12:16:35 GMT Message-Id: <200912261216.nBQCGZ72079198@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 172260 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Dec 2009 12:16:36 -0000 http://p4web.freebsd.org/chv.cgi?CH=172260 Change 172260 by trasz@trasz_victim on 2009/12/26 12:15:57 IFC. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/UPDATING#47 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/setfacl/merge.c#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/setfacl/remove.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/setfacl/setfacl.h#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/setfacl/util.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/alias.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/alias.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/arith.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/arith.y#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/cd.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/error.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/error.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/exec.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/exec.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/expand.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/expand.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/histedit.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/input.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/input.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/jobs.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/mail.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/main.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/main.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/memalloc.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/memalloc.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/myhistedit.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/options.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/options.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/output.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/output.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/parser.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/parser.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/show.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/show.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/trap.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/var.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/var.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/pf/man/pf.conf.5#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/pf/pfctl/parse.y#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/pf/pfctl/pf_print_state.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/pf/pfctl/pfctl_parser.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/contrib/top/username.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/include/signal.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/posix1e/acl_delete_entry.c#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libc/stdtime/tzfile.5#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libpmc/Makefile#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libpmc/libpmc.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libpmc/pmc.xscale.3#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/lib/libstand/bzipfs.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libstand/gzipfs.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libulog/ulog_pututxline.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/libexec/atrun/atrun.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/libexec/talkd/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/libexec/talkd/process.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/nfsiod/nfsiod.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/nfsiod/nfsiod.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/Makefile#30 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/gem.4#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/mk48txx.4#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man4/ste.4#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/Makefile#23 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/usbdi.9#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/asia#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/europe#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/zoneinfo/zone.tab#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/conf/AVILA#16 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/conf/CAMBRIA#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/include/pmc_mdep.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/xscale/ixp425/files.ixp425#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/common/dev_net.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/i386/Makefile#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/sparc64/loader/main.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cam/ata/ata_da.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files.arm#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files.sun4v#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/pf/net/if_pfsync.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/pf/net/if_pfsync.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/pf/net/pf.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/contrib/pf/net/pfvar.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ae/if_ae.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ahci/ahci.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/ata-pci.h#19 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/chipsets/ata-intel.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/auxio/auxio.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hwpmc/hwpmc_arm.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hwpmc/hwpmc_xscale.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hwpmc/hwpmc_xscale.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hwpmc/pmc_events.h#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/jme/if_jme.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mc146818/mc146818.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mc146818/mc146818reg.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mc146818/mc146818var.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mk48txx/mk48txx.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mk48txx/mk48txxreg.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mk48txx/mk48txxvar.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mxge/if_mxge.c#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ste/if_ste.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ste/if_stereg.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/twe/twe.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/twe/twe_freebsd.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/twe/twevar.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/uart/uart_bus_ebus.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/uart/uart_cpu_sparc64.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/quirk/usb_quirk.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/quirk/usb_quirk.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/storage/umass.c#14 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/usbdevs#37 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/vge/if_vge.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfs/nfs_commonacl.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfs/nfs_var.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfsserver/nfs_nfsdport.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/nfsserver/nfs_nfsdserv.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/concat/g_concat.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/geom_dev.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/mirror/g_mirror.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/raid3/g_raid3.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/stripe/g_stripe.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ia64/ia64/clock.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ia64/ia64/machdep.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ia64/include/clock.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ia64/include/mca.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ia64/include/md_var.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_proc.c#23 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_rmlock.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_nfs4.c#54 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_acl_posix1e.c#19 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_subr.c#45 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_bridge.c#18 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_ethersubr.c#18 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/netisr.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_ipfw.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_ipfw.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip_dummynet.h#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip_fw.h#15 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ipfw/ip_dummynet.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ipfw/ip_fw2.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ipfw/ip_fw_log.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ipfw/ip_fw_nat.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ipfw/ip_fw_pfil.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ipfw/ip_fw_private.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ipfw/ip_fw_sockopt.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ipfw/ip_fw_table.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_usrreq.c#16 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/mld6.c#18 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/mld6_var.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/central/central.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/ebus/ebus.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/fhc/fhc.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/include/bus_common.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/include/intr_machdep.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/include/iommureg.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/include/iommuvar.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/isa/ofw_isa.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/pci/apb.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/pci/ofw_pci.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/pci/ofw_pcib.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/pci/ofw_pcibus.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/pci/psycho.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/pci/schizo.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/sbus/dma_sbus.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/sbus/sbus.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/sparc64/eeprom.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/sparc64/identcpu.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/sparc64/interrupt.S#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/sparc64/intr_machdep.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/sparc64/iommu.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/sparc64/nexus.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/sparc64/ofw_machdep.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/sparc64/rtc.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/sparc64/upa.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sun4v/conf/NOTES#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/acl.h#39 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/disk.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bin/sh/builtins/fc2.0#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/README#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/notescheck/Makefile#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/tools/notescheck/notescheck.py#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/killall/killall.1#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/rwho/rwho.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/truss/syscalls.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/unzip/unzip.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/apm/apm.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/apm/apm.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_scalars.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/diskinfo/diskinfo.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/diskinfo/diskinfo.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/service/service.8#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/syslogd/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/syslogd/syslogd.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/zic/Theory#4 integrate Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/UPDATING#47 (text+ko) ==== @@ -161,7 +161,7 @@ 20090712: Padding has been added to struct tcpcb, sackhint and tcpstat in to facilitate future MFCs and bug fixes whilst - maintainig the ABI. However, this change breaks the ABI, so bump + maintaining the ABI. However, this change breaks the ABI, so bump __FreeBSD_version to 800102. User space tools that rely on the size of any of these structs (e.g. sockstat) need to be recompiled. @@ -895,7 +895,7 @@ ------------- Avoid using make -j when upgrading. While generally safe, there are sometimes problems using -j to upgrade. If your upgrade fails with - -j, please try again wtihout -j. From time to time in the past there + -j, please try again without -j. From time to time in the past there have been problems using -j with buildworld and/or installworld. This is especially true when upgrading between "distant" versions (eg one that cross a major release boundary or several minor releases, or when @@ -1089,4 +1089,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.649 2009/12/18 16:35:28 ume Exp $ +$FreeBSD: src/UPDATING,v 1.650 2009/12/25 21:14:34 ru Exp $ ==== //depot/projects/soc2008/trasz_nfs4acl/bin/setfacl/merge.c#13 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/bin/setfacl/merge.c,v 1.9 2009/09/07 16:19:32 trasz Exp $"); +__FBSDID("$FreeBSD: src/bin/setfacl/merge.c,v 1.10 2009/12/26 10:06:45 trasz Exp $"); #include #include @@ -100,11 +100,10 @@ acl_get_brand_np(acl, &acl_brand); acl_get_brand_np(*prev_acl, &prev_acl_brand); - if (acl_brand != prev_acl_brand) { + if (branding_mismatch(acl_brand, prev_acl_brand)) { warnx("%s: branding mismatch; existing ACL is %s, " "entry to be merged is %s", filename, - prev_acl_brand == ACL_BRAND_NFS4 ? "NFSv4" : "POSIX.1e", - acl_brand == ACL_BRAND_NFS4 ? "NFSv4" : "POSIX.1e"); + brand_name(prev_acl_brand), brand_name(acl_brand)); return (-1); } @@ -252,9 +251,10 @@ return (-1); } - if (acl_brand != ACL_BRAND_NFS4) { + if (branding_mismatch(acl_brand, ACL_BRAND_NFS4)) { warnx("%s: branding mismatch; existing ACL is NFSv4, " - "entry to be added is POSIX.1e", filename); + "entry to be added is %s", filename, + brand_name(acl_brand)); return (-1); } ==== //depot/projects/soc2008/trasz_nfs4acl/bin/setfacl/remove.c#9 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/bin/setfacl/remove.c,v 1.7 2009/09/07 16:19:32 trasz Exp $"); +__FBSDID("$FreeBSD: src/bin/setfacl/remove.c,v 1.8 2009/12/26 10:06:45 trasz Exp $"); #include #include @@ -53,11 +53,10 @@ acl_get_brand_np(acl, &acl_brand); acl_get_brand_np(*prev_acl, &prev_acl_brand); - if (acl_brand != prev_acl_brand) { + if (branding_mismatch(acl_brand, prev_acl_brand)) { warnx("%s: branding mismatch; existing ACL is %s, " "entry to be removed is %s", filename, - prev_acl_brand == ACL_BRAND_NFS4 ? "NFSv4" : "POSIX.1e", - acl_brand == ACL_BRAND_NFS4 ? "NFSv4" : "POSIX.1e"); + brand_name(prev_acl_brand), brand_name(acl_brand)); return (-1); } ==== //depot/projects/soc2008/trasz_nfs4acl/bin/setfacl/setfacl.h#7 (text+ko) ==== @@ -23,7 +23,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/bin/setfacl/setfacl.h,v 1.6 2009/09/07 16:19:32 trasz Exp $ + * $FreeBSD: src/bin/setfacl/setfacl.h,v 1.7 2009/12/26 10:06:45 trasz Exp $ */ #ifndef _SETFACL_H @@ -71,6 +71,8 @@ int set_acl_mask(acl_t *prev_acl, const char *filename); /* util.c */ void *zmalloc(size_t size); +const char *brand_name(int brand); +int branding_mismatch(int brand1, int brand2); uint have_mask; uint need_mask; ==== //depot/projects/soc2008/trasz_nfs4acl/bin/setfacl/util.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/bin/setfacl/util.c,v 1.6 2005/01/10 08:39:25 imp Exp $"); +__FBSDID("$FreeBSD: src/bin/setfacl/util.c,v 1.8 2009/12/26 11:03:10 trasz Exp $"); #include #include @@ -43,3 +43,26 @@ err(1, "calloc() failed"); return (ptr); } + +const char * +brand_name(int brand) +{ + switch (brand) { + case ACL_BRAND_NFS4: + return "NFSv4"; + case ACL_BRAND_POSIX: + return "POSIX.1e"; + default: + return "unknown"; + } +} + +int +branding_mismatch(int brand1, int brand2) +{ + if (brand1 == ACL_BRAND_UNKNOWN || brand2 == ACL_BRAND_UNKNOWN) + return (0); + if (brand1 != brand2) + return (1); + return (0); +} ==== //depot/projects/soc2008/trasz_nfs4acl/bin/sh/alias.c#5 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/alias.c,v 1.25 2009/06/01 10:50:17 rse Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/alias.c,v 1.26 2009/12/24 18:41:14 jilles Exp $"); #include #include "shell.h" @@ -52,13 +52,13 @@ STATIC struct alias *atab[ATABSIZE]; STATIC int aliases; -STATIC void setalias(char *, char *); +STATIC void setalias(const char *, const char *); STATIC int unalias(const char *); STATIC struct alias **hashalias(const char *); STATIC void -setalias(char *name, char *val) +setalias(const char *name, const char *val) { struct alias *ap, **app; @@ -176,7 +176,7 @@ } struct alias * -lookupalias(char *name, int check) +lookupalias(const char *name, int check) { struct alias *ap = *hashalias(name); ==== //depot/projects/soc2008/trasz_nfs4acl/bin/sh/alias.h#2 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * @(#)alias.h 8.2 (Berkeley) 5/4/95 - * $FreeBSD: src/bin/sh/alias.h,v 1.8 2004/04/06 20:06:51 markm Exp $ + * $FreeBSD: src/bin/sh/alias.h,v 1.9 2009/12/24 18:41:14 jilles Exp $ */ #define ALIASINUSE 1 @@ -42,7 +42,7 @@ int flag; }; -struct alias *lookupalias(char *, int); +struct alias *lookupalias(const char *, int); int aliascmd(int, char **); int unaliascmd(int, char **); void rmaliases(void); ==== //depot/projects/soc2008/trasz_nfs4acl/bin/sh/arith.h#2 (text+ko) ==== @@ -27,15 +27,15 @@ * SUCH DAMAGE. * * @(#)arith.h 1.1 (Berkeley) 5/4/95 - * $FreeBSD: src/bin/sh/arith.h,v 1.12 2008/04/27 20:46:45 stefanf Exp $ + * $FreeBSD: src/bin/sh/arith.h,v 1.13 2009/12/24 18:41:14 jilles Exp $ */ #include "shell.h" #define DIGITS(var) (3 + (2 + CHAR_BIT * sizeof((var))) / 3) -extern char *arith_buf, *arith_startbuf; +extern const char *arith_buf, *arith_startbuf; -arith_t arith(char *); +arith_t arith(const char *); void arith_lex_reset(void); int expcmd(int, char **); ==== //depot/projects/soc2008/trasz_nfs4acl/bin/sh/arith.y#2 (text+ko) ==== @@ -38,7 +38,7 @@ #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/arith.y,v 1.22 2008/04/27 20:46:45 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/arith.y,v 1.23 2009/12/24 18:41:14 jilles Exp $"); #include #include @@ -265,7 +265,7 @@ #define YYPARSE_PARAM_TYPE arith_t * #define YYPARSE_PARAM result -char *arith_buf, *arith_startbuf; +const char *arith_buf, *arith_startbuf; int yylex(void); int yyparse(YYPARSE_PARAM_TYPE); @@ -284,7 +284,7 @@ } arith_t -arith(char *s) +arith(const char *s) { arith_t result; @@ -299,7 +299,7 @@ } static void -yyerror(char *s) +yyerror(const char *s) { yyerrok; @@ -354,7 +354,7 @@ printf("%d\n", exp(argv[1])); } -error(char *s) +error(const char *s) { fprintf(stderr, "exp: %s\n", s); exit(1); ==== //depot/projects/soc2008/trasz_nfs4acl/bin/sh/cd.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/cd.c,v 1.37 2009/11/21 14:53:22 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/cd.c,v 1.38 2009/12/24 18:41:14 jilles Exp $"); #include #include @@ -80,7 +80,7 @@ cdcmd(int argc, char **argv) { char *dest; - char *path; + const char *path; char *p; struct stat statb; int ch, phys, print = 0; ==== //depot/projects/soc2008/trasz_nfs4acl/bin/sh/error.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/error.c,v 1.27 2009/11/22 18:23:30 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/error.c,v 1.28 2009/12/24 20:55:14 jilles Exp $"); /* * Errors and exceptions. @@ -67,7 +67,7 @@ char *commandname; -static void exverror(int, const char *, va_list) __printf0like(2, 0); +static void exverror(int, const char *, va_list) __printf0like(2, 0) __dead2; /* * Called to raise an exception. Since C doesn't include exceptions, we ==== //depot/projects/soc2008/trasz_nfs4acl/bin/sh/error.h#3 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * @(#)error.h 8.2 (Berkeley) 5/4/95 - * $FreeBSD: src/bin/sh/error.h,v 1.18 2009/11/22 18:23:30 jilles Exp $ + * $FreeBSD: src/bin/sh/error.h,v 1.19 2009/12/24 20:55:14 jilles Exp $ */ /* @@ -78,10 +78,10 @@ #define CLEAR_PENDING_INT intpending = 0 #define int_pending() intpending -void exraise(int); +void exraise(int) __dead2; void onint(void); -void error(const char *, ...) __printf0like(1, 2); -void exerror(int, const char *, ...) __printf0like(2, 3); +void error(const char *, ...) __printf0like(1, 2) __dead2; +void exerror(int, const char *, ...) __printf0like(2, 3) __dead2; /* ==== //depot/projects/soc2008/trasz_nfs4acl/bin/sh/exec.c#7 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/exec.c,v 1.37 2009/10/06 22:00:14 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/exec.c,v 1.38 2009/12/24 18:41:14 jilles Exp $"); #include #include @@ -98,7 +98,7 @@ STATIC void tryexec(char *, char **, char **); STATIC void printentry(struct tblentry *, int); -STATIC struct tblentry *cmdlookup(char *, int); +STATIC struct tblentry *cmdlookup(const char *, int); STATIC void delete_cmd_entry(void); @@ -109,7 +109,7 @@ */ void -shellexec(char **argv, char **envp, char *path, int index) +shellexec(char **argv, char **envp, const char *path, int index) { char *cmdname; int e; @@ -175,13 +175,13 @@ * NULL. */ -char *pathopt; +const char *pathopt; char * -padvance(char **path, char *name) +padvance(const char **path, const char *name) { - char *p, *q; - char *start; + const char *p, *start; + char *q; int len; if (*path == NULL) @@ -269,7 +269,7 @@ printentry(struct tblentry *cmdp, int verbose) { int index; - char *path; + const char *path; char *name; if (cmdp->cmdtype == CMDNORMAL) { @@ -310,7 +310,8 @@ */ void -find_command(char *name, struct cmdentry *entry, int printerr, char *path) +find_command(const char *name, struct cmdentry *entry, int printerr, + const char *path) { struct tblentry *cmdp; int index; @@ -446,7 +447,7 @@ */ int -find_builtin(char *name, int *special) +find_builtin(const char *name, int *special) { const struct builtincmd *bp; @@ -608,10 +609,10 @@ STATIC struct tblentry * -cmdlookup(char *name, int add) +cmdlookup(const char *name, int add) { int hashval; - char *p; + const char *p; struct tblentry *cmdp; struct tblentry **pp; @@ -664,7 +665,7 @@ */ void -addcmdentry(char *name, struct cmdentry *entry) +addcmdentry(const char *name, struct cmdentry *entry) { struct tblentry *cmdp; @@ -684,7 +685,7 @@ */ void -defun(char *name, union node *func) +defun(const char *name, union node *func) { struct cmdentry entry; @@ -701,7 +702,7 @@ */ int -unsetfunc(char *name) +unsetfunc(const char *name) { struct tblentry *cmdp; @@ -767,7 +768,8 @@ switch (entry.cmdtype) { case CMDNORMAL: { if (strchr(argv[i], '/') == NULL) { - char *path = pathval(), *name; + const char *path = pathval(); + char *name; int j = entry.u.index; do { name = padvance(&path, argv[i]); ==== //depot/projects/soc2008/trasz_nfs4acl/bin/sh/exec.h#3 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * @(#)exec.h 8.3 (Berkeley) 6/8/95 - * $FreeBSD: src/bin/sh/exec.h,v 1.16 2009/08/23 21:09:46 jilles Exp $ + * $FreeBSD: src/bin/sh/exec.h,v 1.18 2009/12/24 20:55:14 jilles Exp $ */ /* values of cmdtype */ @@ -57,20 +57,20 @@ }; -extern char *pathopt; /* set by padvance */ +extern const char *pathopt; /* set by padvance */ extern int exerrno; /* last exec error */ -void shellexec(char **, char **, char *, int); -char *padvance(char **, char *); +void shellexec(char **, char **, const char *, int) __dead2; +char *padvance(const char **, const char *); int hashcmd(int, char **); -void find_command(char *, struct cmdentry *, int, char *); -int find_builtin(char *, int *); +void find_command(const char *, struct cmdentry *, int, const char *); +int find_builtin(const char *, int *); void hashcd(void); void changepath(const char *); void deletefuncs(void); -void addcmdentry(char *, struct cmdentry *); -void defun(char *, union node *); -int unsetfunc(char *); +void addcmdentry(const char *, struct cmdentry *); +void defun(const char *, union node *); +int unsetfunc(const char *); int typecmd_impl(int, char **, int); int typecmd(int, char **); void clearcmdentry(int); ==== //depot/projects/soc2008/trasz_nfs4acl/bin/sh/expand.c#4 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.56 2009/10/24 21:20:04 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.58 2009/12/25 15:29:18 jilles Exp $"); #include #include @@ -107,7 +107,7 @@ STATIC void addfname(char *); STATIC struct strlist *expsort(struct strlist *); STATIC struct strlist *msort(struct strlist *, int); -STATIC int pmatch(char *, char *, int); +STATIC int pmatch(const char *, const char *, int); STATIC char *cvtnum(int, char *); STATIC int collate_range_cmp(int, int); @@ -271,8 +271,13 @@ while ((c = *p) != '\0') { switch(c) { - case CTLESC: - return (startp); + case CTLESC: /* This means CTL* are always considered quoted. */ + case CTLVAR: + case CTLENDVAR: + case CTLBACKQ: + case CTLBACKQ | CTLQUOTE: + case CTLARI: + case CTLENDARI: case CTLQUOTEMARK: return (startp); case ':': @@ -1338,7 +1343,7 @@ */ int -patmatch(char *pattern, char *string, int squoted) +patmatch(const char *pattern, const char *string, int squoted) { #ifdef notdef if (pattern[0] == '!' && pattern[1] == '!') @@ -1350,9 +1355,9 @@ STATIC int -pmatch(char *pattern, char *string, int squoted) +pmatch(const char *pattern, const char *string, int squoted) { - char *p, *q; + const char *p, *q; char c; p = pattern; @@ -1400,7 +1405,7 @@ } while (*q++ != '\0'); return 0; case '[': { - char *endp; + const char *endp; int invert, found; char chr; @@ -1504,7 +1509,7 @@ */ int -casematch(union node *pattern, char *val) +casematch(union node *pattern, const char *val) { struct stackmark smark; int result; ==== //depot/projects/soc2008/trasz_nfs4acl/bin/sh/expand.h#2 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * @(#)expand.h 8.2 (Berkeley) 5/4/95 - * $FreeBSD: src/bin/sh/expand.h,v 1.12 2004/04/06 20:06:51 markm Exp $ + * $FreeBSD: src/bin/sh/expand.h,v 1.13 2009/12/24 18:41:14 jilles Exp $ */ struct strlist { @@ -58,7 +58,7 @@ void expandhere(union node *, int); void expandarg(union node *, struct arglist *, int); void expari(int); -int patmatch(char *, char *, int); +int patmatch(const char *, const char *, int); void rmescapes(char *); -int casematch(union node *, char *); +int casematch(union node *, const char *); int wordexpcmd(int, char **); ==== //depot/projects/soc2008/trasz_nfs4acl/bin/sh/histedit.c#5 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/histedit.c,v 1.32 2009/11/21 14:28:32 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/histedit.c,v 1.33 2009/12/24 18:41:14 jilles Exp $"); #include #include @@ -406,7 +406,7 @@ } int -not_fcnumber(char *s) +not_fcnumber(const char *s) { if (s == NULL) return (0); @@ -416,10 +416,10 @@ } int -str_to_event(char *str, int last) +str_to_event(const char *str, int last) { HistEvent he; - char *s = str; + const char *s = str; int relative = 0; int i, retval; ==== //depot/projects/soc2008/trasz_nfs4acl/bin/sh/input.c#4 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/input.c,v 1.27 2009/11/22 14:04:20 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/input.c,v 1.28 2009/12/24 18:41:14 jilles Exp $"); #include /* defines BUFSIZ */ #include @@ -401,7 +401,7 @@ */ void -setinputfile(char *fname, int push) +setinputfile(const char *fname, int push) { int fd; int fd2; ==== //depot/projects/soc2008/trasz_nfs4acl/bin/sh/input.h#4 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * @(#)input.h 8.2 (Berkeley) 5/4/95 - * $FreeBSD: src/bin/sh/input.h,v 1.11 2009/11/22 14:04:20 jilles Exp $ + * $FreeBSD: src/bin/sh/input.h,v 1.12 2009/12/24 18:41:14 jilles Exp $ */ /* PEOF (the end of file marker) is defined in syntax.h */ @@ -54,7 +54,7 @@ void pungetc(void); void pushstring(char *, int, void *); void popstring(void); -void setinputfile(char *, int); +void setinputfile(const char *, int); void setinputfd(int, int); void setinputstring(char *, int); void popfile(void); ==== //depot/projects/soc2008/trasz_nfs4acl/bin/sh/jobs.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.73 2009/11/21 14:28:32 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.74 2009/12/25 20:21:35 jilles Exp $"); #include #include @@ -757,6 +757,7 @@ TRACE(("Child shell %d\n", (int)getpid())); wasroot = rootshell; rootshell = 0; + handler = &main_handler; closescript(); INTON; clear_traps(); ==== //depot/projects/soc2008/trasz_nfs4acl/bin/sh/mail.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/mail.c,v 1.14 2005/08/13 08:26:58 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/mail.c,v 1.15 2009/12/24 18:41:14 jilles Exp $"); /* * Routines to check for mail. (Perhaps make part of main.c?) @@ -72,7 +72,7 @@ chkmail(int silent) { int i; - char *mpath; + const char *mpath; char *p; char *q; struct stackmark smark; ==== //depot/projects/soc2008/trasz_nfs4acl/bin/sh/main.c#5 (text+ko) ==== @@ -42,7 +42,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/main.c,v 1.32 2009/11/21 14:28:32 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/main.c,v 1.35 2009/12/25 20:21:35 jilles Exp $"); #include #include @@ -75,6 +75,7 @@ int rootpid; int rootshell; +struct jmploc main_handler; STATIC void read_profile(char *); STATIC char *find_dot_file(char *); @@ -90,14 +91,13 @@ int main(int argc, char *argv[]) { - struct jmploc jmploc; struct stackmark smark; volatile int state; char *shinit; (void) setlocale(LC_ALL, ""); state = 0; - if (setjmp(jmploc.loc)) { + if (setjmp(main_handler.loc)) { /* * When a shell procedure is executed, we raise the * exception EXSHELLPROC to clean up before executing @@ -143,7 +143,7 @@ else goto state4; } - handler = &jmploc; + handler = &main_handler; #ifdef DEBUG opentrace(); trputs("Shell args: "); trargs(argv); @@ -269,7 +269,7 @@ */ void -readcmdfile(char *name) +readcmdfile(const char *name) { int fd; @@ -296,7 +296,7 @@ { static char localname[FILENAME_MAX+1]; char *fullname; - char *path = pathval(); + const char *path = pathval(); struct stat statb; /* don't try this for absolute or relative paths */ @@ -315,7 +315,6 @@ int dotcmd(int argc, char **argv) { - struct strlist *sp; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Dec 26 12:23:43 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 95B6E1065693; Sat, 26 Dec 2009 12:23:43 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 59817106568D for ; Sat, 26 Dec 2009 12:23:43 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 45ECF8FC14 for ; Sat, 26 Dec 2009 12:23:43 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id nBQCNh5m079718 for ; Sat, 26 Dec 2009 12:23:43 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id nBQCNgiI079716 for perforce@freebsd.org; Sat, 26 Dec 2009 12:23:42 GMT (envelope-from trasz@freebsd.org) Date: Sat, 26 Dec 2009 12:23:42 GMT Message-Id: <200912261223.nBQCNgiI079716@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 172261 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Dec 2009 12:23:43 -0000 http://p4web.freebsd.org/chv.cgi?CH=172261 Change 172261 by trasz@trasz_victim on 2009/12/26 12:23:11 HRL. Affected files ... .. //depot/projects/soc2009/trasz_limits/UPDATING#18 integrate .. //depot/projects/soc2009/trasz_limits/bin/setfacl/merge.c#3 integrate .. //depot/projects/soc2009/trasz_limits/bin/setfacl/remove.c#3 integrate .. //depot/projects/soc2009/trasz_limits/bin/setfacl/setfacl.h#3 integrate .. //depot/projects/soc2009/trasz_limits/bin/setfacl/util.c#2 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/alias.c#3 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/alias.h#2 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/arith.h#2 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/arith.y#2 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/cd.c#3 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/error.c#3 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/error.h#3 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/exec.c#6 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/exec.h#3 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/expand.c#4 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/expand.h#2 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/histedit.c#5 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/input.c#5 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/input.h#4 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/jobs.c#3 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/mail.c#2 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/main.c#5 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/main.h#2 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/memalloc.c#3 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/memalloc.h#3 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/myhistedit.h#2 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/options.c#2 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/options.h#2 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/output.c#4 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/output.h#3 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/parser.c#6 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/parser.h#2 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/show.c#2 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/show.h#2 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/trap.h#3 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/var.c#5 integrate .. //depot/projects/soc2009/trasz_limits/bin/sh/var.h#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/pf/man/pf.conf.5#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/pf/pfctl/parse.y#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/pf/pfctl/pf_print_state.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/pf/pfctl/pfctl_parser.c#2 integrate .. //depot/projects/soc2009/trasz_limits/contrib/top/username.c#2 integrate .. //depot/projects/soc2009/trasz_limits/include/signal.h#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/posix1e/acl_delete_entry.c#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/libc/stdtime/tzfile.5#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/libpmc/Makefile#3 integrate .. //depot/projects/soc2009/trasz_limits/lib/libpmc/libpmc.c#4 integrate .. //depot/projects/soc2009/trasz_limits/lib/libpmc/pmc.xscale.3#1 branch .. //depot/projects/soc2009/trasz_limits/lib/libstand/bzipfs.c#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libstand/gzipfs.c#2 integrate .. //depot/projects/soc2009/trasz_limits/lib/libulog/ulog_pututxline.c#2 integrate .. //depot/projects/soc2009/trasz_limits/libexec/atrun/atrun.c#2 integrate .. //depot/projects/soc2009/trasz_limits/libexec/talkd/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/libexec/talkd/process.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sbin/nfsiod/nfsiod.8#2 integrate .. //depot/projects/soc2009/trasz_limits/sbin/nfsiod/nfsiod.c#2 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man4/Makefile#13 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man4/gem.4#3 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man4/mk48txx.4#1 branch .. //depot/projects/soc2009/trasz_limits/share/man/man4/ste.4#2 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man9/Makefile#12 integrate .. //depot/projects/soc2009/trasz_limits/share/man/man9/usbdi.9#3 integrate .. //depot/projects/soc2009/trasz_limits/share/zoneinfo/asia#9 integrate .. //depot/projects/soc2009/trasz_limits/share/zoneinfo/europe#5 integrate .. //depot/projects/soc2009/trasz_limits/share/zoneinfo/zone.tab#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/arm/conf/AVILA#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/arm/conf/CAMBRIA#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/arm/include/pmc_mdep.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/arm/xscale/ixp425/files.ixp425#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/boot/common/dev_net.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/boot/i386/Makefile#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/boot/sparc64/loader/main.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/cam/ata/ata_da.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/conf/files.arm#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/conf/files.sun4v#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/pf/net/if_pfsync.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/pf/net/if_pfsync.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/pf/net/pf.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/contrib/pf/net/pfvar.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ae/if_ae.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ahci/ahci.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ata/ata-pci.h#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ata/chipsets/ata-intel.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/auxio/auxio.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/hwpmc/hwpmc_arm.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/hwpmc/hwpmc_xscale.c#1 branch .. //depot/projects/soc2009/trasz_limits/sys/dev/hwpmc/hwpmc_xscale.h#1 branch .. //depot/projects/soc2009/trasz_limits/sys/dev/hwpmc/pmc_events.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/jme/if_jme.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/mc146818/mc146818.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/mc146818/mc146818reg.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/mc146818/mc146818var.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/mk48txx/mk48txx.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/mk48txx/mk48txxreg.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/mk48txx/mk48txxvar.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/mxge/if_mxge.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ste/if_ste.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/ste/if_stereg.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/twe/twe.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/twe/twe_freebsd.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/twe/twevar.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/uart/uart_bus_ebus.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/uart/uart_cpu_sparc64.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/quirk/usb_quirk.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/quirk/usb_quirk.h#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/storage/umass.c#11 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/usb/usbdevs#14 integrate .. //depot/projects/soc2009/trasz_limits/sys/dev/vge/if_vge.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/nfs/nfs_commonacl.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/nfs/nfs_var.h#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/nfsserver/nfs_nfsdport.c#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/fs/nfsserver/nfs_nfsdserv.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/geom/concat/g_concat.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/geom/geom_dev.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/geom/mirror/g_mirror.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/geom/raid3/g_raid3.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/geom/stripe/g_stripe.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/ia64/ia64/clock.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/ia64/ia64/machdep.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/ia64/include/clock.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/ia64/include/mca.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/ia64/include/md_var.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_proc.c#10 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/kern_rmlock.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/subr_acl_nfs4.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/subr_acl_posix1e.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/kern/vfs_subr.c#11 integrate .. //depot/projects/soc2009/trasz_limits/sys/net/if_bridge.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/net/if_ethersubr.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/net/netisr.c#8 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_ipfw.c#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/netgraph/ng_ipfw.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/ip_dummynet.h#5 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/ip_fw.h#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/ipfw/ip_dummynet.c#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/ipfw/ip_fw2.c#9 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/ipfw/ip_fw_log.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/ipfw/ip_fw_nat.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/ipfw/ip_fw_pfil.c#6 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/ipfw/ip_fw_private.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/ipfw/ip_fw_sockopt.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/ipfw/ip_fw_table.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/tcp.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet/tcp_usrreq.c#7 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet6/mld6.c#10 integrate .. //depot/projects/soc2009/trasz_limits/sys/netinet6/mld6_var.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sparc64/central/central.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/sparc64/ebus/ebus.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sparc64/fhc/fhc.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/sparc64/include/bus_common.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sparc64/include/intr_machdep.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sparc64/include/iommureg.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sparc64/include/iommuvar.h#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sparc64/isa/ofw_isa.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sparc64/pci/apb.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/sparc64/pci/ofw_pci.h#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/sparc64/pci/ofw_pcib.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/sparc64/pci/ofw_pcibus.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sparc64/pci/psycho.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/sparc64/pci/schizo.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/sparc64/sbus/dma_sbus.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sparc64/sbus/sbus.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/sparc64/sparc64/eeprom.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sparc64/sparc64/identcpu.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sparc64/sparc64/interrupt.S#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sparc64/sparc64/intr_machdep.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sparc64/sparc64/iommu.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sparc64/sparc64/nexus.c#3 integrate .. //depot/projects/soc2009/trasz_limits/sys/sparc64/sparc64/ofw_machdep.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sparc64/sparc64/rtc.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sparc64/sparc64/upa.c#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sun4v/conf/NOTES#2 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/acl.h#4 integrate .. //depot/projects/soc2009/trasz_limits/sys/sys/disk.h#3 integrate .. //depot/projects/soc2009/trasz_limits/tools/regression/bin/sh/builtins/fc2.0#1 branch .. //depot/projects/soc2009/trasz_limits/tools/tools/README#5 integrate .. //depot/projects/soc2009/trasz_limits/tools/tools/notescheck/Makefile#1 branch .. //depot/projects/soc2009/trasz_limits/tools/tools/notescheck/notescheck.py#1 branch .. //depot/projects/soc2009/trasz_limits/usr.bin/killall/killall.1#3 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/rwho/rwho.c#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/truss/syscalls.c#4 integrate .. //depot/projects/soc2009/trasz_limits/usr.bin/unzip/unzip.c#3 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/apm/apm.8#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/apm/apm.c#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/bsnmpd/modules/snmp_hostres/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_scalars.c#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.c#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/diskinfo/diskinfo.8#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/diskinfo/diskinfo.c#3 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/service/service.8#3 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/syslogd/Makefile#2 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/syslogd/syslogd.c#3 integrate .. //depot/projects/soc2009/trasz_limits/usr.sbin/zic/Theory#4 integrate Differences ... ==== //depot/projects/soc2009/trasz_limits/UPDATING#18 (text+ko) ==== @@ -161,7 +161,7 @@ 20090712: Padding has been added to struct tcpcb, sackhint and tcpstat in to facilitate future MFCs and bug fixes whilst - maintainig the ABI. However, this change breaks the ABI, so bump + maintaining the ABI. However, this change breaks the ABI, so bump __FreeBSD_version to 800102. User space tools that rely on the size of any of these structs (e.g. sockstat) need to be recompiled. @@ -895,7 +895,7 @@ ------------- Avoid using make -j when upgrading. While generally safe, there are sometimes problems using -j to upgrade. If your upgrade fails with - -j, please try again wtihout -j. From time to time in the past there + -j, please try again without -j. From time to time in the past there have been problems using -j with buildworld and/or installworld. This is especially true when upgrading between "distant" versions (eg one that cross a major release boundary or several minor releases, or when @@ -1089,4 +1089,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.649 2009/12/18 16:35:28 ume Exp $ +$FreeBSD: src/UPDATING,v 1.650 2009/12/25 21:14:34 ru Exp $ ==== //depot/projects/soc2009/trasz_limits/bin/setfacl/merge.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/bin/setfacl/merge.c,v 1.9 2009/09/07 16:19:32 trasz Exp $"); +__FBSDID("$FreeBSD: src/bin/setfacl/merge.c,v 1.10 2009/12/26 10:06:45 trasz Exp $"); #include #include @@ -100,11 +100,10 @@ acl_get_brand_np(acl, &acl_brand); acl_get_brand_np(*prev_acl, &prev_acl_brand); - if (acl_brand != prev_acl_brand) { + if (branding_mismatch(acl_brand, prev_acl_brand)) { warnx("%s: branding mismatch; existing ACL is %s, " "entry to be merged is %s", filename, - prev_acl_brand == ACL_BRAND_NFS4 ? "NFSv4" : "POSIX.1e", - acl_brand == ACL_BRAND_NFS4 ? "NFSv4" : "POSIX.1e"); + brand_name(prev_acl_brand), brand_name(acl_brand)); return (-1); } @@ -252,9 +251,10 @@ return (-1); } - if (acl_brand != ACL_BRAND_NFS4) { + if (branding_mismatch(acl_brand, ACL_BRAND_NFS4)) { warnx("%s: branding mismatch; existing ACL is NFSv4, " - "entry to be added is POSIX.1e", filename); + "entry to be added is %s", filename, + brand_name(acl_brand)); return (-1); } ==== //depot/projects/soc2009/trasz_limits/bin/setfacl/remove.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/bin/setfacl/remove.c,v 1.7 2009/09/07 16:19:32 trasz Exp $"); +__FBSDID("$FreeBSD: src/bin/setfacl/remove.c,v 1.8 2009/12/26 10:06:45 trasz Exp $"); #include #include @@ -53,11 +53,10 @@ acl_get_brand_np(acl, &acl_brand); acl_get_brand_np(*prev_acl, &prev_acl_brand); - if (acl_brand != prev_acl_brand) { + if (branding_mismatch(acl_brand, prev_acl_brand)) { warnx("%s: branding mismatch; existing ACL is %s, " "entry to be removed is %s", filename, - prev_acl_brand == ACL_BRAND_NFS4 ? "NFSv4" : "POSIX.1e", - acl_brand == ACL_BRAND_NFS4 ? "NFSv4" : "POSIX.1e"); + brand_name(prev_acl_brand), brand_name(acl_brand)); return (-1); } ==== //depot/projects/soc2009/trasz_limits/bin/setfacl/setfacl.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/bin/setfacl/setfacl.h,v 1.6 2009/09/07 16:19:32 trasz Exp $ + * $FreeBSD: src/bin/setfacl/setfacl.h,v 1.7 2009/12/26 10:06:45 trasz Exp $ */ #ifndef _SETFACL_H @@ -71,6 +71,8 @@ int set_acl_mask(acl_t *prev_acl, const char *filename); /* util.c */ void *zmalloc(size_t size); +const char *brand_name(int brand); +int branding_mismatch(int brand1, int brand2); uint have_mask; uint need_mask; ==== //depot/projects/soc2009/trasz_limits/bin/setfacl/util.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/bin/setfacl/util.c,v 1.6 2005/01/10 08:39:25 imp Exp $"); +__FBSDID("$FreeBSD: src/bin/setfacl/util.c,v 1.8 2009/12/26 11:03:10 trasz Exp $"); #include #include @@ -43,3 +43,26 @@ err(1, "calloc() failed"); return (ptr); } + +const char * +brand_name(int brand) +{ + switch (brand) { + case ACL_BRAND_NFS4: + return "NFSv4"; + case ACL_BRAND_POSIX: + return "POSIX.1e"; + default: + return "unknown"; + } +} + +int +branding_mismatch(int brand1, int brand2) +{ + if (brand1 == ACL_BRAND_UNKNOWN || brand2 == ACL_BRAND_UNKNOWN) + return (0); + if (brand1 != brand2) + return (1); + return (0); +} ==== //depot/projects/soc2009/trasz_limits/bin/sh/alias.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/alias.c,v 1.25 2009/06/01 10:50:17 rse Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/alias.c,v 1.26 2009/12/24 18:41:14 jilles Exp $"); #include #include "shell.h" @@ -52,13 +52,13 @@ STATIC struct alias *atab[ATABSIZE]; STATIC int aliases; -STATIC void setalias(char *, char *); +STATIC void setalias(const char *, const char *); STATIC int unalias(const char *); STATIC struct alias **hashalias(const char *); STATIC void -setalias(char *name, char *val) +setalias(const char *name, const char *val) { struct alias *ap, **app; @@ -176,7 +176,7 @@ } struct alias * -lookupalias(char *name, int check) +lookupalias(const char *name, int check) { struct alias *ap = *hashalias(name); ==== //depot/projects/soc2009/trasz_limits/bin/sh/alias.h#2 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * @(#)alias.h 8.2 (Berkeley) 5/4/95 - * $FreeBSD: src/bin/sh/alias.h,v 1.8 2004/04/06 20:06:51 markm Exp $ + * $FreeBSD: src/bin/sh/alias.h,v 1.9 2009/12/24 18:41:14 jilles Exp $ */ #define ALIASINUSE 1 @@ -42,7 +42,7 @@ int flag; }; -struct alias *lookupalias(char *, int); +struct alias *lookupalias(const char *, int); int aliascmd(int, char **); int unaliascmd(int, char **); void rmaliases(void); ==== //depot/projects/soc2009/trasz_limits/bin/sh/arith.h#2 (text+ko) ==== @@ -27,15 +27,15 @@ * SUCH DAMAGE. * * @(#)arith.h 1.1 (Berkeley) 5/4/95 - * $FreeBSD: src/bin/sh/arith.h,v 1.12 2008/04/27 20:46:45 stefanf Exp $ + * $FreeBSD: src/bin/sh/arith.h,v 1.13 2009/12/24 18:41:14 jilles Exp $ */ #include "shell.h" #define DIGITS(var) (3 + (2 + CHAR_BIT * sizeof((var))) / 3) -extern char *arith_buf, *arith_startbuf; +extern const char *arith_buf, *arith_startbuf; -arith_t arith(char *); +arith_t arith(const char *); void arith_lex_reset(void); int expcmd(int, char **); ==== //depot/projects/soc2009/trasz_limits/bin/sh/arith.y#2 (text+ko) ==== @@ -38,7 +38,7 @@ #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/arith.y,v 1.22 2008/04/27 20:46:45 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/arith.y,v 1.23 2009/12/24 18:41:14 jilles Exp $"); #include #include @@ -265,7 +265,7 @@ #define YYPARSE_PARAM_TYPE arith_t * #define YYPARSE_PARAM result -char *arith_buf, *arith_startbuf; +const char *arith_buf, *arith_startbuf; int yylex(void); int yyparse(YYPARSE_PARAM_TYPE); @@ -284,7 +284,7 @@ } arith_t -arith(char *s) +arith(const char *s) { arith_t result; @@ -299,7 +299,7 @@ } static void -yyerror(char *s) +yyerror(const char *s) { yyerrok; @@ -354,7 +354,7 @@ printf("%d\n", exp(argv[1])); } -error(char *s) +error(const char *s) { fprintf(stderr, "exp: %s\n", s); exit(1); ==== //depot/projects/soc2009/trasz_limits/bin/sh/cd.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/cd.c,v 1.37 2009/11/21 14:53:22 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/cd.c,v 1.38 2009/12/24 18:41:14 jilles Exp $"); #include #include @@ -80,7 +80,7 @@ cdcmd(int argc, char **argv) { char *dest; - char *path; + const char *path; char *p; struct stat statb; int ch, phys, print = 0; ==== //depot/projects/soc2009/trasz_limits/bin/sh/error.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/error.c,v 1.27 2009/11/22 18:23:30 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/error.c,v 1.28 2009/12/24 20:55:14 jilles Exp $"); /* * Errors and exceptions. @@ -67,7 +67,7 @@ char *commandname; -static void exverror(int, const char *, va_list) __printf0like(2, 0); +static void exverror(int, const char *, va_list) __printf0like(2, 0) __dead2; /* * Called to raise an exception. Since C doesn't include exceptions, we ==== //depot/projects/soc2009/trasz_limits/bin/sh/error.h#3 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * @(#)error.h 8.2 (Berkeley) 5/4/95 - * $FreeBSD: src/bin/sh/error.h,v 1.18 2009/11/22 18:23:30 jilles Exp $ + * $FreeBSD: src/bin/sh/error.h,v 1.19 2009/12/24 20:55:14 jilles Exp $ */ /* @@ -78,10 +78,10 @@ #define CLEAR_PENDING_INT intpending = 0 #define int_pending() intpending -void exraise(int); +void exraise(int) __dead2; void onint(void); -void error(const char *, ...) __printf0like(1, 2); -void exerror(int, const char *, ...) __printf0like(2, 3); +void error(const char *, ...) __printf0like(1, 2) __dead2; +void exerror(int, const char *, ...) __printf0like(2, 3) __dead2; /* ==== //depot/projects/soc2009/trasz_limits/bin/sh/exec.c#6 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/exec.c,v 1.37 2009/10/06 22:00:14 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/exec.c,v 1.38 2009/12/24 18:41:14 jilles Exp $"); #include #include @@ -98,7 +98,7 @@ STATIC void tryexec(char *, char **, char **); STATIC void printentry(struct tblentry *, int); -STATIC struct tblentry *cmdlookup(char *, int); +STATIC struct tblentry *cmdlookup(const char *, int); STATIC void delete_cmd_entry(void); @@ -109,7 +109,7 @@ */ void -shellexec(char **argv, char **envp, char *path, int index) +shellexec(char **argv, char **envp, const char *path, int index) { char *cmdname; int e; @@ -175,13 +175,13 @@ * NULL. */ -char *pathopt; +const char *pathopt; char * -padvance(char **path, char *name) +padvance(const char **path, const char *name) { - char *p, *q; - char *start; + const char *p, *start; + char *q; int len; if (*path == NULL) @@ -269,7 +269,7 @@ printentry(struct tblentry *cmdp, int verbose) { int index; - char *path; + const char *path; char *name; if (cmdp->cmdtype == CMDNORMAL) { @@ -310,7 +310,8 @@ */ void -find_command(char *name, struct cmdentry *entry, int printerr, char *path) +find_command(const char *name, struct cmdentry *entry, int printerr, + const char *path) { struct tblentry *cmdp; int index; @@ -446,7 +447,7 @@ */ int -find_builtin(char *name, int *special) +find_builtin(const char *name, int *special) { const struct builtincmd *bp; @@ -608,10 +609,10 @@ STATIC struct tblentry * -cmdlookup(char *name, int add) +cmdlookup(const char *name, int add) { int hashval; - char *p; + const char *p; struct tblentry *cmdp; struct tblentry **pp; @@ -664,7 +665,7 @@ */ void -addcmdentry(char *name, struct cmdentry *entry) +addcmdentry(const char *name, struct cmdentry *entry) { struct tblentry *cmdp; @@ -684,7 +685,7 @@ */ void -defun(char *name, union node *func) +defun(const char *name, union node *func) { struct cmdentry entry; @@ -701,7 +702,7 @@ */ int -unsetfunc(char *name) +unsetfunc(const char *name) { struct tblentry *cmdp; @@ -767,7 +768,8 @@ switch (entry.cmdtype) { case CMDNORMAL: { if (strchr(argv[i], '/') == NULL) { - char *path = pathval(), *name; + const char *path = pathval(); + char *name; int j = entry.u.index; do { name = padvance(&path, argv[i]); ==== //depot/projects/soc2009/trasz_limits/bin/sh/exec.h#3 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * @(#)exec.h 8.3 (Berkeley) 6/8/95 - * $FreeBSD: src/bin/sh/exec.h,v 1.16 2009/08/23 21:09:46 jilles Exp $ + * $FreeBSD: src/bin/sh/exec.h,v 1.18 2009/12/24 20:55:14 jilles Exp $ */ /* values of cmdtype */ @@ -57,20 +57,20 @@ }; -extern char *pathopt; /* set by padvance */ +extern const char *pathopt; /* set by padvance */ extern int exerrno; /* last exec error */ -void shellexec(char **, char **, char *, int); -char *padvance(char **, char *); +void shellexec(char **, char **, const char *, int) __dead2; +char *padvance(const char **, const char *); int hashcmd(int, char **); -void find_command(char *, struct cmdentry *, int, char *); -int find_builtin(char *, int *); +void find_command(const char *, struct cmdentry *, int, const char *); +int find_builtin(const char *, int *); void hashcd(void); void changepath(const char *); void deletefuncs(void); -void addcmdentry(char *, struct cmdentry *); -void defun(char *, union node *); -int unsetfunc(char *); +void addcmdentry(const char *, struct cmdentry *); +void defun(const char *, union node *); +int unsetfunc(const char *); int typecmd_impl(int, char **, int); int typecmd(int, char **); void clearcmdentry(int); ==== //depot/projects/soc2009/trasz_limits/bin/sh/expand.c#4 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.56 2009/10/24 21:20:04 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/expand.c,v 1.58 2009/12/25 15:29:18 jilles Exp $"); #include #include @@ -107,7 +107,7 @@ STATIC void addfname(char *); STATIC struct strlist *expsort(struct strlist *); STATIC struct strlist *msort(struct strlist *, int); -STATIC int pmatch(char *, char *, int); +STATIC int pmatch(const char *, const char *, int); STATIC char *cvtnum(int, char *); STATIC int collate_range_cmp(int, int); @@ -271,8 +271,13 @@ while ((c = *p) != '\0') { switch(c) { - case CTLESC: - return (startp); + case CTLESC: /* This means CTL* are always considered quoted. */ + case CTLVAR: + case CTLENDVAR: + case CTLBACKQ: + case CTLBACKQ | CTLQUOTE: + case CTLARI: + case CTLENDARI: case CTLQUOTEMARK: return (startp); case ':': @@ -1338,7 +1343,7 @@ */ int -patmatch(char *pattern, char *string, int squoted) +patmatch(const char *pattern, const char *string, int squoted) { #ifdef notdef if (pattern[0] == '!' && pattern[1] == '!') @@ -1350,9 +1355,9 @@ STATIC int -pmatch(char *pattern, char *string, int squoted) +pmatch(const char *pattern, const char *string, int squoted) { - char *p, *q; + const char *p, *q; char c; p = pattern; @@ -1400,7 +1405,7 @@ } while (*q++ != '\0'); return 0; case '[': { - char *endp; + const char *endp; int invert, found; char chr; @@ -1504,7 +1509,7 @@ */ int -casematch(union node *pattern, char *val) +casematch(union node *pattern, const char *val) { struct stackmark smark; int result; ==== //depot/projects/soc2009/trasz_limits/bin/sh/expand.h#2 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * @(#)expand.h 8.2 (Berkeley) 5/4/95 - * $FreeBSD: src/bin/sh/expand.h,v 1.12 2004/04/06 20:06:51 markm Exp $ + * $FreeBSD: src/bin/sh/expand.h,v 1.13 2009/12/24 18:41:14 jilles Exp $ */ struct strlist { @@ -58,7 +58,7 @@ void expandhere(union node *, int); void expandarg(union node *, struct arglist *, int); void expari(int); -int patmatch(char *, char *, int); +int patmatch(const char *, const char *, int); void rmescapes(char *); -int casematch(union node *, char *); +int casematch(union node *, const char *); int wordexpcmd(int, char **); ==== //depot/projects/soc2009/trasz_limits/bin/sh/histedit.c#5 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/histedit.c,v 1.32 2009/11/21 14:28:32 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/histedit.c,v 1.33 2009/12/24 18:41:14 jilles Exp $"); #include #include @@ -406,7 +406,7 @@ } int -not_fcnumber(char *s) +not_fcnumber(const char *s) { if (s == NULL) return (0); @@ -416,10 +416,10 @@ } int -str_to_event(char *str, int last) +str_to_event(const char *str, int last) { HistEvent he; - char *s = str; + const char *s = str; int relative = 0; int i, retval; ==== //depot/projects/soc2009/trasz_limits/bin/sh/input.c#5 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/input.c,v 1.27 2009/11/22 14:04:20 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/input.c,v 1.28 2009/12/24 18:41:14 jilles Exp $"); #include /* defines BUFSIZ */ #include @@ -401,7 +401,7 @@ */ void -setinputfile(char *fname, int push) +setinputfile(const char *fname, int push) { int fd; int fd2; ==== //depot/projects/soc2009/trasz_limits/bin/sh/input.h#4 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * @(#)input.h 8.2 (Berkeley) 5/4/95 - * $FreeBSD: src/bin/sh/input.h,v 1.11 2009/11/22 14:04:20 jilles Exp $ + * $FreeBSD: src/bin/sh/input.h,v 1.12 2009/12/24 18:41:14 jilles Exp $ */ /* PEOF (the end of file marker) is defined in syntax.h */ @@ -54,7 +54,7 @@ void pungetc(void); void pushstring(char *, int, void *); void popstring(void); -void setinputfile(char *, int); +void setinputfile(const char *, int); void setinputfd(int, int); void setinputstring(char *, int); void popfile(void); ==== //depot/projects/soc2009/trasz_limits/bin/sh/jobs.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.73 2009/11/21 14:28:32 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/jobs.c,v 1.74 2009/12/25 20:21:35 jilles Exp $"); #include #include @@ -757,6 +757,7 @@ TRACE(("Child shell %d\n", (int)getpid())); wasroot = rootshell; rootshell = 0; + handler = &main_handler; closescript(); INTON; clear_traps(); ==== //depot/projects/soc2009/trasz_limits/bin/sh/mail.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/mail.c,v 1.14 2005/08/13 08:26:58 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/mail.c,v 1.15 2009/12/24 18:41:14 jilles Exp $"); /* * Routines to check for mail. (Perhaps make part of main.c?) @@ -72,7 +72,7 @@ chkmail(int silent) { int i; - char *mpath; + const char *mpath; char *p; char *q; struct stackmark smark; ==== //depot/projects/soc2009/trasz_limits/bin/sh/main.c#5 (text+ko) ==== @@ -42,7 +42,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/main.c,v 1.32 2009/11/21 14:28:32 jilles Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/main.c,v 1.35 2009/12/25 20:21:35 jilles Exp $"); #include #include @@ -75,6 +75,7 @@ int rootpid; int rootshell; +struct jmploc main_handler; STATIC void read_profile(char *); STATIC char *find_dot_file(char *); @@ -90,14 +91,13 @@ int main(int argc, char *argv[]) { - struct jmploc jmploc; struct stackmark smark; volatile int state; char *shinit; (void) setlocale(LC_ALL, ""); state = 0; - if (setjmp(jmploc.loc)) { + if (setjmp(main_handler.loc)) { /* * When a shell procedure is executed, we raise the * exception EXSHELLPROC to clean up before executing @@ -143,7 +143,7 @@ else goto state4; } - handler = &jmploc; + handler = &main_handler; #ifdef DEBUG opentrace(); trputs("Shell args: "); trargs(argv); @@ -269,7 +269,7 @@ */ void -readcmdfile(char *name) +readcmdfile(const char *name) { int fd; @@ -296,7 +296,7 @@ { static char localname[FILENAME_MAX+1]; char *fullname; - char *path = pathval(); + const char *path = pathval(); struct stat statb; /* don't try this for absolute or relative paths */ @@ -315,7 +315,6 @@ int dotcmd(int argc, char **argv) { - struct strlist *sp; >>> TRUNCATED FOR MAIL (1000 lines) <<<