svn commit: r264405 - head/usr.bin/iscsictl
Author: mav
Date: Sun Apr 13 09:31:22 2014
New Revision: 264405
URL: http://svnweb.freebsd.org/changeset/base/264405
Log:
Fix periph listing when IOCTL buffer border hits result for wanted bus.
Modified:
head/usr.bin/iscsictl/periphs.c
Modified: head/usr.bin/iscsictl/periphs.c
==
--- head/usr.bin/iscsictl/periphs.c Sun Apr 13 06:30:02 2014
(r264404)
+++ head/usr.bin/iscsictl/periphs.c Sun Apr 13 09:31:22 2014
(r264405)
@@ -102,6 +102,9 @@ print_periphs(int session_id)
ccb.cdm.num_patterns = 0;
ccb.cdm.pattern_buf_len = 0;
+ skip_bus = 1;
+ skip_device = 1;
+
/*
* We do the ioctl multiple times if necessary, in case there are
* more than 100 nodes in the EDT.
@@ -120,9 +123,6 @@ print_periphs(int session_id)
break;
}
- skip_bus = 1;
- skip_device = 1;
-
for (i = 0; i < ccb.cdm.num_matches; i++) {
switch (ccb.cdm.matches[i].type) {
case DEV_MATCH_BUS: {
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264406 - head/sys/cam
Author: mav
Date: Sun Apr 13 11:08:57 2014
New Revision: 264406
URL: http://svnweb.freebsd.org/changeset/base/264406
Log:
Report more readable state "-" for idle CAM scan thread.
Modified:
head/sys/cam/cam_xpt.c
Modified: head/sys/cam/cam_xpt.c
==
--- head/sys/cam/cam_xpt.c Sun Apr 13 09:31:22 2014(r264405)
+++ head/sys/cam/cam_xpt.c Sun Apr 13 11:08:57 2014(r264406)
@@ -768,7 +768,7 @@ xpt_scanner_thread(void *dummy)
for (;;) {
if (TAILQ_EMPTY(&xsoftc.ccb_scanq))
msleep(&xsoftc.ccb_scanq, &xsoftc.xpt_topo_lock, PRIBIO,
- "ccb_scanq", 0);
+ "-", 0);
if ((ccb = (union ccb *)TAILQ_FIRST(&xsoftc.ccb_scanq)) !=
NULL) {
TAILQ_REMOVE(&xsoftc.ccb_scanq, &ccb->ccb_h,
sim_links.tqe);
xpt_unlock_buses();
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264407 - head/sys/cam/ctl
Author: mav
Date: Sun Apr 13 11:10:36 2014
New Revision: 264407
URL: http://svnweb.freebsd.org/changeset/base/264407
Log:
Join CTL worker threads into one process for convenience.
Report their idle state as "-".
Modified:
head/sys/cam/ctl/ctl.c
Modified: head/sys/cam/ctl/ctl.c
==
--- head/sys/cam/ctl/ctl.c Sun Apr 13 11:08:57 2014(r264406)
+++ head/sys/cam/ctl/ctl.c Sun Apr 13 11:10:36 2014(r264407)
@@ -1112,8 +1112,8 @@ ctl_init(void)
}
for (i = 0; i < worker_threads; i++) {
- error = kproc_create(ctl_work_thread, softc,
&softc->work_thread, 0, 0,
- "ctl_thrd%d", i);
+ error = kproc_kthread_add(ctl_work_thread, softc,
+ &softc->work_thread, NULL, 0, 0, "ctl", "work%d", i);
if (error != 0) {
printf("error creating CTL work thread!\n");
mtx_lock(&softc->ctl_lock);
@@ -13380,7 +13380,7 @@ ctl_work_thread(void *arg)
/* XXX KDM use the PDROP flag?? */
/* Sleep until we have something to do. */
- mtx_sleep(softc, &softc->ctl_lock, PRIBIO, "ctl_work", 0);
+ mtx_sleep(softc, &softc->ctl_lock, PRIBIO, "-", 0);
/* Back to the top of the loop to see what woke us up. */
continue;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264408 - head/tools/build/options
Author: jmmv Date: Sun Apr 13 11:29:52 2014 New Revision: 264408 URL: http://svnweb.freebsd.org/changeset/base/264408 Log: Fix test suite name in src.conf(5). There is no such thing as the "Kyua test suite"; it is the "FreeBSD Test Suite". While doing this, point readers to tests(7). Modified: head/tools/build/options/WITH_TESTS Modified: head/tools/build/options/WITH_TESTS == --- head/tools/build/options/WITH_TESTS Sun Apr 13 11:10:36 2014 (r264407) +++ head/tools/build/options/WITH_TESTS Sun Apr 13 11:29:52 2014 (r264408) @@ -1,2 +1,7 @@ .\" $FreeBSD$ -Set to install the Kyua test suite. +Set to install the +.Fx +Test Suite. +See +.Xr tests 7 +for more details. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264409 - head/share/man/man5
Author: jmmv Date: Sun Apr 13 11:31:41 2014 New Revision: 264409 URL: http://svnweb.freebsd.org/changeset/base/264409 Log: Regen after rewording of WITH_TESTS. Modified: head/share/man/man5/src.conf.5 Modified: head/share/man/man5/src.conf.5 == --- head/share/man/man5/src.conf.5 Sun Apr 13 11:29:52 2014 (r264408) +++ head/share/man/man5/src.conf.5 Sun Apr 13 11:31:41 2014 (r264409) @@ -1,7 +1,7 @@ .\" DO NOT EDIT-- this file is automatically generated. .\" from FreeBSD: head/tools/build/options/makeman 255964 2013-10-01 07:22:04Z des .\" $FreeBSD$ -.Dd March 5, 2014 +.Dd April 13, 2014 .Dt SRC.CONF 5 .Os .Sh NAME @@ -136,13 +136,13 @@ toolchain is enabled. .\" from FreeBSD: head/tools/build/options/WITHOUT_BLUETOOTH 156932 2006-03-21 07:50:50Z ru Set to not build Bluetooth related kernel modules, programs and libraries. .It Va WITHOUT_BMAKE -.\" from FreeBSD: head/tools/build/options/WITHOUT_BMAKE 250839 2013-05-21 00:41:49Z delphij +.\" from FreeBSD: head/tools/build/options/WITHOUT_BMAKE 263089 2014-03-12 11:53:35Z jmmv Set to not build and install the portable BSD make (bmake) as .Xr make 1 instead of the traditional FreeBSD make. This build option is temporary. -It allows developers to switch to bmake in order to work out any remaining -kinks or issues. +It allows developers to switch to the traditional FreeBSD make in order to +work out any remaining kinks or issues. This option will be removed in due time. .It Va WITHOUT_BOOT .\" from FreeBSD: head/tools/build/options/WITHOUT_BOOT 156932 2006-03-21 07:50:50Z ru @@ -214,7 +214,7 @@ When set, it also enforces the following Set to build the Clang C/C++ compiler. .Pp It is a default setting on -amd64/amd64, arm/arm, arm/armv6, i386/i386, pc98/i386, powerpc/powerpc and powerpc/powerpc64. +amd64/amd64, arm/arm, arm/armv6, arm/armv6hf, i386/i386, pc98/i386, powerpc/powerpc and powerpc/powerpc64. .It Va WITH_CLANG_EXTRAS .\" from FreeBSD: head/tools/build/options/WITH_CLANG_EXTRAS 231057 2012-02-05 23:56:22Z dim Set to build additional clang and llvm tools, such as bugpoint. @@ -224,7 +224,7 @@ Set to avoid building the ARCMigrate, Re the Clang C/C++ compiler. .Pp It is a default setting on -arm/arm, arm/armeb, arm/armv6, ia64/ia64, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32 and sparc64/sparc64. +arm/arm, arm/armeb, arm/armv6, arm/armv6hf, ia64/ia64, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32 and sparc64/sparc64. .It Va WITH_CLANG_FULL .\" from FreeBSD: head/tools/build/options/WITH_CLANG_FULL 246259 2013-02-02 22:28:29Z dim Set to build the ARCMigrate, Rewriter and StaticAnalyzer components of the @@ -251,7 +251,7 @@ and .Pa /usr/bin/cpp . .Pp It is a default setting on -amd64/amd64, arm/arm, arm/armv6, i386/i386 and pc98/i386. +amd64/amd64, arm/arm, arm/armv6, arm/armv6hf, i386/i386 and pc98/i386. .It Va WITHOUT_CPP .\" from FreeBSD: head/tools/build/options/WITHOUT_CPP 156932 2006-03-21 07:50:50Z ru Set to not build @@ -349,16 +349,6 @@ Set to avoid installing examples to .\" from FreeBSD: head/tools/build/options/WITHOUT_FDT 221539 2011-05-06 19:10:27Z ru Set to not build Flattened Device Tree support as part of the base system. This includes the device tree compiler (dtc) and libfdt support library. -.Pp -It is a default setting on -amd64/amd64, i386/i386, ia64/ia64, pc98/i386 and sparc64/sparc64. -.It Va WITH_FDT -.\" from FreeBSD: head/tools/build/options/WITH_FDT 221730 2011-05-10 11:14:40Z ru -Set to build Flattened Device Tree support as part of the base system. -This includes the device tree compiler (dtc) and libfdt support library. -.Pp -It is a default setting on -arm/arm, arm/armeb, arm/armv6, mips/mipsel, mips/mips, mips/mips64el, mips/mips64, mips/mipsn32, powerpc/powerpc and powerpc/powerpc64. .It Va WITHOUT_FLOPPY .\" from FreeBSD: head/tools/build/options/WITHOUT_FLOPPY 221540 2011-05-06 19:13:03Z ru Set to not build or install programs @@ -393,7 +383,7 @@ Set to not build games. Set to not build and install gcc and g++. .Pp It is a default setting on -amd64/amd64, arm/arm, arm/armv6 and i386/i386. +amd64/amd64, arm/arm, arm/armv6, arm/armv6hf and i386/i386. .It Va WITH_GCC .\" from FreeBSD: head/tools/build/options/WITH_GCC 255326 2013-09-06 20:49:48Z zeising Set to build and install gcc and g++. @@ -429,7 +419,7 @@ Do not build the GNU C++ stack (g++, lib This is the default on platforms where clang is the system compiler. .Pp It is a default setting on -amd64/amd64, arm/arm, arm/armv6, i386/i386 and pc98/i386. +amd64/amd64, arm/arm, arm/armv6, arm/armv6hf, i386/i386 and pc98/i386. .It Va WITH_GNUCXX .\" from FreeBSD: head/tools/build/options/WITH_GNUCXX 255321 2013-09-06 20:08:03Z theraven Build the GNU C++ stack (g++, libstdc++). @@ -652,6 +642,9 @@ and related programs. Set to build .Xr ls 1 without support for
svn commit: r264410 - head/share/man/man7
Author: jmmv
Date: Sun Apr 13 11:35:42 2014
New Revision: 264410
URL: http://svnweb.freebsd.org/changeset/base/264410
Log:
Document how to install the test suite.
As part of this, install the tests(7) manual page unconditionally (not only
when WITH_TESTS=yes) so that users that have not yet enabled the build of
the test suite can read details on how to do so.
Modified:
head/share/man/man7/Makefile
head/share/man/man7/tests.7
Modified: head/share/man/man7/Makefile
==
--- head/share/man/man7/MakefileSun Apr 13 11:31:41 2014
(r264409)
+++ head/share/man/man7/MakefileSun Apr 13 11:35:42 2014
(r264410)
@@ -27,12 +27,9 @@ MAN= adding_user.7 \
sprog.7 \
stdint.7 \
sticky.7 \
+ tests.7 \
tuning.7
-.if ${MK_TESTS} != "no"
-MAN+= tests.7
-.endif
-
MLINKS=intro.7 miscellaneous.7
MLINKS+= security.7 securelevel.7
MLINKS+= c99.7 c.7
Modified: head/share/man/man7/tests.7
==
--- head/share/man/man7/tests.7 Sun Apr 13 11:31:41 2014(r264409)
+++ head/share/man/man7/tests.7 Sun Apr 13 11:35:42 2014(r264410)
@@ -26,7 +26,7 @@
.\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
.\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd March 20, 2014
+.Dd April 13, 2014
.Dt TESTS 7
.Os
.Sh NAME
@@ -50,12 +50,31 @@ maintenance.
.Pp
The
.Fx
-test suite is installed in the
+test suite can be found in the
.Pa /usr/tests
hierarchy.
.Pp
This manual page describes how to run the test suite and how to configure
some of its optional features.
+.Ss Installing the test suite
+The test suite is not yet installed by default as part of
+.Fx ,
+but this is bound to change during the development of
+.Fx 11.0 .
+.Pp
+If the
+.Pa /usr/tests
+directory is missing, then you will have to enable the build of the test
+suite, rebuild your system and install the results.
+You can do so by setting
+.Sq WITH_TESTS=yes
+in your
+.Pa /etc/src.conf
+file (see
+.Xr src.conf 5
+for details)
+and rebuilding the system as described in
+.Xr build 7 .
.Ss When to run the tests?
Before diving into the details of how to run the test suite, here are some
scenarios in which you should run it:
@@ -197,7 +216,8 @@ test suite.
Top-level test suite definition file.
.El
.Sh SEE ALSO
-.Xr kyua 1 .
+.Xr kyua 1 ,
+.Xr build 7
.Sh HISTORY
This test suite first appeared in
.Fx 11.0 .
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264411 - head/usr.bin/find
Author: jilles
Date: Sun Apr 13 11:47:17 2014
New Revision: 264411
URL: http://svnweb.freebsd.org/changeset/base/264411
Log:
find: Return normal exit status from -quit.
If there was an error, make the exit status reflect this even if -quit
caused the exit. Formerly, -quit always caused exit(0).
GNU find does the same.
Modified:
head/usr.bin/find/find.1
head/usr.bin/find/function.c
Modified: head/usr.bin/find/find.1
==
--- head/usr.bin/find/find.1Sun Apr 13 11:35:42 2014(r264410)
+++ head/usr.bin/find/find.1Sun Apr 13 11:47:17 2014(r264411)
@@ -31,7 +31,7 @@
.\"@(#)find.1 8.7 (Berkeley) 5/9/95
.\" $FreeBSD$
.\"
-.Dd April 12, 2014
+.Dd April 13, 2014
.Dt FIND 1
.Os
.Sh NAME
@@ -778,7 +778,7 @@ option was specified.
.It Ic -quit
Causes
.Nm
-to immediately terminate successfully.
+to terminate immediately.
.It Ic -regex Ar pattern
True if the whole path of the file matches
.Ar pattern
Modified: head/usr.bin/find/function.c
==
--- head/usr.bin/find/function.cSun Apr 13 11:35:42 2014
(r264410)
+++ head/usr.bin/find/function.cSun Apr 13 11:47:17 2014
(r264411)
@@ -1781,7 +1781,7 @@ int
f_quit(PLAN *plan __unused, FTSENT *entry __unused)
{
finish_execplus();
- exit(0);
+ exit(exitstatus);
}
/* c_quit == c_simple */
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264412 - head/gnu/usr.bin/groff/tmac
Author: jmmv Date: Sun Apr 13 11:57:51 2014 New Revision: 264412 URL: http://svnweb.freebsd.org/changeset/base/264412 Log: Add FreeBSD 10.1 to the list of recognized releases for Fx. This version is already mentioned by 4 manual pages. Modified: head/gnu/usr.bin/groff/tmac/mdoc.local Modified: head/gnu/usr.bin/groff/tmac/mdoc.local == --- head/gnu/usr.bin/groff/tmac/mdoc.local Sun Apr 13 11:47:17 2014 (r264411) +++ head/gnu/usr.bin/groff/tmac/mdoc.local Sun Apr 13 11:57:51 2014 (r264412) @@ -59,6 +59,7 @@ .ds doc-operating-system-FreeBSD-9.19.1 .ds doc-operating-system-FreeBSD-9.29.2 .ds doc-operating-system-FreeBSD-10.0 10.0 +.ds doc-operating-system-FreeBSD-10.1 10.1 .ds doc-operating-system-FreeBSD-11.0 11.0 .ds doc-operating-system-NetBSD-7.0 7.0 . ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264413 - head/share/man/man7
Author: jmmv Date: Sun Apr 13 11:59:42 2014 New Revision: 264413 URL: http://svnweb.freebsd.org/changeset/base/264413 Log: Miscellaneous fixes to tests(7). - Properly capitalize "FreeBSD Test Suite". - At this point, the test suite first appeared in 10.1, not in 11.0. - Use my FreeBSD.org address. Modified: head/share/man/man7/tests.7 Modified: head/share/man/man7/tests.7 == --- head/share/man/man7/tests.7 Sun Apr 13 11:57:51 2014(r264412) +++ head/share/man/man7/tests.7 Sun Apr 13 11:59:42 2014(r264413) @@ -31,11 +31,11 @@ .Os .Sh NAME .Nm tests -.Nd introduction to the FreeBSD test suite +.Nd introduction to the FreeBSD Test Suite .Sh DESCRIPTION The .Fx -test suite provides a collection of automated tests for two major purposes. +Test Suite provides a collection of automated tests for two major purposes. On one hand, the test suite aids .Em developers to detect bugs and regressions when they modify the source tree. On the other @@ -50,7 +50,7 @@ maintenance. .Pp The .Fx -test suite can be found in the +Test Suite can be found in the .Pa /usr/tests hierarchy. .Pp @@ -148,7 +148,7 @@ to its manual page .Ss Configuring the tests Some test cases in the .Fx -test suite require manual configuration by the administrator before they can be +Test Suite require manual configuration by the administrator before they can be run. Unless certain properties are defined, the tests that require them will be skipped. .Pp @@ -160,7 +160,7 @@ The format of this file is detailed in .Pp The following configuration variables are available in the .Fx -test suite: +Test Suite: .Bl -tag -width "allow_sysctl_side_effects" .It allow_devfs_side_effects If defined, enables tests that may destroy and recreate semipermanent device @@ -211,7 +211,7 @@ Default result database used by Kyua. .It Pa /usr/tests/ Location of the .Fx -test suite. +Test Suite. .It Pa /usr/tests/Kyuafile Top-level test suite definition file. .El @@ -219,14 +219,16 @@ Top-level test suite definition file. .Xr kyua 1 , .Xr build 7 .Sh HISTORY -This test suite first appeared in -.Fx 11.0 . +The +.Fx +Test Suite first appeared in +.Fx 10.1 . .Pp The .Nm manual page first appeared in .Nx 6.0 and was later ported to -.Fx 11.0 . +.Fx 10.1 . .Sh AUTHORS -.An Julio Merino Aq Mt j...@google.com +.An Julio Merino Aq Mt j...@freebsd.org ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264414 - in head/sys/boot: amd64/boot1.efi common
Author: nwhitehorn
Date: Sun Apr 13 14:50:52 2014
New Revision: 264414
URL: http://svnweb.freebsd.org/changeset/base/264414
Log:
Apparently some of the i386 boot blocks are so close to full that adding
single lines to ufsread.c spills them over. Duplicate a whole bunch of
code to get file sizes into boot1.efi/boot1.c rather than modifying
ufsread.c.
Modified:
head/sys/boot/amd64/boot1.efi/Makefile
head/sys/boot/amd64/boot1.efi/boot1.c
head/sys/boot/common/ufsread.c
Modified: head/sys/boot/amd64/boot1.efi/Makefile
==
--- head/sys/boot/amd64/boot1.efi/Makefile Sun Apr 13 11:59:42 2014
(r264413)
+++ head/sys/boot/amd64/boot1.efi/Makefile Sun Apr 13 14:50:52 2014
(r264414)
@@ -55,6 +55,8 @@ boot1.efi: loader.sym
CFLAGS+= -I${.CURDIR}/../../common
+boot1.o: ${.CURDIR}/../../common/ufsread.c
+
.endif # ${COMPILER_TYPE} != "gcc"
.include
Modified: head/sys/boot/amd64/boot1.efi/boot1.c
==
--- head/sys/boot/amd64/boot1.efi/boot1.c Sun Apr 13 11:59:42 2014
(r264413)
+++ head/sys/boot/amd64/boot1.efi/boot1.c Sun Apr 13 14:50:52 2014
(r264414)
@@ -169,6 +169,88 @@ dskread(void *buf, u_int64_t lba, int nb
#include "ufsread.c"
+static ssize_t
+fsstat(ufs_ino_t inode)
+{
+#ifndef UFS2_ONLY
+ static struct ufs1_dinode dp1;
+ ufs1_daddr_t addr1;
+#endif
+#ifndef UFS1_ONLY
+ static struct ufs2_dinode dp2;
+#endif
+ static struct fs fs;
+ static ufs_ino_t inomap;
+ char *blkbuf;
+ void *indbuf;
+ size_t n, nb, size, off, vboff;
+ ufs_lbn_t lbn;
+ ufs2_daddr_t addr2, vbaddr;
+ static ufs2_daddr_t blkmap, indmap;
+ u_int u;
+
+ blkbuf = dmadat->blkbuf;
+ indbuf = dmadat->indbuf;
+ if (!dsk_meta) {
+ inomap = 0;
+ for (n = 0; sblock_try[n] != -1; n++) {
+ if (dskread(dmadat->sbbuf, sblock_try[n] / DEV_BSIZE,
+ SBLOCKSIZE / DEV_BSIZE))
+ return -1;
+ memcpy(&fs, dmadat->sbbuf, sizeof(struct fs));
+ if ((
+#if defined(UFS1_ONLY)
+ fs.fs_magic == FS_UFS1_MAGIC
+#elif defined(UFS2_ONLY)
+ (fs.fs_magic == FS_UFS2_MAGIC &&
+ fs.fs_sblockloc == sblock_try[n])
+#else
+ fs.fs_magic == FS_UFS1_MAGIC ||
+ (fs.fs_magic == FS_UFS2_MAGIC &&
+ fs.fs_sblockloc == sblock_try[n])
+#endif
+ ) &&
+ fs.fs_bsize <= MAXBSIZE &&
+ fs.fs_bsize >= sizeof(struct fs))
+ break;
+ }
+ if (sblock_try[n] == -1) {
+ printf("Not ufs\n");
+ return -1;
+ }
+ dsk_meta++;
+ } else
+ memcpy(&fs, dmadat->sbbuf, sizeof(struct fs));
+ if (!inode)
+ return 0;
+ if (inomap != inode) {
+ n = IPERVBLK(&fs);
+ if (dskread(blkbuf, INO_TO_VBA(&fs, n, inode), DBPERVBLK))
+ return -1;
+ n = INO_TO_VBO(n, inode);
+#if defined(UFS1_ONLY)
+ memcpy(&dp1, (struct ufs1_dinode *)blkbuf + n,
+ sizeof(struct ufs1_dinode));
+#elif defined(UFS2_ONLY)
+ memcpy(&dp2, (struct ufs2_dinode *)blkbuf + n,
+ sizeof(struct ufs2_dinode));
+#else
+ if (fs.fs_magic == FS_UFS1_MAGIC)
+ memcpy(&dp1, (struct ufs1_dinode *)blkbuf + n,
+ sizeof(struct ufs1_dinode));
+ else
+ memcpy(&dp2, (struct ufs2_dinode *)blkbuf + n,
+ sizeof(struct ufs2_dinode));
+#endif
+ inomap = inode;
+ fs_off = 0;
+ blkmap = indmap = 0;
+ }
+ size = DIP(di_size);
+ n = size - fs_off;
+ return (n);
+}
+
static struct dmadat __dmadat;
static int
@@ -203,7 +285,7 @@ load(const char *fname)
return;
}
- bufsize = fsread(ino, NULL, -1);
+ bufsize = fsstat(ino);
status = systab->BootServices->AllocatePool(EfiLoaderData,
bufsize, &buffer);
fsread(ino, buffer, bufsize);
Modified: head/sys/boot/common/ufsread.c
==
--- head/sys/boot/common/ufsread.c Sun Apr 13 11:59:42 2014
(r264413)
+++ head/sys/boot/common/ufsread.c Sun Apr 13 14:50:52 2014
(r264414)
@@ -245,8 +245,6 @@ fsread(ufs_ino_t inode, void *buf, size_
s = buf;
size = DIP(di_size);
svn commit: r264415 - head/share/man/man4
Author: brueffer Date: Sun Apr 13 18:21:53 2014 New Revision: 264415 URL: http://svnweb.freebsd.org/changeset/base/264415 Log: Bump Dd for r264384. Requested by: gjb Modified: head/share/man/man4/timecounters.4 Modified: head/share/man/man4/timecounters.4 == --- head/share/man/man4/timecounters.4 Sun Apr 13 14:50:52 2014 (r264414) +++ head/share/man/man4/timecounters.4 Sun Apr 13 18:21:53 2014 (r264415) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd December 20, 2011 +.Dd April 12, 2014 .Dt TIMECOUNTERS 4 .Os .Sh NAME ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264416 - head/sys/dev/iwn
Author: brueffer Date: Sun Apr 13 18:51:39 2014 New Revision: 264416 URL: http://svnweb.freebsd.org/changeset/base/264416 Log: Add a missing comma between error message definitions. CID: 1199266 Found with: Coverity Prevent(tm) MFC after:1 week Modified: head/sys/dev/iwn/if_iwnreg.h Modified: head/sys/dev/iwn/if_iwnreg.h == --- head/sys/dev/iwn/if_iwnreg.hSun Apr 13 18:21:53 2014 (r264415) +++ head/sys/dev/iwn/if_iwnreg.hSun Apr 13 18:51:39 2014 (r264416) @@ -2195,7 +2195,7 @@ static const char * const iwn_fw_errmsg[ "NMI_INTERRUPT_DATA_ACTION_PT", "NMI_TRM_HW_ER", "NMI_INTERRUPT_TRM", - "NMI_INTERRUPT_BREAKPOINT" + "NMI_INTERRUPT_BREAKPOINT", "DEBUG_0", "DEBUG_1", "DEBUG_2", ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r264402 - in head/share: examples/etc man/man5 mk
On Sun, Apr 13, 2014 at 1:22 AM, Warner Losh wrote:
> Author: imp
> Date: Sun Apr 13 05:22:26 2014
> New Revision: 264402
> URL: http://svnweb.freebsd.org/changeset/base/264402
>
> Log:
> Convert NO_MANCOMPRESS to normal convention.
This breaks installworld for me with
...
install -o root -g wheel -m 444 zh_CN.GB2312.cat
/usr/share/nls/zh_CN.GB2312/libc.cat
install -o root -g wheel -m 444 zh_CN.UTF-8.cat
/usr/share/nls/zh_CN.UTF-8/libc.cat
install -o root -g wheel -m 444 btree.3.gz /usr/share/man/man3
install: btree.3.gz: No such file or directory
*** Error code 71
...
>
> Modified:
> head/share/examples/etc/make.conf
> head/share/man/man5/make.conf.5
> head/share/mk/bsd.man.mk
> head/share/mk/bsd.own.mk
>
> [snip]
>
> Modified: head/share/mk/bsd.man.mk
> ==
> --- head/share/mk/bsd.man.mkSun Apr 13 05:22:22 2014(r264401)
> +++ head/share/mk/bsd.man.mkSun Apr 13 05:22:26 2014(r264402)
> @@ -30,9 +30,6 @@
> # second, and there may be multiple pairs. The files
> # are hard-linked.
> #
> -# NO_MANCOMPRESS If you do not want unformatted manual pages to be
> -# compressed when they are installed. [not set]
> -#
> # NO_MLINKSIf you do not want install manual page links. [not set]
> #
> # MANFILTERcommand to pipe the raw man page through before compressing
> @@ -77,10 +74,10 @@ MAN+= ${MAN${__sect}}
> _manpages:
> all-man: _manpages
>
> -.if defined(NO_MANCOMPRESS)
> +.if ${MK_MANCOMPRESS} != "no"
>
> # Make special arrangements to filter to a temporary file at build time
> -# for NO_MANCOMPRESS.
> +# for MK_MANCOMPRESS == no.
> .if defined(MANFILTER)
> FILTEXTENSION= .filt
> .else
> @@ -162,7 +159,7 @@ maninstall: _maninstall
> _maninstall:
> .if defined(MAN) && !empty(MAN)
> _maninstall: ${MAN}
> -.if defined(NO_MANCOMPRESS)
> +.if ${MK_MANCOMPRESS} == "no"
Changing this line to ".if ${MK_MANCOMPRESS} != "no" seems to fix the problem.
> .if defined(MANFILTER)
> [snip]
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264417 - head/lib/libc/stdlib
Author: jilles
Date: Sun Apr 13 19:48:28 2014
New Revision: 264417
URL: http://svnweb.freebsd.org/changeset/base/264417
Log:
realpath(): Properly fail "." or ".." components after non-directories.
If realpath() is called on pathnames like "/dev/null/." or "/dev/null/..",
it should fail with [ENOTDIR]. Pathnames like "/dev/null/" already failed as
they should.
Also, put the check for non-directories after lstatting the previous
component instead of when the empty component (consecutive or trailing
slashes) is detected, saving an lstat() call and some lines of code.
PR: kern/82980
MFC after:2 weeks
Modified:
head/lib/libc/stdlib/realpath.c
Modified: head/lib/libc/stdlib/realpath.c
==
--- head/lib/libc/stdlib/realpath.c Sun Apr 13 18:51:39 2014
(r264416)
+++ head/lib/libc/stdlib/realpath.c Sun Apr 13 19:48:28 2014
(r264417)
@@ -132,26 +132,7 @@ realpath(const char * __restrict path, c
resolved[resolved_len] = '\0';
}
if (next_token[0] == '\0') {
- /*
-* Handle consequential slashes. The path
-* before slash shall point to a directory.
-*
-* Only the trailing slashes are not covered
-* by other checks in the loop, but we verify
-* the prefix for any (rare) "//" or "/\0"
-* occurrence to not implement lookahead.
-*/
- if (lstat(resolved, &sb) != 0) {
- if (m)
- free(resolved);
- return (NULL);
- }
- if (!S_ISDIR(sb.st_mode)) {
- if (m)
- free(resolved);
- errno = ENOTDIR;
- return (NULL);
- }
+ /* Handle consequential slashes. */
continue;
}
else if (strcmp(next_token, ".") == 0)
@@ -236,6 +217,11 @@ realpath(const char * __restrict path, c
}
}
left_len = strlcpy(left, symlink, sizeof(left));
+ } else if (!S_ISDIR(sb.st_mode) && p != NULL) {
+ if (m)
+ free(resolved);
+ errno = ENOTDIR;
+ return (NULL);
}
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264418 - head/usr.bin/find
Author: brueffer
Date: Sun Apr 13 19:48:51 2014
New Revision: 264418
URL: http://svnweb.freebsd.org/changeset/base/264418
Log:
Avoid double free in f_acl().
CID: 1018508
Found with: Coverity Prevent(tm)
MFC after:1 week
Modified:
head/usr.bin/find/function.c
Modified: head/usr.bin/find/function.c
==
--- head/usr.bin/find/function.cSun Apr 13 19:48:28 2014
(r264417)
+++ head/usr.bin/find/function.cSun Apr 13 19:48:51 2014
(r264418)
@@ -404,7 +404,6 @@ f_acl(PLAN *plan __unused, FTSENT *entry
acl_free(facl);
if (ret) {
warn("%s", entry->fts_accpath);
- acl_free(facl);
return (0);
}
if (trivial)
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264419 - head/usr.bin/ldd
Author: brueffer
Date: Sun Apr 13 20:12:21 2014
New Revision: 264419
URL: http://svnweb.freebsd.org/changeset/base/264419
Log:
Avoid double close() of a file descriptor.
CID: 1006089
Found with: Coverity Prevent(tm)
MFC after:1 week
Modified:
head/usr.bin/ldd/sods.c
Modified: head/usr.bin/ldd/sods.c
==
--- head/usr.bin/ldd/sods.c Sun Apr 13 19:48:51 2014(r264418)
+++ head/usr.bin/ldd/sods.c Sun Apr 13 20:12:21 2014(r264419)
@@ -204,7 +204,6 @@ dump_file(const char *fname)
warnx("%s: this is an ELF program; use objdump to examine", fname);
++error_count;
munmap(objbase, sb.st_size);
- close(fd);
return;
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264420 - head/etc
Author: bdrewery
Date: Sun Apr 13 20:21:56 2014
New Revision: 264420
URL: http://svnweb.freebsd.org/changeset/base/264420
Log:
Always install pkg.conf. Don't depend on MK_PKGBOOTSTRAP.
This file is used by pkg(8) from ports as well. Someone may
choose to not install pkg(7) but still want to consume
official packages by building or installing pkg(8) manually.
Discussed with: bapt
MFC after:1 day (Working on EN)
Modified:
head/etc/Makefile
Modified: head/etc/Makefile
==
--- head/etc/Makefile Sun Apr 13 20:12:21 2014(r264419)
+++ head/etc/Makefile Sun Apr 13 20:21:56 2014(r264420)
@@ -231,9 +231,7 @@ distribution:
.endif
${_+_}cd ${.CURDIR}/gss; ${MAKE} install
${_+_}cd ${.CURDIR}/periodic; ${MAKE} install
-.if ${MK_PKGBOOTSTRAP} != "no"
${_+_}cd ${.CURDIR}/pkg; ${MAKE} install
-.endif
${_+_}cd ${.CURDIR}/rc.d; ${MAKE} install
${_+_}cd ${.CURDIR}/../gnu/usr.bin/send-pr; ${MAKE} etc-gnats-freefall
${_+_}cd ${.CURDIR}/../share/termcap; ${MAKE} etc-termcap
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r264402 - in head/share: examples/etc man/man5 mk
Are you sure it is this exact commit?
Do you have anything in your /etc/make.conf or /etc/src.conf file?
Can you send me your full install world output?
I’ll see if I can reproduce it myself.
Warner
On Apr 13, 2014, at 1:32 PM, Mark Johnston wrote:
> On Sun, Apr 13, 2014 at 1:22 AM, Warner Losh wrote:
>> Author: imp
>> Date: Sun Apr 13 05:22:26 2014
>> New Revision: 264402
>> URL: http://svnweb.freebsd.org/changeset/base/264402
>>
>> Log:
>> Convert NO_MANCOMPRESS to normal convention.
>
> This breaks installworld for me with
>
> ...
> install -o root -g wheel -m 444 zh_CN.GB2312.cat
> /usr/share/nls/zh_CN.GB2312/libc.cat
> install -o root -g wheel -m 444 zh_CN.UTF-8.cat
> /usr/share/nls/zh_CN.UTF-8/libc.cat
> install -o root -g wheel -m 444 btree.3.gz /usr/share/man/man3
> install: btree.3.gz: No such file or directory
> *** Error code 71
> ...
>
>>
>> Modified:
>> head/share/examples/etc/make.conf
>> head/share/man/man5/make.conf.5
>> head/share/mk/bsd.man.mk
>> head/share/mk/bsd.own.mk
>>
>> [snip]
>>
>> Modified: head/share/mk/bsd.man.mk
>> ==
>> --- head/share/mk/bsd.man.mkSun Apr 13 05:22:22 2014(r264401)
>> +++ head/share/mk/bsd.man.mkSun Apr 13 05:22:26 2014(r264402)
>> @@ -30,9 +30,6 @@
>> # second, and there may be multiple pairs. The files
>> # are hard-linked.
>> #
>> -# NO_MANCOMPRESS If you do not want unformatted manual pages to be
>> -# compressed when they are installed. [not set]
>> -#
>> # NO_MLINKSIf you do not want install manual page links. [not set]
>> #
>> # MANFILTERcommand to pipe the raw man page through before compressing
>> @@ -77,10 +74,10 @@ MAN+= ${MAN${__sect}}
>> _manpages:
>> all-man: _manpages
>>
>> -.if defined(NO_MANCOMPRESS)
>> +.if ${MK_MANCOMPRESS} != "no"
>>
>> # Make special arrangements to filter to a temporary file at build time
>> -# for NO_MANCOMPRESS.
>> +# for MK_MANCOMPRESS == no.
>> .if defined(MANFILTER)
>> FILTEXTENSION= .filt
>> .else
>> @@ -162,7 +159,7 @@ maninstall: _maninstall
>> _maninstall:
>> .if defined(MAN) && !empty(MAN)
>> _maninstall: ${MAN}
>> -.if defined(NO_MANCOMPRESS)
>> +.if ${MK_MANCOMPRESS} == "no"
>
> Changing this line to ".if ${MK_MANCOMPRESS} != "no" seems to fix the problem.
>
>> .if defined(MANFILTER)
>> [snip]
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264421 - head/sys/netpfil/ipfw
Author: brueffer
Date: Sun Apr 13 21:13:33 2014
New Revision: 264421
URL: http://svnweb.freebsd.org/changeset/base/264421
Log:
Free resources and error cases; re-indent a curly brace while here.
CID: 1199366
Found with: Coverity Prevent(tm)
MFC after:1 week
Modified:
head/sys/netpfil/ipfw/ip_fw_sockopt.c
Modified: head/sys/netpfil/ipfw/ip_fw_sockopt.c
==
--- head/sys/netpfil/ipfw/ip_fw_sockopt.c Sun Apr 13 20:21:56 2014
(r264420)
+++ head/sys/netpfil/ipfw/ip_fw_sockopt.c Sun Apr 13 21:13:33 2014
(r264421)
@@ -1039,8 +1039,10 @@ ipfw_ctl(struct sockopt *sopt)
if (sopt->sopt_valsize == RULESIZE7(rule)) {
is7 = 1;
error = convert_rule_to_8(rule);
- if (error)
+ if (error) {
+ free(rule, M_TEMP);
return error;
+ }
if (error == 0)
error = check_ipfw_struct(rule, RULESIZE(rule));
} else {
@@ -1056,11 +1058,13 @@ ipfw_ctl(struct sockopt *sopt)
if (is7) {
error = convert_rule_to_7(rule);
size = RULESIZE7(rule);
- if (error)
+ if (error) {
+ free(rule, M_TEMP);
return error;
+ }
}
error = sooptcopyout(sopt, rule, size);
- }
+ }
}
free(rule, M_TEMP);
break;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264422 - head/sys/kern
Author: brueffer
Date: Sun Apr 13 21:23:15 2014
New Revision: 264422
URL: http://svnweb.freebsd.org/changeset/base/264422
Log:
Free buf after usage.
CID: 1199377
Found with: Coverity Prevent(tm)
MFC after:1 week
Modified:
head/sys/kern/imgact_elf.c
Modified: head/sys/kern/imgact_elf.c
==
--- head/sys/kern/imgact_elf.c Sun Apr 13 21:13:33 2014(r264421)
+++ head/sys/kern/imgact_elf.c Sun Apr 13 21:23:15 2014(r264422)
@@ -1746,8 +1746,10 @@ __elfN(note_threadmd)(void *arg, struct
size = 0;
__elfN(dump_thread)(td, buf, &size);
KASSERT(*sizep == size, ("invalid size"));
- if (size != 0 && sb != NULL)
+ if (size != 0 && sb != NULL) {
sbuf_bcat(sb, buf, size);
+ free(buf, M_TEMP);
+ }
*sizep = size;
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r264422 - head/sys/kern
On Sun, Apr 13, 2014 at 09:23:16PM +, Christian Brueffer wrote:
> Author: brueffer
> Date: Sun Apr 13 21:23:15 2014
> New Revision: 264422
> URL: http://svnweb.freebsd.org/changeset/base/264422
>
> Log:
> Free buf after usage.
>
> CID:1199377
> Found with: Coverity Prevent(tm)
> MFC after: 1 week
>
> Modified:
> head/sys/kern/imgact_elf.c
>
> Modified: head/sys/kern/imgact_elf.c
> ==
> --- head/sys/kern/imgact_elf.cSun Apr 13 21:13:33 2014
> (r264421)
> +++ head/sys/kern/imgact_elf.cSun Apr 13 21:23:15 2014
> (r264422)
> @@ -1746,8 +1746,10 @@ __elfN(note_threadmd)(void *arg, struct
> size = 0;
> __elfN(dump_thread)(td, buf, &size);
> KASSERT(*sizep == size, ("invalid size"));
> - if (size != 0 && sb != NULL)
> + if (size != 0 && sb != NULL) {
> sbuf_bcat(sb, buf, size);
> + free(buf, M_TEMP);
> + }
> *sizep = size;
> }
>
Why conditioning free() on size != 0 ?
IMO free(buf) must be done always, since buf is initialized for the case
when malloc() is not called.
pgpGqgx4tXpSv.pgp
Description: PGP signature
svn commit: r264423 - in stable/9: bin/sh tools/regression/bin/sh/expansion
Author: jilles
Date: Sun Apr 13 21:49:44 2014
New Revision: 264423
URL: http://svnweb.freebsd.org/changeset/base/264423
Log:
MFC r238468: sh: Expand assignment-like words specially for
export/readonly/local.
Examples:
export x=~
now expands the tilde
local y=$1
is now safe, even if $1 contains IFS characters or metacharacters.
For a word to "look like an assignment", it must start with a name followed
by an equals sign, none of which may be quoted.
The special treatment applies when the first word (potentially after
"command") is "export", "readonly" or "local". There may be quoting
characters but no expansions. If "local" is overridden with a function there
is no special treatment ("export" and "readonly" cannot be overridden with a
function).
If things like
local arr=(1 2 3)
are ever allowed in the future, they cannot call a "local" function. This
would either be a run-time error or it would call the builtin.
This matches Austin Group bug #351, planned for the next issue of POSIX.1.
As for the MFC, it is easy to depend on this feature inadvertently, and
adding this fixes a regression from stable/8 that may be apparent in things
like
local x=${y+a @}.
PR: bin/166771
Relnotes: yes
Added:
stable/9/tools/regression/bin/sh/expansion/export2.0
- copied unchanged from r238468,
head/tools/regression/bin/sh/expansion/export2.0
stable/9/tools/regression/bin/sh/expansion/export3.0
- copied unchanged from r238468,
head/tools/regression/bin/sh/expansion/export3.0
stable/9/tools/regression/bin/sh/expansion/local1.0
- copied unchanged from r238468,
head/tools/regression/bin/sh/expansion/local1.0
stable/9/tools/regression/bin/sh/expansion/local2.0
- copied unchanged from r238468,
head/tools/regression/bin/sh/expansion/local2.0
stable/9/tools/regression/bin/sh/expansion/readonly1.0
- copied unchanged from r238468,
head/tools/regression/bin/sh/expansion/readonly1.0
Modified:
stable/9/bin/sh/eval.c
stable/9/bin/sh/exec.c
stable/9/bin/sh/exec.h
stable/9/bin/sh/sh.1
Directory Properties:
stable/9/bin/sh/ (props changed)
stable/9/tools/regression/bin/sh/ (props changed)
Modified: stable/9/bin/sh/eval.c
==
--- stable/9/bin/sh/eval.c Sun Apr 13 21:23:15 2014(r264422)
+++ stable/9/bin/sh/eval.c Sun Apr 13 21:49:44 2014(r264423)
@@ -657,6 +657,52 @@ out:
result->fd, result->buf, result->nleft, result->jp));
}
+static int
+mustexpandto(const char *argtext, const char *mask)
+{
+ for (;;) {
+ if (*argtext == CTLQUOTEMARK || *argtext == CTLQUOTEEND) {
+ argtext++;
+ continue;
+ }
+ if (*argtext == CTLESC)
+ argtext++;
+ else if (BASESYNTAX[(int)*argtext] == CCTL)
+ return (0);
+ if (*argtext != *mask)
+ return (0);
+ if (*argtext == '\0')
+ return (1);
+ argtext++;
+ mask++;
+ }
+}
+
+static int
+isdeclarationcmd(struct narg *arg)
+{
+ int have_command = 0;
+
+ if (arg == NULL)
+ return (0);
+ while (mustexpandto(arg->text, "command")) {
+ have_command = 1;
+ arg = &arg->next->narg;
+ if (arg == NULL)
+ return (0);
+ /*
+* To also allow "command -p" and "command --" as part of
+* a declaration command, add code here.
+* We do not do this, as ksh does not do it either and it
+* is not required by POSIX.
+*/
+ }
+ return (mustexpandto(arg->text, "export") ||
+ mustexpandto(arg->text, "readonly") ||
+ (mustexpandto(arg->text, "local") &&
+ (have_command || !isfunc("local";
+}
+
/*
* Check if a builtin can safely be executed in the same process,
* even though it should be in a subshell (command substitution).
@@ -728,11 +774,12 @@ evalcommand(union node *cmd, int flags,
exitstatus = 0;
for (argp = cmd->ncmd.args ; argp ; argp = argp->narg.next) {
if (varflag && isassignment(argp->narg.text)) {
- expandarg(argp, &varlist, EXP_VARTILDE);
+ expandarg(argp, varflag == 1 ? &varlist : &arglist,
+ EXP_VARTILDE);
continue;
- }
+ } else if (varflag == 1)
+ varflag = isdeclarationcmd(&argp->narg) ? 2 : 0;
expandarg(argp, &arglist, EXP_FULL | EXP_TILDE);
- varflag = 0;
}
*arglist.lastp = NULL;
*varlist.lastp = NULL;
Modified: stable/9/bin/sh/exec.c
svn commit: r264424 - in head/share: examples/etc man/man5 mk
Author: imp
Date: Sun Apr 13 21:52:27 2014
New Revision: 264424
URL: http://svnweb.freebsd.org/changeset/base/264424
Log:
r264402 builds fine, but turns out there are problems with
install. Back it out until they can be tracked down.
Modified:
head/share/examples/etc/make.conf
head/share/man/man5/make.conf.5
head/share/mk/bsd.man.mk
head/share/mk/bsd.own.mk
Modified: head/share/examples/etc/make.conf
==
--- head/share/examples/etc/make.conf Sun Apr 13 21:49:44 2014
(r264423)
+++ head/share/examples/etc/make.conf Sun Apr 13 21:52:27 2014
(r264424)
@@ -138,7 +138,7 @@
# If you do not want unformatted manual pages to be compressed
# when they are installed:
#
-#WITHOUT_MANCOMPRESS=t
+#NO_MANCOMPRESS=
#
#
# Default format for system documentation, depends on your printer.
Modified: head/share/man/man5/make.conf.5
==
--- head/share/man/man5/make.conf.5 Sun Apr 13 21:49:44 2014
(r264423)
+++ head/share/man/man5/make.conf.5 Sun Apr 13 21:52:27 2014
(r264424)
@@ -434,11 +434,8 @@ Set this to run
.Dq Li "${MAKE} clean"
instead of
.Dq Li "${MAKE} cleandir" .
-.It Va WITH_MANCOMPRESS
-.Pq Vt defined
-Set to install manual pages compressed.
-.It Va WITHOUT_MANCOMPRESS
-.Pq Vt defined
+.It Va NO_MANCOMPRESS
+.Pq Vt bool
Set to install manual pages uncompressed.
.It Va NO_SHARE
.Pq Vt bool
Modified: head/share/mk/bsd.man.mk
==
--- head/share/mk/bsd.man.mkSun Apr 13 21:49:44 2014(r264423)
+++ head/share/mk/bsd.man.mkSun Apr 13 21:52:27 2014(r264424)
@@ -30,6 +30,9 @@
# second, and there may be multiple pairs. The files
# are hard-linked.
#
+# NO_MANCOMPRESS If you do not want unformatted manual pages to be
+# compressed when they are installed. [not set]
+#
# NO_MLINKSIf you do not want install manual page links. [not set]
#
# MANFILTERcommand to pipe the raw man page through before compressing
@@ -74,10 +77,10 @@ MAN+= ${MAN${__sect}}
_manpages:
all-man: _manpages
-.if ${MK_MANCOMPRESS} != "no"
+.if defined(NO_MANCOMPRESS)
# Make special arrangements to filter to a temporary file at build time
-# for MK_MANCOMPRESS == no.
+# for NO_MANCOMPRESS.
.if defined(MANFILTER)
FILTEXTENSION= .filt
.else
@@ -159,7 +162,7 @@ maninstall: _maninstall
_maninstall:
.if defined(MAN) && !empty(MAN)
_maninstall: ${MAN}
-.if ${MK_MANCOMPRESS} == "no"
+.if defined(NO_MANCOMPRESS)
.if defined(MANFILTER)
.for __page in ${MAN}
${MINSTALL} ${__page:T:S/$/${FILTEXTENSION}/g} \
Modified: head/share/mk/bsd.own.mk
==
--- head/share/mk/bsd.own.mkSun Apr 13 21:49:44 2014(r264423)
+++ head/share/mk/bsd.own.mkSun Apr 13 21:52:27 2014(r264424)
@@ -301,7 +301,6 @@ __DEFAULT_YES_OPTIONS = \
MAILWRAPPER \
MAKE \
MAN \
-MANCOMPRESS \
NCURSESW \
NDIS \
NETCAT \
@@ -459,14 +458,11 @@ MK_${var}:= no
# Supported NO_* options (if defined, MK_* will be forced to "no",
# regardless of user's setting).
#
-# These are transitional and will disappaer in the fullness of time.
-#
.for var in \
CTF \
DEBUG_FILES \
INSTALLLIB \
MAN \
-MANCOMPRESS \
PROFILE
.if defined(NO_${var})
MK_${var}:=no
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r264422 - head/sys/kern
On 4/13/14 11:46 PM, Konstantin Belousov wrote:
> On Sun, Apr 13, 2014 at 09:23:16PM +, Christian Brueffer wrote:
>> Author: brueffer
>> Date: Sun Apr 13 21:23:15 2014
>> New Revision: 264422
>> URL: http://svnweb.freebsd.org/changeset/base/264422
>>
>> Log:
>> Free buf after usage.
>>
>> CID: 1199377
>> Found with:Coverity Prevent(tm)
>> MFC after: 1 week
>>
>> Modified:
>> head/sys/kern/imgact_elf.c
>>
>> Modified: head/sys/kern/imgact_elf.c
>> ==
>> --- head/sys/kern/imgact_elf.c Sun Apr 13 21:13:33 2014
>> (r264421)
>> +++ head/sys/kern/imgact_elf.c Sun Apr 13 21:23:15 2014
>> (r264422)
>> @@ -1746,8 +1746,10 @@ __elfN(note_threadmd)(void *arg, struct
>> size = 0;
>> __elfN(dump_thread)(td, buf, &size);
>> KASSERT(*sizep == size, ("invalid size"));
>> -if (size != 0 && sb != NULL)
>> +if (size != 0 && sb != NULL) {
>> sbuf_bcat(sb, buf, size);
>> +free(buf, M_TEMP);
>> +}
>> *sizep = size;
>> }
>>
> Why conditioning free() on size != 0 ?
> IMO free(buf) must be done always, since buf is initialized for the case
> when malloc() is not called.
>
The corresponding malloc() call is behind a similar conditional, so it
seemed good to be symmetrical here (since buf if NULL otherwise anyway).
I can change it to call free() unconditionally if you prefer, I don't
mind either way.
Chris
signature.asc
Description: OpenPGP digital signature
svn commit: r264425 - stable/9/sys/netsmb
Author: dteske
Date: Sun Apr 13 22:00:50 2014
New Revision: 264425
URL: http://svnweb.freebsd.org/changeset/base/264425
Log:
MFC r250243:
If the kernel is compiled with VMIMAGE support, the first attempt of
mounting smbfs share will cause a panic. Fix setting/restoring vnet
context when needed.
PR: kern/168077
Submitted by: dteske
Modified:
stable/9/sys/netsmb/smb_trantcp.c
Directory Properties:
stable/9/ (props changed)
stable/9/sys/ (props changed)
Modified: stable/9/sys/netsmb/smb_trantcp.c
==
--- stable/9/sys/netsmb/smb_trantcp.c Sun Apr 13 21:52:27 2014
(r264424)
+++ stable/9/sys/netsmb/smb_trantcp.c Sun Apr 13 22:00:50 2014
(r264425)
@@ -46,6 +46,7 @@ __FBSDID("$FreeBSD$");
#include
#include
+#include
#include
#include
@@ -79,13 +80,17 @@ static int
nb_setsockopt_int(struct socket *so, int level, int name, int val)
{
struct sockopt sopt;
+ int error;
bzero(&sopt, sizeof(sopt));
sopt.sopt_level = level;
sopt.sopt_name = name;
sopt.sopt_val = &val;
sopt.sopt_valsize = sizeof(val);
- return sosetopt(so, &sopt);
+ CURVNET_SET(so->so_vnet);
+ error = sosetopt(so, &sopt);
+ CURVNET_RESTORE();
+ return error;
}
static int
@@ -286,8 +291,10 @@ nbssn_recvhdr(struct nbpcb *nbp, int *le
auio.uio_offset = 0;
auio.uio_resid = sizeof(len);
auio.uio_td = td;
+ CURVNET_SET(so->so_vnet);
error = soreceive(so, (struct sockaddr **)NULL, &auio,
(struct mbuf **)NULL, (struct mbuf **)NULL, &flags);
+ CURVNET_RESTORE();
if (error)
return error;
if (auio.uio_resid > 0) {
@@ -371,8 +378,10 @@ nbssn_recv(struct nbpcb *nbp, struct mbu
*/
do {
rcvflg = MSG_WAITALL;
+ CURVNET_SET(so->so_vnet);
error = soreceive(so, (struct sockaddr **)NULL,
&auio, &tm, (struct mbuf **)NULL, &rcvflg);
+ CURVNET_RESTORE();
} while (error == EWOULDBLOCK || error == EINTR ||
error == ERESTART);
if (error)
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264426 - stable/8/sys/netsmb
Author: dteske
Date: Sun Apr 13 22:16:18 2014
New Revision: 264426
URL: http://svnweb.freebsd.org/changeset/base/264426
Log:
MFC r250243:
If the kernel is compiled with VMIMAGE support, the first attempt of
mounting smbfs share will cause a panic. Fix setting/restoring vnet
context when needed.
PR: kern/168077
Submitted by: dteske
Modified:
stable/8/sys/netsmb/smb_trantcp.c
Directory Properties:
stable/8/ (props changed)
stable/8/sys/ (props changed)
stable/8/sys/netsmb/ (props changed)
Modified: stable/8/sys/netsmb/smb_trantcp.c
==
--- stable/8/sys/netsmb/smb_trantcp.c Sun Apr 13 22:00:50 2014
(r264425)
+++ stable/8/sys/netsmb/smb_trantcp.c Sun Apr 13 22:16:18 2014
(r264426)
@@ -52,6 +52,7 @@ __FBSDID("$FreeBSD$");
#include
#include
+#include
#include
#include
@@ -85,13 +86,17 @@ static int
nb_setsockopt_int(struct socket *so, int level, int name, int val)
{
struct sockopt sopt;
+ int error;
bzero(&sopt, sizeof(sopt));
sopt.sopt_level = level;
sopt.sopt_name = name;
sopt.sopt_val = &val;
sopt.sopt_valsize = sizeof(val);
- return sosetopt(so, &sopt);
+ CURVNET_SET(so->so_vnet);
+ error = sosetopt(so, &sopt);
+ CURVNET_RESTORE();
+ return error;
}
static int
@@ -292,8 +297,10 @@ nbssn_recvhdr(struct nbpcb *nbp, int *le
auio.uio_offset = 0;
auio.uio_resid = sizeof(len);
auio.uio_td = td;
+ CURVNET_SET(so->so_vnet);
error = soreceive(so, (struct sockaddr **)NULL, &auio,
(struct mbuf **)NULL, (struct mbuf **)NULL, &flags);
+ CURVNET_RESTORE();
if (error)
return error;
if (auio.uio_resid > 0) {
@@ -377,8 +384,10 @@ nbssn_recv(struct nbpcb *nbp, struct mbu
*/
do {
rcvflg = MSG_WAITALL;
+ CURVNET_SET(so->so_vnet);
error = soreceive(so, (struct sockaddr **)NULL,
&auio, &tm, (struct mbuf **)NULL, &rcvflg);
+ CURVNET_RESTORE();
} while (error == EWOULDBLOCK || error == EINTR ||
error == ERESTART);
if (error)
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264427 - stable/9/usr.sbin/bsdconfig/share
Author: dteske
Date: Sun Apr 13 22:32:46 2014
New Revision: 264427
URL: http://svnweb.freebsd.org/changeset/base/264427
Log:
MFC r256331:
Add $VAR_ZFSINTERACTIVE (zfsInteractive) and new f_zfsinteractive() for
determining when a script wants to be nonInteractive but selectively
wants ZFS operations to be *interactive* (this is analgous to already
existing $VAR_NETINTERACTIVE (netInteractive) and f_netinteractive()
used for the same purpose (script wants to be nonInteractive but wants
network operations to be *interactive*).
Approved by: re (glebius)
Modified:
stable/9/usr.sbin/bsdconfig/share/variable.subr
Directory Properties:
stable/9/ (props changed)
stable/9/usr.sbin/ (props changed)
stable/9/usr.sbin/bsdconfig/ (props changed)
Modified: stable/9/usr.sbin/bsdconfig/share/variable.subr
==
--- stable/9/usr.sbin/bsdconfig/share/variable.subr Sun Apr 13 22:16:18
2014(r264426)
+++ stable/9/usr.sbin/bsdconfig/share/variable.subr Sun Apr 13 22:32:46
2014(r264427)
@@ -205,6 +205,21 @@ f_netinteractive()
f_getvar $VAR_NETINTERACTIVE value && [ "$value" ]
}
+# f_zfsinteractive()
+#
+# Has the user specifically requested the ZFS-portion of configuration and
+# setup to be performed interactively? Returns success if the user has asked
+# for the ZFS configuration to be done interactively even if perhaps overall
+# non-interactive mode has been requested (by setting nonInteractive).
+#
+# Returns success if $zfsInteractive is set and non-NULL.
+#
+f_zfsinteractive()
+{
+ local value
+ f_getvar $VAR_ZFSINTERACTIVE value && [ "$value" ]
+}
+
MAIN
#
@@ -283,6 +298,7 @@ f_variable_new VAR_USER_PASSWORDuserPas
f_variable_new VAR_USER_PASSWORD_EXPIREuserPasswordExpire
f_variable_new VAR_USER_SHELL userShell
f_variable_new VAR_USER_UIDuserUid
+f_variable_new VAR_ZFSINTERACTIVE zfsInteractive
#
# Self-initialize unless requested otherwise
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264428 - head/sys/boot/fdt/dts/arm
Author: rpaulo
Date: Sun Apr 13 22:35:39 2014
New Revision: 264428
URL: http://svnweb.freebsd.org/changeset/base/264428
Log:
Improve the i.MX53 / Digi DTS:
* Fix the IPU address.
* Fix the PATA definition.
* Add another I2C.
* Add more UARTs.
* Add SATA.
Modified:
head/sys/boot/fdt/dts/arm/digi-ccwmx53.dts
head/sys/boot/fdt/dts/arm/imx53x.dtsi
Modified: head/sys/boot/fdt/dts/arm/digi-ccwmx53.dts
==
--- head/sys/boot/fdt/dts/arm/digi-ccwmx53.dts Sun Apr 13 22:32:46 2014
(r264427)
+++ head/sys/boot/fdt/dts/arm/digi-ccwmx53.dts Sun Apr 13 22:35:39 2014
(r264428)
@@ -45,7 +45,10 @@
0xB000 0x1000>;
};
- localbus@1800 {
+ localbus@1000 {
+ sata@1000 {
+ status = "okay";
+ };
ipu3@1E00 {
status = "okay";
};
@@ -69,13 +72,19 @@
timer@53fa {
status = "okay";
};
-
/* UART1, console */
console: serial@53fbc000 {
status = "okay";
clock-frequency = <0>; /* won't load w/o this */
};
-
+ serial@53fc {
+ status = "okay";
+ clock-frequency = <0>; /* won't load w/o this */
+ };
+ serial@53ff {
+ status = "okay";
+ clock-frequency = <0>; /* won't load w/o this */
+ };
clock@53fd4000 {
status = "okay";
};
@@ -100,6 +109,14 @@
wdog@53f98000 {
status = "okay";
};
+ i2c@53fec000 {
+ status = "okay";
+ rtc@68 {
+ compatible = "dialog,ds9052";
+ reg = <0x48>;
+ interrupts = <0x1 0x1 0 0>;
+ };
+ };
};
aips@6000 {
ethernet@63fec000 {
@@ -118,6 +135,9 @@
ide@63fe {
status = "okay";
};
+ serial@63f9 {
+ status = "okay";
+ };
};
};
Modified: head/sys/boot/fdt/dts/arm/imx53x.dtsi
==
--- head/sys/boot/fdt/dts/arm/imx53x.dtsi Sun Apr 13 22:32:46 2014
(r264427)
+++ head/sys/boot/fdt/dts/arm/imx53x.dtsi Sun Apr 13 22:35:39 2014
(r264428)
@@ -282,7 +282,13 @@
/* 50028000 0x4000 SPDIF */
/* 91 SPDIF */
- /* 5003 0x4000 PATA (PORT UDMA) irq70 */
+ pata@5003 {
+ compatible = "fsl,imx53-ata";
+ reg = <0x5003 0x4000>;
+ interrupt-parent = <&tzic>;
+ interrupts = <70>;
+ status = "disabled";
+ };
/* 50034000 0x4000 SLM */
/* 50038000 0x4000 HSI2C */
@@ -444,7 +450,7 @@
status = "disabled";
};
- /* 53FC 0x4000 UART 4 */
+ /* 53FF 0x4000 UART 4 */
uart4: serial@53ff {
compatible = "fsl,imx53-uart", "fsl,imx-uart";
reg = <0x53ff 0x4000>;
@@ -469,17 +475,16 @@
interrupts = <73 74>;
status = "disabled";
};
-
- /* 53FE8000 0x4000 PATA (PORT PIO) */
- /* 70 PATA Parallel ATA host controller interrupt */
- ide@53fe8000 {
- compatible = "fsl,imx53-ata";
- reg = <0x83fe 0x4000>;
+ i2c@53fec000 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "fsl,imx53-i2c", "fsl,imx1-i2c",
+ "fsl,imx-i2c";
+
svn commit: r264432 - stable/10/release/doc/en_US.ISO8859-1/relnotes
Author: gjb Date: Sun Apr 13 22:41:28 2014 New Revision: 264432 URL: http://svnweb.freebsd.org/changeset/base/264432 Log: Fix order by svn revision. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml == --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Apr 13 22:41:26 2014(r264431) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Apr 13 22:41:28 2014(r264432) @@ -118,9 +118,6 @@ Kernel Changes -The &man.geom.4; RAID driver has been - updated to support unmapped I/O. - The vfs.zfs.zio.use_uma &man.sysctl.8; has been re-enabled. On multi-CPU machines with enough RAM, this can easily double &man.zfs.8; performance or @@ -129,6 +126,9 @@ which should be resolved due to several change in the VM subsystem. +The &man.geom.4; RAID driver has been + updated to support unmapped I/O. + Virtualization support ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264431 - stable/10/release/doc/en_US.ISO8859-1/relnotes
Author: gjb Date: Sun Apr 13 22:41:26 2014 New Revision: 264431 URL: http://svnweb.freebsd.org/changeset/base/264431 Log: Document r260385, unmapped I/O in GEOM RAID. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml == --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Apr 13 22:41:24 2014(r264430) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Apr 13 22:41:26 2014(r264431) @@ -118,6 +118,9 @@ Kernel Changes +The &man.geom.4; RAID driver has been + updated to support unmapped I/O. + The vfs.zfs.zio.use_uma &man.sysctl.8; has been re-enabled. On multi-CPU machines with enough RAM, this can easily double &man.zfs.8; performance or ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264429 - stable/10/release/doc/en_US.ISO8859-1/relnotes
Author: gjb Date: Sun Apr 13 22:41:22 2014 New Revision: 264429 URL: http://svnweb.freebsd.org/changeset/base/264429 Log: Document r260177, camcontrol '-b' addition. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml == --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Apr 13 22:35:39 2014(r264428) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Apr 13 22:41:22 2014(r264429) @@ -186,7 +186,9 @@ Userland Changes - +A new flag is added to &man.camcontrol.8;, + -b, which outputs the existing buses and + their parents. /etc/rc.d Scripts ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264430 - stable/10/release/doc/en_US.ISO8859-1/relnotes
Author: gjb Date: Sun Apr 13 22:41:24 2014 New Revision: 264430 URL: http://svnweb.freebsd.org/changeset/base/264430 Log: Document r260338 Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml == --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Apr 13 22:41:22 2014(r264429) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Apr 13 22:41:24 2014(r264430) @@ -118,7 +118,13 @@ Kernel Changes - +The vfs.zfs.zio.use_uma + &man.sysctl.8; has been re-enabled. On multi-CPU machines with + enough RAM, this can easily double &man.zfs.8; performance or + reduce CPU usage in half. It was originally disabled due to + memory and KVA exhastion problem reports, + which should be resolved due to several change in the VM + subsystem. Virtualization support ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264433 - stable/10/release/doc/en_US.ISO8859-1/relnotes
Author: gjb Date: Sun Apr 13 22:41:30 2014 New Revision: 264433 URL: http://svnweb.freebsd.org/changeset/base/264433 Log: Document r260431, kern.panic_reboot_wait_time sysctl. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml == --- stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Apr 13 22:41:28 2014(r264432) +++ stable/10/release/doc/en_US.ISO8859-1/relnotes/article.xml Sun Apr 13 22:41:30 2014(r264433) @@ -129,6 +129,11 @@ The &man.geom.4; RAID driver has been updated to support unmapped I/O. +A new &man.sysctl.8;, + kern.panic_reboot_wait_time, has been added, + which allows controlling how long the system will wait after + &man.panic.9; before rebooting. + Virtualization support ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r264402 - in head/share: examples/etc man/man5 mk
On Sun, Apr 13, 2014 at 4:57 PM, Warner Losh wrote:
>
> Are you sure it is this exact commit?
It seems to be. I tried a
# make SRCCONF=/dev/null MAKECONF=/dev/null buildworld installworld
with and without this commit reverted, and installworld completed
successfully when the change was reverted.
>
> Do you have anything in your /etc/make.conf or /etc/src.conf file?
Yes, but clearing them doesn't fix the problem.
>
> Can you send me your full install world output?
Attached.
>
> I’ll see if I can reproduce it myself.
>
> Warner
>
> On Apr 13, 2014, at 1:32 PM, Mark Johnston wrote:
>
>> On Sun, Apr 13, 2014 at 1:22 AM, Warner Losh wrote:
>>> Author: imp
>>> Date: Sun Apr 13 05:22:26 2014
>>> New Revision: 264402
>>> URL: http://svnweb.freebsd.org/changeset/base/264402
>>>
>>> Log:
>>> Convert NO_MANCOMPRESS to normal convention.
>>
>> This breaks installworld for me with
>>
>> ...
>> install -o root -g wheel -m 444 zh_CN.GB2312.cat
>> /usr/share/nls/zh_CN.GB2312/libc.cat
>> install -o root -g wheel -m 444 zh_CN.UTF-8.cat
>> /usr/share/nls/zh_CN.UTF-8/libc.cat
>> install -o root -g wheel -m 444 btree.3.gz /usr/share/man/man3
>> install: btree.3.gz: No such file or directory
>> *** Error code 71
>> ...
>>
>>>
>>> Modified:
>>> head/share/examples/etc/make.conf
>>> head/share/man/man5/make.conf.5
>>> head/share/mk/bsd.man.mk
>>> head/share/mk/bsd.own.mk
>>>
>>> [snip]
>>>
>>> Modified: head/share/mk/bsd.man.mk
>>> ==
>>> --- head/share/mk/bsd.man.mkSun Apr 13 05:22:22 2014(r264401)
>>> +++ head/share/mk/bsd.man.mkSun Apr 13 05:22:26 2014(r264402)
>>> @@ -30,9 +30,6 @@
>>> # second, and there may be multiple pairs. The files
>>> # are hard-linked.
>>> #
>>> -# NO_MANCOMPRESS If you do not want unformatted manual pages to be
>>> -# compressed when they are installed. [not set]
>>> -#
>>> # NO_MLINKSIf you do not want install manual page links. [not set]
>>> #
>>> # MANFILTERcommand to pipe the raw man page through before compressing
>>> @@ -77,10 +74,10 @@ MAN+= ${MAN${__sect}}
>>> _manpages:
>>> all-man: _manpages
>>>
>>> -.if defined(NO_MANCOMPRESS)
>>> +.if ${MK_MANCOMPRESS} != "no"
>>>
>>> # Make special arrangements to filter to a temporary file at build time
>>> -# for NO_MANCOMPRESS.
>>> +# for MK_MANCOMPRESS == no.
>>> .if defined(MANFILTER)
>>> FILTEXTENSION= .filt
>>> .else
>>> @@ -162,7 +159,7 @@ maninstall: _maninstall
>>> _maninstall:
>>> .if defined(MAN) && !empty(MAN)
>>> _maninstall: ${MAN}
>>> -.if defined(NO_MANCOMPRESS)
>>> +.if ${MK_MANCOMPRESS} == "no"
>>
>> Changing this line to ".if ${MK_MANCOMPRESS} != "no" seems to fix the
>> problem.
>>
>>> .if defined(MANFILTER)
>>> [snip]
>
btree_failure.log
Description: Binary data
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r264402 - in head/share: examples/etc man/man5 mk
Thanks Mark.
I’ve recreated both the problem, and the solution. I’ve reverted the offending
change until I have time to make sure my fix actually works in a variety of
situations.
The tree should be good to go now.
Warner
On Apr 13, 2014, at 5:10 PM, Mark Johnston wrote:
> On Sun, Apr 13, 2014 at 4:57 PM, Warner Losh wrote:
>>
>> Are you sure it is this exact commit?
>
> It seems to be. I tried a
>
> # make SRCCONF=/dev/null MAKECONF=/dev/null buildworld installworld
>
> with and without this commit reverted, and installworld completed
> successfully when the change was reverted.
>
>>
>> Do you have anything in your /etc/make.conf or /etc/src.conf file?
>
> Yes, but clearing them doesn't fix the problem.
>
>>
>> Can you send me your full install world output?
>
> Attached.
>
>>
>> I’ll see if I can reproduce it myself.
>>
>> Warner
>>
>> On Apr 13, 2014, at 1:32 PM, Mark Johnston wrote:
>>
>>> On Sun, Apr 13, 2014 at 1:22 AM, Warner Losh wrote:
Author: imp
Date: Sun Apr 13 05:22:26 2014
New Revision: 264402
URL: http://svnweb.freebsd.org/changeset/base/264402
Log:
Convert NO_MANCOMPRESS to normal convention.
>>>
>>> This breaks installworld for me with
>>>
>>> ...
>>> install -o root -g wheel -m 444 zh_CN.GB2312.cat
>>> /usr/share/nls/zh_CN.GB2312/libc.cat
>>> install -o root -g wheel -m 444 zh_CN.UTF-8.cat
>>> /usr/share/nls/zh_CN.UTF-8/libc.cat
>>> install -o root -g wheel -m 444 btree.3.gz /usr/share/man/man3
>>> install: btree.3.gz: No such file or directory
>>> *** Error code 71
>>> ...
>>>
Modified:
head/share/examples/etc/make.conf
head/share/man/man5/make.conf.5
head/share/mk/bsd.man.mk
head/share/mk/bsd.own.mk
[snip]
Modified: head/share/mk/bsd.man.mk
==
--- head/share/mk/bsd.man.mkSun Apr 13 05:22:22 2014(r264401)
+++ head/share/mk/bsd.man.mkSun Apr 13 05:22:26 2014(r264402)
@@ -30,9 +30,6 @@
# second, and there may be multiple pairs. The files
# are hard-linked.
#
-# NO_MANCOMPRESS If you do not want unformatted manual pages to be
-# compressed when they are installed. [not set]
-#
# NO_MLINKSIf you do not want install manual page links. [not set]
#
# MANFILTERcommand to pipe the raw man page through before compressing
@@ -77,10 +74,10 @@ MAN+= ${MAN${__sect}}
_manpages:
all-man: _manpages
-.if defined(NO_MANCOMPRESS)
+.if ${MK_MANCOMPRESS} != "no"
# Make special arrangements to filter to a temporary file at build time
-# for NO_MANCOMPRESS.
+# for MK_MANCOMPRESS == no.
.if defined(MANFILTER)
FILTEXTENSION= .filt
.else
@@ -162,7 +159,7 @@ maninstall: _maninstall
_maninstall:
.if defined(MAN) && !empty(MAN)
_maninstall: ${MAN}
-.if defined(NO_MANCOMPRESS)
+.if ${MK_MANCOMPRESS} == "no"
>>>
>>> Changing this line to ".if ${MK_MANCOMPRESS} != "no" seems to fix the
>>> problem.
>>>
.if defined(MANFILTER)
[snip]
>>
>
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264434 - in head/sys/cddl: contrib/opensolaris/uts/common/dtrace contrib/opensolaris/uts/common/sys contrib/opensolaris/uts/intel/dtrace dev/dtrace
Author: markj
Date: Mon Apr 14 00:22:42 2014
New Revision: 264434
URL: http://svnweb.freebsd.org/changeset/base/264434
Log:
DTrace's pid provider works by inserting breakpoint instructions at probe
sites and installing a hook at the kernel's trap handler. The fasttrap code
will emulate the overwritten instruction in some common cases, but otherwise
copies it out into some scratch space in the traced process' address space
and ensures that it's executed after returning from the trap.
In Solaris and illumos, this (per-thread) scratch space comes from some
reserved space in TLS, accessible via the fs segment register. This
approach is somewhat unappealing on FreeBSD since it would require some
modifications to rtld and jemalloc (for static TLS) to ensure that TLS is
executable, and would thus introduce dependencies on their implementation
details. I think it would also be impossible to safely trace static binaries
compiled without these modifications.
This change implements the functionality in a different way, by having
fasttrap map pages into the target process' address space on demand. Each
page is divided into 64-byte chunks for use by individual threads, and
fasttrap's process descriptor struct has been extended to keep track of
any scratch space allocated for the corresponding process.
With this change it's possible to trace all libc functions in a program,
e.g. with
pid$target:libc.so.*::entry {@[probefunc] = count();}
Previously this would generally cause the victim process to crash, as
tracing memcpy on amd64 requires the functionality described above.
Tested by:Prashanth Kumar (earlier version)
MFC after:6 weeks
Modified:
head/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c
head/sys/cddl/contrib/opensolaris/uts/common/sys/fasttrap_impl.h
head/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c
head/sys/cddl/dev/dtrace/dtrace_cddl.h
Modified: head/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c
==
--- head/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c Sun Apr
13 22:41:30 2014(r264433)
+++ head/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c Mon Apr
14 00:22:42 2014(r264434)
@@ -61,8 +61,13 @@
#include
#include
#if !defined(sun)
-#include
#include
+#include
+#include
+#include
+#include
+#include
+#include
#include
#endif
@@ -206,6 +211,10 @@ static void fasttrap_provider_free(fastt
static fasttrap_proc_t *fasttrap_proc_lookup(pid_t);
static void fasttrap_proc_release(fasttrap_proc_t *);
+#if !defined(sun)
+static void fasttrap_thread_dtor(void *, struct thread *);
+#endif
+
#defineFASTTRAP_PROVS_INDEX(pid, name) \
((fasttrap_hash_str(name) + (pid)) & fasttrap_provs.fth_mask)
@@ -213,6 +222,7 @@ static void fasttrap_proc_release(fasttr
#if !defined(sun)
static kmutex_t fasttrap_cpuc_pid_lock[MAXCPU];
+static eventhandler_tag fasttrap_thread_dtor_tag;
#endif
static int
@@ -289,6 +299,118 @@ fasttrap_sigtrap(proc_t *p, kthread_t *t
#endif
}
+#if !defined(sun)
+/*
+ * Obtain a chunk of scratch space in the address space of the target process.
+ */
+fasttrap_scrspace_t *
+fasttrap_scraddr(struct thread *td, fasttrap_proc_t *fprc)
+{
+ fasttrap_scrblock_t *scrblk;
+ fasttrap_scrspace_t *scrspc;
+ struct proc *p;
+ vm_offset_t addr;
+ int error, i;
+
+ scrspc = NULL;
+ if (td->t_dtrace_sscr != NULL) {
+ /* If the thread already has scratch space, we're done. */
+ scrspc = (fasttrap_scrspace_t *)td->t_dtrace_sscr;
+ return (scrspc);
+ }
+
+ p = td->td_proc;
+
+ mutex_enter(&fprc->ftpc_mtx);
+ if (LIST_EMPTY(&fprc->ftpc_fscr)) {
+ /*
+* No scratch space is available, so we'll map a new scratch
+* space block into the traced process' address space.
+*/
+ addr = 0;
+ error = vm_map_find(&p->p_vmspace->vm_map, NULL, 0, &addr,
+ FASTTRAP_SCRBLOCK_SIZE, 0, VMFS_ANY_SPACE, VM_PROT_ALL,
+ VM_PROT_ALL, 0);
+ if (error != KERN_SUCCESS)
+ goto done;
+
+ scrblk = malloc(sizeof(*scrblk), M_SOLARIS, M_WAITOK);
+ scrblk->ftsb_addr = addr;
+ LIST_INSERT_HEAD(&fprc->ftpc_scrblks, scrblk, ftsb_next);
+
+ /*
+* Carve the block up into chunks and put them on the free list.
+*/
+ for (i = 0;
+ i < FASTTRAP_SCRBLOCK_SIZE / FASTTRAP_SCRSPACE_SIZE; i++) {
+ scrspc = malloc(sizeof(*scrspc), M_SOLARIS, M_WAITOK);
+ scrspc->ftss_addr = addr +
+ i * FASTTRAP_SCRSPACE_SIZE;
+
svn commit: r264435 - head/sys/cddl/dev/systrace
Author: markj
Date: Mon Apr 14 00:23:18 2014
New Revision: 264435
URL: http://svnweb.freebsd.org/changeset/base/264435
Log:
Ensure that all eight syscall arguments are available to dtrace_probe(),
rather than just the first five. This is done by calling dtrace_probe()
through a function pointer, as in illumos.
MFC after:3 weeks
Modified:
head/sys/cddl/dev/systrace/systrace.c
Modified: head/sys/cddl/dev/systrace/systrace.c
==
--- head/sys/cddl/dev/systrace/systrace.c Mon Apr 14 00:22:42 2014
(r264434)
+++ head/sys/cddl/dev/systrace/systrace.c Mon Apr 14 00:23:18 2014
(r264435)
@@ -168,6 +168,9 @@ static dtrace_pops_t systrace_pops = {
static struct cdev *systrace_cdev;
static dtrace_provider_id_tsystrace_id;
+typedef void (*systrace_dtrace_probe_t)(dtrace_id_t, uintptr_t, uintptr_t,
+uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t);
+
#if !defined(LINUX_SYSTRACE)
/*
* Probe callback function.
@@ -180,6 +183,7 @@ static void
systrace_probe(u_int32_t id, int sysnum, struct sysent *sysent, void *params,
int ret)
{
+ systrace_dtrace_probe_t probe;
int n_args = 0;
u_int64_t uargs[8];
@@ -211,7 +215,9 @@ systrace_probe(u_int32_t id, int sysnum,
}
/* Process the probe using the converted argments. */
- dtrace_probe(id, uargs[0], uargs[1], uargs[2], uargs[3], uargs[4]);
+ probe = (systrace_dtrace_probe_t)dtrace_probe;
+ probe(id, uargs[0], uargs[1], uargs[2], uargs[3], uargs[4], uargs[5],
+ uargs[6], uargs[7]);
}
#endif
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264436 - head/lib/libproc
Author: markj
Date: Mon Apr 14 00:24:04 2014
New Revision: 264436
URL: http://svnweb.freebsd.org/changeset/base/264436
Log:
Fix some off-by-one errors. The kve_end and rdl_eaddr fields contain the
first address after the end of the map entry and should therefore be
excluded.
MFC after:2 weeks
Modified:
head/lib/libproc/proc_sym.c
Modified: head/lib/libproc/proc_sym.c
==
--- head/lib/libproc/proc_sym.c Mon Apr 14 00:23:18 2014(r264435)
+++ head/lib/libproc/proc_sym.c Mon Apr 14 00:24:04 2014(r264436)
@@ -96,7 +96,7 @@ proc_objname(struct proc_handle *p, uint
for (i = 0; i < p->nobjs; i++) {
rdl = &p->rdobjs[i];
- if (addr >= rdl->rdl_saddr && addr <= rdl->rdl_eaddr) {
+ if (addr >= rdl->rdl_saddr && addr < rdl->rdl_eaddr) {
strlcpy(objname, rdl->rdl_path, objnamesz);
return (objname);
}
@@ -176,7 +176,7 @@ proc_addr2map(struct proc_handle *p, uin
kve = kves + i;
if (kve->kve_type == KVME_TYPE_VNODE)
lastvn = i;
- if (addr >= kve->kve_start && addr <= kve->kve_end) {
+ if (addr >= kve->kve_start && addr < kve->kve_end) {
if ((map = malloc(sizeof(*map))) == NULL) {
free(kves);
return (NULL);
@@ -209,7 +209,7 @@ proc_addr2map(struct proc_handle *p, uin
for (i = 0; i < p->nobjs; i++) {
rdl = &p->rdobjs[i];
- if (addr >= rdl->rdl_saddr && addr <= rdl->rdl_eaddr) {
+ if (addr >= rdl->rdl_saddr && addr < rdl->rdl_eaddr) {
if ((map = malloc(sizeof(*map))) == NULL)
return (NULL);
proc_rdl2prmap(rdl, map);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264437 - in stable/9/usr.sbin/bsdinstall: . scripts
Author: dteske
Date: Mon Apr 14 01:18:02 2014
New Revision: 264437
URL: http://svnweb.freebsd.org/changeset/base/264437
Log:
MFC r256343,256540-256541,256544,256549,256551,256553,257939,258021,258927,
259144,259148,259470,259472,259474,259476-259478,259480-259481,259570,
259597-259598, and 261960 (24 revisions; summarized below)...
r256343: Add zfsboot module as an option for automatic configuration
r256540: Add zpool_cache_* variables to loader.conf(5)
r256541: Document BSDINSTALL_TMPBOOT in bsdinstall.8
r256544: Fix a typo when setting up loader.conf(5) GELI entries
r256549: Document zfsboot in bsdinstall.8
r256551: Bump .Dd date in bsdinstall.8
r256553: Align ZFSBOOT_BEROOT_NAME with sysutils/beadm + Solaris beadm
r257939: Validate scripted partition entry before acting on disks
r258021: Switch default MBR bootcode from /boot/boot0 to /boot/mbr
r258927: Fix early regression in enabling the Encryption feature
r259144: Fix early regression in entering passphrase for Encryption
r259148: Fix typo that broke booting from Encrypted setup
r259470: Add default /var/mail with atime=on for mail apps
r259472: Accept NULL input as also meaning zero swap
r259474: Bug fixes and debugging improvements
r259476: Improve default ZFS disk layout
r259477: fletcher4 is currently the default
r259478: De-uglify the geli(8)-setup infobox by adding a newline
r259480: Fix ghosted zroot pool issue
r259481: Auto-enable 4k alignment with Encryption
r259570: Fix "[: -eq: argument expected" error
r259597: Fix installation to 3-4+ disks
r259598: Set the cachefile property so bootpools get imported
r261960: Add zfsboot to scripted interface of bsdinstall
Added:
stable/9/usr.sbin/bsdinstall/scripts/zfsboot
- copied, changed from r256343, head/usr.sbin/bsdinstall/scripts/zfsboot
Modified:
stable/9/usr.sbin/bsdinstall/bsdinstall
stable/9/usr.sbin/bsdinstall/bsdinstall.8
stable/9/usr.sbin/bsdinstall/scripts/Makefile
stable/9/usr.sbin/bsdinstall/scripts/auto
stable/9/usr.sbin/bsdinstall/scripts/config
stable/9/usr.sbin/bsdinstall/scripts/script
Directory Properties:
stable/9/ (props changed)
stable/9/usr.sbin/ (props changed)
stable/9/usr.sbin/bsdinstall/ (props changed)
stable/9/usr.sbin/bsdinstall/scripts/ (props changed)
Modified: stable/9/usr.sbin/bsdinstall/bsdinstall
==
--- stable/9/usr.sbin/bsdinstall/bsdinstall Mon Apr 14 00:24:04 2014
(r264436)
+++ stable/9/usr.sbin/bsdinstall/bsdinstall Mon Apr 14 01:18:02 2014
(r264437)
@@ -41,6 +41,7 @@ BSDCFG_SHARE="/usr/share/bsdconfig"
GLOBALS
: ${BSDINSTALL_TMPETC="/tmp/bsdinstall_etc"}; export BSDINSTALL_TMPETC
+: ${BSDINSTALL_TMPBOOT="/tmp/bsdinstall_boot"}; export BSDINSTALL_TMPBOOT
: ${PATH_FSTAB="$BSDINSTALL_TMPETC/fstab"}; export PATH_FSTAB
: ${BSDINSTALL_DISTDIR="/usr/freebsd-dist"}; export BSDINSTALL_DISTDIR
: ${BSDINSTALL_CHROOT="/mnt"}; export BSDINSTALL_CHROOT
@@ -61,6 +62,7 @@ shift $(( $OPTIND - 1 ))
VERB="${1:-auto}"; shift
[ -d "$BSDINSTALL_TMPETC" ] || mkdir -p "$BSDINSTALL_TMPETC"
+[ -d "$BSDINSTALL_TMPBOOT" ] || mkdir -p "$BSDINSTALL_TMPBOOT"
# Only enable debugging if debugFile is non-NULL and can be initialized
f_quietly f_debug_init
Modified: stable/9/usr.sbin/bsdinstall/bsdinstall.8
==
--- stable/9/usr.sbin/bsdinstall/bsdinstall.8 Mon Apr 14 00:24:04 2014
(r264436)
+++ stable/9/usr.sbin/bsdinstall/bsdinstall.8 Mon Apr 14 01:18:02 2014
(r264437)
@@ -25,7 +25,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd October 6, 2013
+.Dd October 15, 2013
.Dt BSDINSTALL 8
.Os
.Sh NAME
@@ -121,6 +121,21 @@ installations. Partitions disks, runs
.Xr newfs 8 ,
and writes the new system's
.Pa fstab .
+.It Cm zfsboot
+Provides the installer's
+.Pq experimental
+interactive/scriptable ZFS partitioner for multi-disk installations.
+Creates a single
+.Ic zpool
+with datasets and writes to the new system's
+.Pa rc.conf ,
+.Pa loader.conf ,
+and
+.Pa fstab .
+Supports
+.Xr geli 8 ,
+.Xr gnop 8 ,
+and many other features.
.It Cm partedit
Provides the installer's interactive manual disk partitioner, with support
for multi disk setups, non-UFS file systems, and manual selection of
@@ -267,6 +282,14 @@ will be stored until the
target is executed. If this directory does not already exist, it will be
created. Default:
.Pa /tmp/bsdinstall_etc
+.It Ev BSDINSTALL_TMPBOOT
+Directory where files destined for the new system's
+.Pa /boot
+will be stored until the
+.Cm config
+target is executed. If this directory does not already exist, it will be
+created. Default:
+.Pa /tmp/bsdinstall_boot
.El
.Sh SCRIPTING
.Nm
@@ -320,6 +343,15 @@ the preamble can contain a variable
which is passed to the
.Cm scriptedpart
target to control disk setup.
+Alter
svn commit: r264438 - in stable/10/etc: . rc.d
Author: dteske
Date: Mon Apr 14 01:44:56 2014
New Revision: 264438
URL: http://svnweb.freebsd.org/changeset/base/264438
Log:
MFC r264243:
Loosen the processing of *_IF_aliasN vars to be less strict. Previously,
the first alias had to be _alias0 and processing stopped at the first non-
defined variable (preventing gaps). Allowing gaps gives the administrator
the ability to group aliases in an adhoc manner and also lifts the
requirement to renumber aliases simply to comment-out an existing one.
Aliases are processed in numerical ascending order.
NB: Also Patches mdconfig{,2} rc(8) boot scripts to loosen the numbering
scheme for mdconfig_mdN settings to be less strict in the same manner.
Discussed on: -rc
Modified:
stable/10/etc/network.subr
stable/10/etc/rc.d/mdconfig
stable/10/etc/rc.d/mdconfig2
stable/10/etc/rc.subr
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/etc/network.subr
==
--- stable/10/etc/network.subr Mon Apr 14 01:18:02 2014(r264437)
+++ stable/10/etc/network.subr Mon Apr 14 01:44:56 2014(r264438)
@@ -285,10 +285,8 @@ get_if_var()
fi
_if=$1
- _punct=". - / +"
- for _punct_c in $_punct; do
- _if=`ltr ${_if} ${_punct_c} '_'`
- done
+ _punct=".-/+"
+ ltr ${_if} "${_punct}" '_' _if
_var=$2
_default=$3
@@ -1081,6 +1079,7 @@ ifalias_af_common_handler()
ifalias_af_common()
{
local _ret _if _af _action alias ifconfig_args _aliasn _c _tmpargs _iaf
+ local _punct=".-/+"
_ret=1
_aliasn=
@@ -1088,10 +1087,14 @@ ifalias_af_common()
_af=$2
_action=$3
+ # Normalize $_if before using it in a pattern to list_vars()
+ ltr "$_if" "$_punct" "_" _if
+
# ifconfig_IF_aliasN which starts with $_af
- alias=0
- while : ; do
- ifconfig_args=`get_if_var $_if ifconfig_IF_alias${alias}`
+ for alias in `list_vars ifconfig_${_if}_alias[0-9]\* |
+ sort_lite -nk1.$((9+${#_if}+7))`
+ do
+ eval ifconfig_args=\"\$$alias\"
_iaf=
case $ifconfig_args in
inet\ *)_iaf=inet ;;
@@ -1113,15 +1116,15 @@ ifalias_af_common()
warn "\$ifconfig_${_if}_alias${alias} needs " \
"\"inet\" keyword for an IPv4 address."
esac
- alias=$(($alias + 1))
done
# backward compatibility: ipv6_ifconfig_IF_aliasN.
case $_af in
inet6)
- alias=0
- while : ; do
- ifconfig_args=`get_if_var $_if
ipv6_ifconfig_IF_alias${alias}`
+ for alias in `list_vars ipv6_ifconfig_${_if}_alias[0-9]\* |
+ sort_lite -nk1.$((14+${#_if}+7))`
+ do
+ eval ifconfig_args=\"\$$alias\"
case ${_action}:"${ifconfig_args}" in
*:"")
break
@@ -1133,7 +1136,6 @@ ifalias_af_common()
"instead."
;;
esac
- alias=$(($alias + 1))
done
esac
Modified: stable/10/etc/rc.d/mdconfig
==
--- stable/10/etc/rc.d/mdconfig Mon Apr 14 01:18:02 2014(r264437)
+++ stable/10/etc/rc.d/mdconfig Mon Apr 14 01:44:56 2014(r264438)
@@ -181,17 +181,14 @@ fi
load_rc_config $name
-_mdconfig_unit=0
if [ -z "${_mdconfig_list}" ]; then
- while :; do
- eval _mdconfig_config=\$mdconfig_md${_mdconfig_unit}
- if [ -z "${_mdconfig_config}" ]; then
- break
- else
- _mdconfig_list="${_mdconfig_list}${_mdconfig_list:+
}md${_mdconfig_unit}"
- _mdconfig_unit=$((${_mdconfig_unit} + 1))
- fi
+ for _mdconfig_config in `list_vars mdconfig_md[0-9]\* |
+ sort_lite -nk1.12`
+ do
+ _mdconfig_unit=${_mdconfig_config#mdconfig_md}
+ _mdconfig_list="$_mdconfig_list md$_mdconfig_unit"
done
+ _mdconfig_list="${_mdconfig_list# }"
fi
run_rc_command "${_mdconfig_cmd}"
Modified: stable/10/etc/rc.d/mdconfig2
==
--- stable/10/etc/rc.d/mdconfig2Mon Apr 14 01:18:02 2014
(r264437)
+++ stable/10/etc/rc.d/mdconfig2Mon Apr 14 01:44:56 2014
(r264438)
@@ -211,17 +211,14 @@ fi
load_rc_config $name
-_mdconfig2_unit=0
if [ -z "${_mdconfig2_list}" ]; then
- while :; do
- eval _mdconfig2_config=\$mdconfig_md${_mdconfig2_unit}
- if [ -z "${_mdconfig2_config}" ]; the
svn commit: r264439 - in stable/9/etc: . rc.d
Author: dteske
Date: Mon Apr 14 01:49:26 2014
New Revision: 264439
URL: http://svnweb.freebsd.org/changeset/base/264439
Log:
MFC r264243:
Loosen the processing of *_IF_aliasN vars to be less strict. Previously,
the first alias had to be _alias0 and processing stopped at the first non-
defined variable (preventing gaps). Allowing gaps gives the administrator
the ability to group aliases in an adhoc manner and also lifts the
requirement to renumber aliases simply to comment-out an existing one.
Aliases are processed in numerical ascending order.
NB: Also Patches mdconfig{,2} rc(8) boot scripts to loosen the numbering
scheme for mdconfig_mdN settings to be less strict in the same manner.
Discussed on: -rc
Modified:
stable/9/etc/network.subr
stable/9/etc/rc.d/mdconfig
stable/9/etc/rc.d/mdconfig2
stable/9/etc/rc.subr
Directory Properties:
stable/9/ (props changed)
stable/9/etc/ (props changed)
stable/9/etc/rc.d/ (props changed)
Modified: stable/9/etc/network.subr
==
--- stable/9/etc/network.subr Mon Apr 14 01:44:56 2014(r264438)
+++ stable/9/etc/network.subr Mon Apr 14 01:49:26 2014(r264439)
@@ -246,10 +246,8 @@ get_if_var()
fi
_if=$1
- _punct=". - / +"
- for _punct_c in $_punct; do
- _if=`ltr ${_if} ${_punct_c} '_'`
- done
+ _punct=".-/+"
+ ltr ${_if} "${_punct}" '_' _if
_var=$2
_default=$3
@@ -1013,6 +1011,7 @@ ifalias_af_common_handler()
ifalias_af_common()
{
local _ret _if _af _action alias ifconfig_args _aliasn _c _tmpargs _iaf
+ local _punct=".-/+"
_ret=1
_aliasn=
@@ -1020,10 +1019,14 @@ ifalias_af_common()
_af=$2
_action=$3
+ # Normalize $_if before using it in a pattern to list_vars()
+ ltr "$_if" "$_punct" "_" _if
+
# ifconfig_IF_aliasN which starts with $_af
- alias=0
- while : ; do
- ifconfig_args=`get_if_var $_if ifconfig_IF_alias${alias}`
+ for alias in `list_vars ifconfig_${_if}_alias[0-9]\* |
+ sort_lite -nk1.$((9+${#_if}+7))`
+ do
+ eval ifconfig_args=\"\$$alias\"
_iaf=
case $ifconfig_args in
inet\ *)_iaf=inet ;;
@@ -1045,15 +1048,15 @@ ifalias_af_common()
warn "\$ifconfig_${_if}_alias${alias} needs " \
"\"inet\" keyword for an IPv4 address."
esac
- alias=$(($alias + 1))
done
# backward compatibility: ipv6_ifconfig_IF_aliasN.
case $_af in
inet6)
- alias=0
- while : ; do
- ifconfig_args=`get_if_var $_if
ipv6_ifconfig_IF_alias${alias}`
+ for alias in `list_vars ipv6_ifconfig_${_if}_alias[0-9]\* |
+ sort_lite -nk1.$((14+${#_if}+7))`
+ do
+ eval ifconfig_args=\"\$$alias\"
case ${_action}:"${ifconfig_args}" in
*:"")
break
@@ -1065,7 +1068,6 @@ ifalias_af_common()
"instead."
;;
esac
- alias=$(($alias + 1))
done
esac
Modified: stable/9/etc/rc.d/mdconfig
==
--- stable/9/etc/rc.d/mdconfig Mon Apr 14 01:44:56 2014(r264438)
+++ stable/9/etc/rc.d/mdconfig Mon Apr 14 01:49:26 2014(r264439)
@@ -181,17 +181,14 @@ fi
load_rc_config $name
-_mdconfig_unit=0
if [ -z "${_mdconfig_list}" ]; then
- while :; do
- eval _mdconfig_config=\$mdconfig_md${_mdconfig_unit}
- if [ -z "${_mdconfig_config}" ]; then
- break
- else
- _mdconfig_list="${_mdconfig_list}${_mdconfig_list:+
}md${_mdconfig_unit}"
- _mdconfig_unit=$((${_mdconfig_unit} + 1))
- fi
+ for _mdconfig_config in `list_vars mdconfig_md[0-9]\* |
+ sort_lite -nk1.12`
+ do
+ _mdconfig_unit=${_mdconfig_config#mdconfig_md}
+ _mdconfig_list="$_mdconfig_list md$_mdconfig_unit"
done
+ _mdconfig_list="${_mdconfig_list# }"
fi
run_rc_command "${_mdconfig_cmd}"
Modified: stable/9/etc/rc.d/mdconfig2
==
--- stable/9/etc/rc.d/mdconfig2 Mon Apr 14 01:44:56 2014(r264438)
+++ stable/9/etc/rc.d/mdconfig2 Mon Apr 14 01:49:26 2014(r264439)
@@ -211,17 +211,14 @@ fi
load_rc_config $name
-_mdconfig2_unit=0
if [ -z "${_mdconfig2_list}" ]; then
- while :; do
- eval _mdconfig2_config=\$mdconfig_md${_mdconfig2_unit}
-
svn commit: r264440 - in stable/10: release share/man/man7
Author: gjb
Date: Mon Apr 14 03:57:45 2014
New Revision: 264440
URL: http://svnweb.freebsd.org/changeset/base/264440
Log:
MFC r264343:
Add SRC_UPDATE_SKIP, DOC_UPDATE_SKIP, and PORTS_UPDATE_SKIP
variables. These are intended to allow bypassing the
'svn co /usr/{src,doc,ports}' step in the chroot when the
tree exists from external means.
The use case here is that /usr/src, /usr/doc, and /usr/ports
in the chroot exist as result of zfs dataset clones, so it
is possible (and happens quite often) that the included
distributions may not be consistent. (This is not the case
for -RELEASE builds, but does happen for snapshot builds.)
Sponsored by: The FreeBSD Foundation
Modified:
stable/10/release/release.conf.sample
stable/10/release/release.sh
stable/10/share/man/man7/release.7
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/release/release.conf.sample
==
--- stable/10/release/release.conf.sample Mon Apr 14 01:49:26 2014
(r264439)
+++ stable/10/release/release.conf.sample Mon Apr 14 03:57:45 2014
(r264440)
@@ -56,6 +56,18 @@ PORTBRANCH="ports/head@rHEAD"
## means.
#CHROOTBUILD_SKIP=
+## Set to a non-empty value skip checkout or update of /usr/src in
+## the chroot. This is intended for use when /usr/src already exists.
+#SRC_UPDATE_SKIP=
+
+## Set to a non-empty value skip checkout or update of /usr/doc in
+## the chroot. This is intended for use when /usr/doc already exists.
+#DOC_UPDATE_SKIP=
+
+## Set to a non-empty value skip checkout or update of /usr/ports in
+## the chroot. This is intended for use when /usr/ports already exists.
+#PORTS_UPDATE_SKIP=
+
## Set to pass additional flags to make(1) for the build chroot setup, such
## as TARGET/TARGET_ARCH.
#CHROOT_MAKEENV=
Modified: stable/10/release/release.sh
==
--- stable/10/release/release.shMon Apr 14 01:49:26 2014
(r264439)
+++ stable/10/release/release.shMon Apr 14 03:57:45 2014
(r264440)
@@ -190,11 +190,13 @@ set -e # Everything must succeed
mkdir -p ${CHROOTDIR}/usr
-${VCSCMD} ${FORCE_SRC_KEY} ${SRCBRANCH} ${CHROOTDIR}/usr/src
-if [ -z "${NODOC}" ]; then
+if [ -z "${SRC_UPDATE_SKIP}" ]; then
+ ${VCSCMD} ${FORCE_SRC_KEY} ${SRCBRANCH} ${CHROOTDIR}/usr/src
+fi
+if [ -z "${NODOC}" ] && [ -z "${DOC_UPDATE_SKIP}" ]; then
${VCSCMD} ${DOCBRANCH} ${CHROOTDIR}/usr/doc
fi
-if [ -z "${NOPORTS}" ]; then
+if [ -z "${NOPORTS}" ] && [ -z "${PORTS_UPDATE_SKIP}" ]; then
${VCSCMD} ${PORTBRANCH} ${CHROOTDIR}/usr/ports
fi
Modified: stable/10/share/man/man7/release.7
==
--- stable/10/share/man/man7/release.7 Mon Apr 14 01:49:26 2014
(r264439)
+++ stable/10/share/man/man7/release.7 Mon Apr 14 03:57:45 2014
(r264440)
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd April 2, 2014
+.Dd April 11, 2014
.Dt RELEASE 7
.Os
.Sh NAME
@@ -272,6 +272,30 @@ build environment setup are skipped.
This is intended solely for cases where the
.Xr chroot 8
userland are provided by alternate means.
+.It Va SRC_UPDATE_SKIP
+Set to a non-empty value to prevent checkout or update of
+.Fa /usr/src
+within the
+.Xr chroot 8 .
+This is intended for use only when
+.Fa /usr/src
+is expected to exist by alternative means.
+.It Va DOC_UPDATE_SKIP
+Set to a non-empty value to prevent checkout or update of
+.Fa /usr/doc
+within the
+.Xr chroot 8 .
+This is intended for use only when
+.Fa /usr/doc
+is expected to exist by alternative means.
+.It Va PORTS_UPDATE_SKIP
+Set to a non-empty value to prevent checkout or update of
+.Fa /usr/ports
+within the
+.Xr chroot 8 .
+This is intended for use only when
+.Fa /usr/ports
+is expected to exist by alternative means.
.El
.Sh EMBEDDED BUILDS
The following
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264441 - in stable/9: release share/man/man7
Author: gjb
Date: Mon Apr 14 03:58:18 2014
New Revision: 264441
URL: http://svnweb.freebsd.org/changeset/base/264441
Log:
MFC r264343:
Add SRC_UPDATE_SKIP, DOC_UPDATE_SKIP, and PORTS_UPDATE_SKIP
variables. These are intended to allow bypassing the
'svn co /usr/{src,doc,ports}' step in the chroot when the
tree exists from external means.
The use case here is that /usr/src, /usr/doc, and /usr/ports
in the chroot exist as result of zfs dataset clones, so it
is possible (and happens quite often) that the included
distributions may not be consistent. (This is not the case
for -RELEASE builds, but does happen for snapshot builds.)
Sponsored by: The FreeBSD Foundation
Modified:
stable/9/release/release.conf.sample
stable/9/release/release.sh
stable/9/share/man/man7/release.7
Directory Properties:
stable/9/release/ (props changed)
stable/9/share/man/man7/ (props changed)
Modified: stable/9/release/release.conf.sample
==
--- stable/9/release/release.conf.sampleMon Apr 14 03:57:45 2014
(r264440)
+++ stable/9/release/release.conf.sampleMon Apr 14 03:58:18 2014
(r264441)
@@ -56,6 +56,18 @@ PORTBRANCH="ports/head@rHEAD"
## means.
#CHROOTBUILD_SKIP=
+## Set to a non-empty value skip checkout or update of /usr/src in
+## the chroot. This is intended for use when /usr/src already exists.
+#SRC_UPDATE_SKIP=
+
+## Set to a non-empty value skip checkout or update of /usr/doc in
+## the chroot. This is intended for use when /usr/doc already exists.
+#DOC_UPDATE_SKIP=
+
+## Set to a non-empty value skip checkout or update of /usr/ports in
+## the chroot. This is intended for use when /usr/ports already exists.
+#PORTS_UPDATE_SKIP=
+
## Set to pass additional flags to make(1) for the build chroot setup, such
## as TARGET/TARGET_ARCH.
#CHROOT_MAKEENV=
Modified: stable/9/release/release.sh
==
--- stable/9/release/release.sh Mon Apr 14 03:57:45 2014(r264440)
+++ stable/9/release/release.sh Mon Apr 14 03:58:18 2014(r264441)
@@ -190,11 +190,13 @@ set -e # Everything must succeed
mkdir -p ${CHROOTDIR}/usr
-${VCSCMD} ${FORCE_SRC_KEY} ${SRCBRANCH} ${CHROOTDIR}/usr/src
-if [ -z "${NODOC}" ]; then
+if [ -z "${SRC_UPDATE_SKIP}" ]; then
+ ${VCSCMD} ${FORCE_SRC_KEY} ${SRCBRANCH} ${CHROOTDIR}/usr/src
+fi
+if [ -z "${NODOC}" ] && [ -z "${DOC_UPDATE_SKIP}" ]; then
${VCSCMD} ${DOCBRANCH} ${CHROOTDIR}/usr/doc
fi
-if [ -z "${NOPORTS}" ]; then
+if [ -z "${NOPORTS}" ] && [ -z "${PORTS_UPDATE_SKIP}" ]; then
${VCSCMD} ${PORTBRANCH} ${CHROOTDIR}/usr/ports
fi
Modified: stable/9/share/man/man7/release.7
==
--- stable/9/share/man/man7/release.7 Mon Apr 14 03:57:45 2014
(r264440)
+++ stable/9/share/man/man7/release.7 Mon Apr 14 03:58:18 2014
(r264441)
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd April 2, 2014
+.Dd April 11, 2014
.Dt RELEASE 7
.Os
.Sh NAME
@@ -272,6 +272,30 @@ build environment setup are skipped.
This is intended solely for cases where the
.Xr chroot 8
userland are provided by alternate means.
+.It Va SRC_UPDATE_SKIP
+Set to a non-empty value to prevent checkout or update of
+.Fa /usr/src
+within the
+.Xr chroot 8 .
+This is intended for use only when
+.Fa /usr/src
+is expected to exist by alternative means.
+.It Va DOC_UPDATE_SKIP
+Set to a non-empty value to prevent checkout or update of
+.Fa /usr/doc
+within the
+.Xr chroot 8 .
+This is intended for use only when
+.Fa /usr/doc
+is expected to exist by alternative means.
+.It Va PORTS_UPDATE_SKIP
+Set to a non-empty value to prevent checkout or update of
+.Fa /usr/ports
+within the
+.Xr chroot 8 .
+This is intended for use only when
+.Fa /usr/ports
+is expected to exist by alternative means.
.El
.Sh EMBEDDED BUILDS
The following
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264442 - in stable/10/sys: dev/age dev/alc dev/ale dev/bce dev/bge dev/fxp dev/jme dev/msk dev/nfe dev/sge pci
Author: yongari
Date: Mon Apr 14 04:51:59 2014
New Revision: 264442
URL: http://svnweb.freebsd.org/changeset/base/264442
Log:
MFC r263957:
Increase the number of TX DMA segments from 32 to 35. It turned
out 32 is not enough to support a full sized TSO packet.
While I'm here fix a long standing bug introduced in r169632 in
bce(4) where it didn't include L2 header length of TSO packet in
the maximum DMA segment size calculation.
Modified:
stable/10/sys/dev/age/if_agevar.h
stable/10/sys/dev/alc/if_alcvar.h
stable/10/sys/dev/ale/if_alevar.h
stable/10/sys/dev/bce/if_bcereg.h
stable/10/sys/dev/bge/if_bgereg.h
stable/10/sys/dev/fxp/if_fxpreg.h
stable/10/sys/dev/jme/if_jmevar.h
stable/10/sys/dev/msk/if_mskreg.h
stable/10/sys/dev/nfe/if_nfereg.h
stable/10/sys/dev/sge/if_sgereg.h
stable/10/sys/pci/if_rlreg.h
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/dev/age/if_agevar.h
==
--- stable/10/sys/dev/age/if_agevar.h Mon Apr 14 03:58:18 2014
(r264441)
+++ stable/10/sys/dev/age/if_agevar.h Mon Apr 14 04:51:59 2014
(r264442)
@@ -42,7 +42,7 @@
#defineAGE_TSO_MAXSEGSIZE 4096
#defineAGE_TSO_MAXSIZE (65535 + sizeof(struct
ether_vlan_header))
-#defineAGE_MAXTXSEGS 32
+#defineAGE_MAXTXSEGS 35
#defineAGE_RX_BUF_ALIGN8
#ifndef __NO_STRICT_ALIGNMENT
#defineAGE_RX_BUF_SIZE (MCLBYTES - AGE_RX_BUF_ALIGN)
Modified: stable/10/sys/dev/alc/if_alcvar.h
==
--- stable/10/sys/dev/alc/if_alcvar.h Mon Apr 14 03:58:18 2014
(r264441)
+++ stable/10/sys/dev/alc/if_alcvar.h Mon Apr 14 04:51:59 2014
(r264442)
@@ -42,7 +42,7 @@
#defineALC_TSO_MAXSEGSIZE 4096
#defineALC_TSO_MAXSIZE (65535 + sizeof(struct
ether_vlan_header))
-#defineALC_MAXTXSEGS 32
+#defineALC_MAXTXSEGS 35
#defineALC_ADDR_LO(x) ((uint64_t) (x) & 0x)
#defineALC_ADDR_HI(x) ((uint64_t) (x) >> 32)
Modified: stable/10/sys/dev/ale/if_alevar.h
==
--- stable/10/sys/dev/ale/if_alevar.h Mon Apr 14 03:58:18 2014
(r264441)
+++ stable/10/sys/dev/ale/if_alevar.h Mon Apr 14 04:51:59 2014
(r264442)
@@ -40,7 +40,7 @@
#defineALE_TSO_MAXSEGSIZE 4096
#defineALE_TSO_MAXSIZE (65535 + sizeof(struct
ether_vlan_header))
-#defineALE_MAXTXSEGS 32
+#defineALE_MAXTXSEGS 35
#defineALE_ADDR_LO(x) ((uint64_t) (x) & 0x)
#defineALE_ADDR_HI(x) ((uint64_t) (x) >> 32)
Modified: stable/10/sys/dev/bce/if_bcereg.h
==
--- stable/10/sys/dev/bce/if_bcereg.h Mon Apr 14 03:58:18 2014
(r264441)
+++ stable/10/sys/dev/bce/if_bcereg.h Mon Apr 14 04:51:59 2014
(r264442)
@@ -6354,8 +6354,8 @@ struct fw_info {
#define BCE_TX_TIMEOUT 5
-#define BCE_MAX_SEGMENTS 32
-#define BCE_TSO_MAX_SIZE 65536
+#define BCE_MAX_SEGMENTS 35
+#define BCE_TSO_MAX_SIZE (65535 + sizeof(struct ether_vlan_header))
#define BCE_TSO_MAX_SEG_SIZE 4096
#define BCE_DMA_ALIGN 8
Modified: stable/10/sys/dev/bge/if_bgereg.h
==
--- stable/10/sys/dev/bge/if_bgereg.h Mon Apr 14 03:58:18 2014
(r264441)
+++ stable/10/sys/dev/bge/if_bgereg.h Mon Apr 14 04:51:59 2014
(r264442)
@@ -2852,7 +2852,7 @@ struct bge_gib {
*/
#defineBGE_NSEG_JUMBO 4
-#defineBGE_NSEG_NEW32
+#defineBGE_NSEG_NEW35
#defineBGE_TSOSEG_SZ 4096
/* Maximum DMA address for controllers that have 40bit DMA address bug. */
Modified: stable/10/sys/dev/fxp/if_fxpreg.h
==
--- stable/10/sys/dev/fxp/if_fxpreg.h Mon Apr 14 03:58:18 2014
(r264441)
+++ stable/10/sys/dev/fxp/if_fxpreg.h Mon Apr 14 04:51:59 2014
(r264442)
@@ -250,7 +250,7 @@ struct fxp_cb_ucode {
/*
* Number of DMA segments in a TxCB.
*/
-#define FXP_NTXSEG 32
+#define FXP_NTXSEG 35
struct fxp_tbd {
uint32_t tb_addr;
Modified: stable/10/sys/dev/jme/if_jmevar.h
==
--- stable/10/sys/dev/jme/if_jmevar.h Mon Apr 14 03:58:18 2014
(r264441)
+++ stable/10/sys/dev/jme/if_jmevar.h Mon Apr 14 04:51:59 2014
(r264442)
@@ -49,7 +49,7 @@
#defineJME_RX_RING_ALIGN 16
#defineJME_TSO_MAXSEGSIZE 4096
#defineJME_TSO_MAXSIZE (6553
svn commit: r264443 - in stable/9/sys: dev/age dev/alc dev/ale dev/bce dev/bge dev/fxp dev/jme dev/msk dev/nfe dev/sge pci
Author: yongari
Date: Mon Apr 14 04:53:34 2014
New Revision: 264443
URL: http://svnweb.freebsd.org/changeset/base/264443
Log:
MFC r263957:
Increase the number of TX DMA segments from 32 to 35. It turned
out 32 is not enough to support a full sized TSO packet.
While I'm here fix a long standing bug introduced in r169632 in
bce(4) where it didn't include L2 header length of TSO packet in
the maximum DMA segment size calculation.
Modified:
stable/9/sys/dev/age/if_agevar.h
stable/9/sys/dev/alc/if_alcvar.h
stable/9/sys/dev/ale/if_alevar.h
stable/9/sys/dev/bce/if_bcereg.h
stable/9/sys/dev/bge/if_bgereg.h
stable/9/sys/dev/fxp/if_fxpreg.h
stable/9/sys/dev/jme/if_jmevar.h
stable/9/sys/dev/msk/if_mskreg.h
stable/9/sys/dev/nfe/if_nfereg.h
stable/9/sys/dev/sge/if_sgereg.h
stable/9/sys/pci/if_rlreg.h
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/dev/ (props changed)
Modified: stable/9/sys/dev/age/if_agevar.h
==
--- stable/9/sys/dev/age/if_agevar.hMon Apr 14 04:51:59 2014
(r264442)
+++ stable/9/sys/dev/age/if_agevar.hMon Apr 14 04:53:34 2014
(r264443)
@@ -42,7 +42,7 @@
#defineAGE_TSO_MAXSEGSIZE 4096
#defineAGE_TSO_MAXSIZE (65535 + sizeof(struct
ether_vlan_header))
-#defineAGE_MAXTXSEGS 32
+#defineAGE_MAXTXSEGS 35
#defineAGE_RX_BUF_ALIGN8
#ifndef __NO_STRICT_ALIGNMENT
#defineAGE_RX_BUF_SIZE (MCLBYTES - AGE_RX_BUF_ALIGN)
Modified: stable/9/sys/dev/alc/if_alcvar.h
==
--- stable/9/sys/dev/alc/if_alcvar.hMon Apr 14 04:51:59 2014
(r264442)
+++ stable/9/sys/dev/alc/if_alcvar.hMon Apr 14 04:53:34 2014
(r264443)
@@ -42,7 +42,7 @@
#defineALC_TSO_MAXSEGSIZE 4096
#defineALC_TSO_MAXSIZE (65535 + sizeof(struct
ether_vlan_header))
-#defineALC_MAXTXSEGS 32
+#defineALC_MAXTXSEGS 35
#defineALC_ADDR_LO(x) ((uint64_t) (x) & 0x)
#defineALC_ADDR_HI(x) ((uint64_t) (x) >> 32)
Modified: stable/9/sys/dev/ale/if_alevar.h
==
--- stable/9/sys/dev/ale/if_alevar.hMon Apr 14 04:51:59 2014
(r264442)
+++ stable/9/sys/dev/ale/if_alevar.hMon Apr 14 04:53:34 2014
(r264443)
@@ -40,7 +40,7 @@
#defineALE_TSO_MAXSEGSIZE 4096
#defineALE_TSO_MAXSIZE (65535 + sizeof(struct
ether_vlan_header))
-#defineALE_MAXTXSEGS 32
+#defineALE_MAXTXSEGS 35
#defineALE_ADDR_LO(x) ((uint64_t) (x) & 0x)
#defineALE_ADDR_HI(x) ((uint64_t) (x) >> 32)
Modified: stable/9/sys/dev/bce/if_bcereg.h
==
--- stable/9/sys/dev/bce/if_bcereg.hMon Apr 14 04:51:59 2014
(r264442)
+++ stable/9/sys/dev/bce/if_bcereg.hMon Apr 14 04:53:34 2014
(r264443)
@@ -6355,8 +6355,8 @@ struct fw_info {
#define BCE_TX_TIMEOUT 5
-#define BCE_MAX_SEGMENTS 32
-#define BCE_TSO_MAX_SIZE 65536
+#define BCE_MAX_SEGMENTS 35
+#define BCE_TSO_MAX_SIZE (65535 + sizeof(struct ether_vlan_header))
#define BCE_TSO_MAX_SEG_SIZE 4096
#define BCE_DMA_ALIGN 8
Modified: stable/9/sys/dev/bge/if_bgereg.h
==
--- stable/9/sys/dev/bge/if_bgereg.hMon Apr 14 04:51:59 2014
(r264442)
+++ stable/9/sys/dev/bge/if_bgereg.hMon Apr 14 04:53:34 2014
(r264443)
@@ -2851,7 +2851,7 @@ struct bge_gib {
*/
#defineBGE_NSEG_JUMBO 4
-#defineBGE_NSEG_NEW32
+#defineBGE_NSEG_NEW35
#defineBGE_TSOSEG_SZ 4096
/* Maximum DMA address for controllers that have 40bit DMA address bug. */
Modified: stable/9/sys/dev/fxp/if_fxpreg.h
==
--- stable/9/sys/dev/fxp/if_fxpreg.hMon Apr 14 04:51:59 2014
(r264442)
+++ stable/9/sys/dev/fxp/if_fxpreg.hMon Apr 14 04:53:34 2014
(r264443)
@@ -250,7 +250,7 @@ struct fxp_cb_ucode {
/*
* Number of DMA segments in a TxCB.
*/
-#define FXP_NTXSEG 32
+#define FXP_NTXSEG 35
struct fxp_tbd {
uint32_t tb_addr;
Modified: stable/9/sys/dev/jme/if_jmevar.h
==
--- stable/9/sys/dev/jme/if_jmevar.hMon Apr 14 04:51:59 2014
(r264442)
+++ stable/9/sys/dev/jme/if_jmevar.hMon Apr 14 04:53:34 2014
(r264443)
@@ -49,7 +49,7 @@
#defineJME_RX_RING_ALIGN 16
#defineJME_TSO_MAXSEGSIZE 4096
#defineJME_TS
svn commit: r264444 - stable/10/sys/dev/ae
Author: yongari
Date: Mon Apr 14 04:58:50 2014
New Revision: 26
URL: http://svnweb.freebsd.org/changeset/base/26
Log:
MFC r259543:
Failed m_devget(9) indicates lack of free mbuf cluster. Update
if_iqdrops counter for that case since the received frame is ok.
While here, simplify updating counter logic.
Modified:
stable/10/sys/dev/ae/if_ae.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/dev/ae/if_ae.c
==
--- stable/10/sys/dev/ae/if_ae.cMon Apr 14 04:53:34 2014
(r264443)
+++ stable/10/sys/dev/ae/if_ae.cMon Apr 14 04:58:50 2014
(r26)
@@ -132,7 +132,7 @@ static void ae_mac_config(ae_softc_t *sc
static int ae_intr(void *arg);
static voidae_int_task(void *arg, int pending);
static voidae_tx_intr(ae_softc_t *sc);
-static int ae_rxeof(ae_softc_t *sc, ae_rxd_t *rxd);
+static voidae_rxeof(ae_softc_t *sc, ae_rxd_t *rxd);
static voidae_rx_intr(ae_softc_t *sc);
static voidae_watchdog(ae_softc_t *sc);
static voidae_tick(void *arg);
@@ -1881,7 +1881,7 @@ ae_tx_intr(ae_softc_t *sc)
BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE);
}
-static int
+static void
ae_rxeof(ae_softc_t *sc, ae_rxd_t *rxd)
{
struct ifnet *ifp;
@@ -1900,12 +1900,15 @@ ae_rxeof(ae_softc_t *sc, ae_rxd_t *rxd)
size = le16toh(rxd->len) - ETHER_CRC_LEN;
if (size < (ETHER_MIN_LEN - ETHER_CRC_LEN - ETHER_VLAN_ENCAP_LEN)) {
if_printf(ifp, "Runt frame received.");
- return (EIO);
+ ifp->if_ierrors++;
+ return;
}
m = m_devget(&rxd->data[0], size, ETHER_ALIGN, ifp, NULL);
- if (m == NULL)
- return (ENOBUFS);
+ if (m == NULL) {
+ ifp->if_iqdrops++;
+ return;
+ }
if ((ifp->if_capenable & IFCAP_VLAN_HWTAGGING) != 0 &&
(flags & AE_RXD_HAS_VLAN) != 0) {
@@ -1913,14 +1916,13 @@ ae_rxeof(ae_softc_t *sc, ae_rxd_t *rxd)
m->m_flags |= M_VLANTAG;
}
+ ifp->if_ipackets++;
/*
* Pass it through.
*/
AE_UNLOCK(sc);
(*ifp->if_input)(ifp, m);
AE_LOCK(sc);
-
- return (0);
}
static void
@@ -1929,7 +1931,7 @@ ae_rx_intr(ae_softc_t *sc)
ae_rxd_t *rxd;
struct ifnet *ifp;
uint16_t flags;
- int count, error;
+ int count;
KASSERT(sc != NULL, ("[ae, %d]: sc is NULL!", __LINE__));
@@ -1957,17 +1959,10 @@ ae_rx_intr(ae_softc_t *sc)
*/
sc->rxd_cur = (sc->rxd_cur + 1) % AE_RXD_COUNT_DEFAULT;
- if ((flags & AE_RXD_SUCCESS) == 0) {
- ifp->if_ierrors++;
- continue;
- }
- error = ae_rxeof(sc, rxd);
- if (error != 0) {
+ if ((flags & AE_RXD_SUCCESS) != 0)
+ ae_rxeof(sc, rxd);
+ else
ifp->if_ierrors++;
- continue;
- } else {
- ifp->if_ipackets++;
- }
}
if (count > 0) {
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264445 - stable/9/sys/dev/ae
Author: yongari
Date: Mon Apr 14 04:59:46 2014
New Revision: 264445
URL: http://svnweb.freebsd.org/changeset/base/264445
Log:
MFC r259543:
Failed m_devget(9) indicates lack of free mbuf cluster. Update
if_iqdrops counter for that case since the received frame is ok.
While here, simplify updating counter logic.
Modified:
stable/9/sys/dev/ae/if_ae.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/dev/ (props changed)
Modified: stable/9/sys/dev/ae/if_ae.c
==
--- stable/9/sys/dev/ae/if_ae.c Mon Apr 14 04:58:50 2014(r26)
+++ stable/9/sys/dev/ae/if_ae.c Mon Apr 14 04:59:46 2014(r264445)
@@ -132,7 +132,7 @@ static void ae_mac_config(ae_softc_t *sc
static int ae_intr(void *arg);
static voidae_int_task(void *arg, int pending);
static voidae_tx_intr(ae_softc_t *sc);
-static int ae_rxeof(ae_softc_t *sc, ae_rxd_t *rxd);
+static voidae_rxeof(ae_softc_t *sc, ae_rxd_t *rxd);
static voidae_rx_intr(ae_softc_t *sc);
static voidae_watchdog(ae_softc_t *sc);
static voidae_tick(void *arg);
@@ -1881,7 +1881,7 @@ ae_tx_intr(ae_softc_t *sc)
BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE);
}
-static int
+static void
ae_rxeof(ae_softc_t *sc, ae_rxd_t *rxd)
{
struct ifnet *ifp;
@@ -1900,12 +1900,15 @@ ae_rxeof(ae_softc_t *sc, ae_rxd_t *rxd)
size = le16toh(rxd->len) - ETHER_CRC_LEN;
if (size < (ETHER_MIN_LEN - ETHER_CRC_LEN - ETHER_VLAN_ENCAP_LEN)) {
if_printf(ifp, "Runt frame received.");
- return (EIO);
+ ifp->if_ierrors++;
+ return;
}
m = m_devget(&rxd->data[0], size, ETHER_ALIGN, ifp, NULL);
- if (m == NULL)
- return (ENOBUFS);
+ if (m == NULL) {
+ ifp->if_iqdrops++;
+ return;
+ }
if ((ifp->if_capenable & IFCAP_VLAN_HWTAGGING) != 0 &&
(flags & AE_RXD_HAS_VLAN) != 0) {
@@ -1913,14 +1916,13 @@ ae_rxeof(ae_softc_t *sc, ae_rxd_t *rxd)
m->m_flags |= M_VLANTAG;
}
+ ifp->if_ipackets++;
/*
* Pass it through.
*/
AE_UNLOCK(sc);
(*ifp->if_input)(ifp, m);
AE_LOCK(sc);
-
- return (0);
}
static void
@@ -1929,7 +1931,7 @@ ae_rx_intr(ae_softc_t *sc)
ae_rxd_t *rxd;
struct ifnet *ifp;
uint16_t flags;
- int count, error;
+ int count;
KASSERT(sc != NULL, ("[ae, %d]: sc is NULL!", __LINE__));
@@ -1957,17 +1959,10 @@ ae_rx_intr(ae_softc_t *sc)
*/
sc->rxd_cur = (sc->rxd_cur + 1) % AE_RXD_COUNT_DEFAULT;
- if ((flags & AE_RXD_SUCCESS) == 0) {
- ifp->if_ierrors++;
- continue;
- }
- error = ae_rxeof(sc, rxd);
- if (error != 0) {
+ if ((flags & AE_RXD_SUCCESS) != 0)
+ ae_rxeof(sc, rxd);
+ else
ifp->if_ierrors++;
- continue;
- } else {
- ifp->if_ipackets++;
- }
}
if (count > 0) {
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264446 - stable/10/sys/dev/ale
Author: yongari
Date: Mon Apr 14 05:04:23 2014
New Revision: 264446
URL: http://svnweb.freebsd.org/changeset/base/264446
Log:
MFC r260429:
m_defrag(9) does not touch original mbuf chain when it can't
allocate new mbuf. Free original mbuf chain when driver is not
able to send the packet.
Modified:
stable/10/sys/dev/ale/if_ale.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/dev/ale/if_ale.c
==
--- stable/10/sys/dev/ale/if_ale.c Mon Apr 14 04:59:46 2014
(r264445)
+++ stable/10/sys/dev/ale/if_ale.c Mon Apr 14 05:04:23 2014
(r264446)
@@ -1659,6 +1659,7 @@ ale_encap(struct ale_softc *sc, struct m
(mtod(m, intptr_t) & 3) != 0) {
m = m_defrag(*m_head, M_NOWAIT);
if (m == NULL) {
+ m_freem(*m_head);
*m_head = NULL;
return (ENOBUFS);
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264447 - stable/9/sys/dev/ale
Author: yongari
Date: Mon Apr 14 05:05:07 2014
New Revision: 264447
URL: http://svnweb.freebsd.org/changeset/base/264447
Log:
MFC r260429:
m_defrag(9) does not touch original mbuf chain when it can't
allocate new mbuf. Free original mbuf chain when driver is not
able to send the packet.
Modified:
stable/9/sys/dev/ale/if_ale.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/dev/ (props changed)
Modified: stable/9/sys/dev/ale/if_ale.c
==
--- stable/9/sys/dev/ale/if_ale.c Mon Apr 14 05:04:23 2014
(r264446)
+++ stable/9/sys/dev/ale/if_ale.c Mon Apr 14 05:05:07 2014
(r264447)
@@ -1659,6 +1659,7 @@ ale_encap(struct ale_softc *sc, struct m
(mtod(m, intptr_t) & 3) != 0) {
m = m_defrag(*m_head, M_NOWAIT);
if (m == NULL) {
+ m_freem(*m_head);
*m_head = NULL;
return (ENOBUFS);
}
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264448 - head/usr.sbin/bsdinstall/scripts
Author: dteske Date: Mon Apr 14 05:35:01 2014 New Revision: 264448 URL: http://svnweb.freebsd.org/changeset/base/264448 Log: Fix typo in debug/log statement. Submitted by: Rick Miller Modified: head/usr.sbin/bsdinstall/scripts/script Modified: head/usr.sbin/bsdinstall/scripts/script == --- head/usr.sbin/bsdinstall/scripts/script Mon Apr 14 05:05:07 2014 (r264447) +++ head/usr.sbin/bsdinstall/scripts/script Mon Apr 14 05:35:01 2014 (r264448) @@ -74,7 +74,7 @@ trap error EXIT SCRIPT="$1" shift -f_dprintf "Began Instalation at %s" "$( date )" +f_dprintf "Began Installation at %s" "$( date )" rm -rf $BSDINSTALL_TMPETC mkdir $BSDINSTALL_TMPETC ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264449 - stable/10/usr.sbin/bsdinstall/scripts
Author: dteske Date: Mon Apr 14 05:37:21 2014 New Revision: 264449 URL: http://svnweb.freebsd.org/changeset/base/264449 Log: MFC r264448: Fix typo in debug/log statement. Submitted by: Rick Miller Modified: stable/10/usr.sbin/bsdinstall/scripts/script Directory Properties: stable/10/ (props changed) Modified: stable/10/usr.sbin/bsdinstall/scripts/script == --- stable/10/usr.sbin/bsdinstall/scripts/scriptMon Apr 14 05:35:01 2014(r264448) +++ stable/10/usr.sbin/bsdinstall/scripts/scriptMon Apr 14 05:37:21 2014(r264449) @@ -74,7 +74,7 @@ trap error EXIT SCRIPT="$1" shift -f_dprintf "Began Instalation at %s" "$( date )" +f_dprintf "Began Installation at %s" "$( date )" rm -rf $BSDINSTALL_TMPETC mkdir $BSDINSTALL_TMPETC ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264450 - stable/9/usr.sbin/bsdinstall/scripts
Author: dteske Date: Mon Apr 14 05:38:50 2014 New Revision: 264450 URL: http://svnweb.freebsd.org/changeset/base/264450 Log: MFC r264448: Fix typo in debug/log statement. Submitted by: Rick Miller Modified: stable/9/usr.sbin/bsdinstall/scripts/script Directory Properties: stable/9/ (props changed) stable/9/usr.sbin/ (props changed) stable/9/usr.sbin/bsdinstall/ (props changed) stable/9/usr.sbin/bsdinstall/scripts/ (props changed) Modified: stable/9/usr.sbin/bsdinstall/scripts/script == --- stable/9/usr.sbin/bsdinstall/scripts/script Mon Apr 14 05:37:21 2014 (r264449) +++ stable/9/usr.sbin/bsdinstall/scripts/script Mon Apr 14 05:38:50 2014 (r264450) @@ -74,7 +74,7 @@ trap error EXIT SCRIPT="$1" shift -f_dprintf "Began Instalation at %s" "$( date )" +f_dprintf "Began Installation at %s" "$( date )" rm -rf $BSDINSTALL_TMPETC mkdir $BSDINSTALL_TMPETC ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r264449 - stable/10/usr.sbin/bsdinstall/scripts
On Mon, Apr 14, 2014 at 05:37:21AM +, Devin Teske wrote: > Author: dteske > Date: Mon Apr 14 05:37:21 2014 > New Revision: 264449 > URL: http://svnweb.freebsd.org/changeset/base/264449 > > Log: > MFC r264448: Fix typo in debug/log statement. > MFCs have a default minimal timeframe of 3 days. Glen pgpPt_pJGaCCh.pgp Description: PGP signature
RE: svn commit: r264449 - stable/10/usr.sbin/bsdinstall/scripts
> -Original Message- > From: Glen Barber [mailto:g...@freebsd.org] > Sent: Sunday, April 13, 2014 10:38 PM > To: Devin Teske > Cc: src-committ...@freebsd.org; svn-src-all@freebsd.org; svn-src- > sta...@freebsd.org; svn-src-stable...@freebsd.org > Subject: Re: svn commit: r264449 - stable/10/usr.sbin/bsdinstall/scripts > > On Mon, Apr 14, 2014 at 05:37:21AM +, Devin Teske wrote: > > Author: dteske > > Date: Mon Apr 14 05:37:21 2014 > > New Revision: 264449 > > URL: > https://urldefense.proofpoint.com/v1/url?u=http://svnweb.freebsd.org/ch > angeset/base/264449&k=%2FbkpAUdJWZuiTILCq%2FFnQg%3D%3D%0A&r= > Mrjs6vR4%2Faj2Ns9%2FssHJjg%3D%3D%0A&m=rcQ%2Fw0BwuT3SHeUjHm > %2Fq7pysiSrhQUwRWG7pee6lsCw%3D%0A&s=a05d45bd044a68ba178857af1 > dac1f207319326fa6f53a72919816ac9649fa20 > > > > Log: > > MFC r264448: Fix typo in debug/log statement. > > > > MFCs have a default minimal timeframe of 3 days. > I've often heard folks say that this doesn't apply to blatantly simple/trivial things like a typo. But I'll keep that in mind next time. Thanks. -- Devin _ The information contained in this message is proprietary and/or confidential. If you are not the intended recipient, please: (i) delete the message and all copies; (ii) do not disclose, distribute or use the message in any manner; and (iii) notify the sender immediately. In addition, please be aware that any message addressed to our domain is subject to archiving and review by persons other than the intended recipient. Thank you. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264451 - svnadmin/conf
Author: pgj (doc,ports committer) Date: Mon Apr 14 06:33:06 2014 New Revision: 264451 URL: http://svnweb.freebsd.org/changeset/base/264451 Log: - Take davidxu's commit bit into safekeeping per his request. Approved by: core (implicit) Modified: svnadmin/conf/access Modified: svnadmin/conf/access == --- svnadmin/conf/accessMon Apr 14 05:38:50 2014(r264450) +++ svnadmin/conf/accessMon Apr 14 06:33:06 2014(r264451) @@ -58,7 +58,6 @@ das davidch davidcs davide -davidxu dchagin deischen delphij ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r264452 - head/share/misc
Author: pgj (doc,ports committer) Date: Mon Apr 14 06:34:08 2014 New Revision: 264452 URL: http://svnweb.freebsd.org/changeset/base/264452 Log: - Move davidxu to the alumni section Approved by: core (implicit) Modified: head/share/misc/committers-src.dot Modified: head/share/misc/committers-src.dot == --- head/share/misc/committers-src.dot Mon Apr 14 06:33:06 2014 (r264451) +++ head/share/misc/committers-src.dot Mon Apr 14 06:34:08 2014 (r264452) @@ -43,6 +43,7 @@ bushman [label="Michael Bushkov\nbushman carl [label="Carl Delsey\nc...@freebsd.org\n2013/01/14\n2014/03/06"] ceri [label="Ceri Davies\nc...@freebsd.org\n2006/11/07\n2012/03/07"] cjc [label="Crist J. Clark\n...@freebsd.org\n2001/06/01\n2006/12/29"] +davidxu [label="David Xu\ndavi...@freebsd.org\n2002/09/02\n2014/04/14"] dds [label="Diomidis Spinellis\n...@freebsd.org\n2003/06/20\n2010/09/22"] dhartmei [label="Daniel Hartmeier\ndhart...@freebsd.org\n2004/04/06\n2008/12/08"] dmlb [label="Duncan Barclay\nd...@freebsd.org\n2001/12/14\n2008/11/10"] @@ -134,7 +135,6 @@ cperciva [label="Colin Percival\ncperciv csjp [label="Christian S.J. Peron\nc...@freebsd.org\n2004/05/04"] das [label="David Schultz\n...@freebsd.org\n2003/02/21"] davide [label="Davide Italiano\ndav...@freebsd.org\n2012/01/27"] -davidxu [label="David Xu\ndavi...@freebsd.org\n2002/09/02"] dchagin [label="Dmitry Chagin\ndcha...@freebsd.org\n2009/02/28"] delphij [label="Xin Li\ndelp...@freebsd.org\n2004/09/14"] des [label="Dag-Erling Smorgrav\n...@freebsd.org\n1998/04/03"] ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
