Re: CVS commit: src/sys/fs/puffs
On Sat, Sep 24, 2011 at 03:31:02AM +, YAMAMOTO Takashi wrote: pagedaemon flushes dirty pages by itself, yes. I added a printf() at the beginning of puffs_vnop_strategy() to check for calls by kernel threads. Only ioflush calls puffs_vnop_strategy(), pagedaemon never goes there. This may explain why the system cannot cope with PUFFS and memory shortage. An interesting point: if I use PDPOLICY_CLOCKPRO, then pagedaemon does call puffs_vnop_strategy(), through the path below. I understand this is the way it is supposed to work: puffs_vnop_strategy VOP_STRATEGY genfs_do_io genfs_gop_write genfs_do_putpages genfs_putpages VOP_PUTPAGES (through pgo-pgo_put) uvm_pageout The system still gets stuck after a while, with glusterfsd sleeping forever in flt_noram1. ddb' show uvmexp shows 3 free pages, 509 paging. If I understand correctly, pagedaemon performs an asynchronous VOP_STRATEGY and count an operation stuck in the PUFFS filesystem as paging. It decides to do more work if uvmexp.free + uvmexp.paging gets too low. therefore with many PUFFS page forever in the paging count, pagedaemon will not help us. I have a patch that maintain a count of paging to remote filesystems (that is, the one that do not have MNT_LOCAL in struct mount mnt_flag), and substract it from uvmexp.paging when pagedaemon has to decide whether to send more pages to the swap. It seems to work fine, but the system hang with perfused awaiting for km_getwait2 (from sys_write/putter_fop_write) -- Emmanuel Dreyfus m...@netbsd.org
re: CVS commit: src/external/mit/xorg/lib/xkeyboard-config/rules
Module Name: src Committed By: tsutsui Date: Mon Sep 26 15:19:45 UTC 2011 Modified Files: src/external/mit/xorg/lib/xkeyboard-config/rules: base base.lst evdev evdev.lst Log Message: Regenerate these compiled files properly in our own xsrc/external/mit/xkeyboard-config/dist/ directory, i.e. - pull changes from xkeyboard-config 2.0 to 2.3 - put back entries for sharp machines (zaurus and hpcarm wzero3s) removed in rev 1.4 (xkeyboard-config 2.0 merge) oops.. thanks. XXX1: can't we generate these files during build? sounds like a wonderful idea.. can you do it? :)
Re: CVS commit: src/sys/arch/sh3/sh3
On Sep 27, 3:34am, u...@stderr.spb.ru (Valeriy E. Ushakov) wrote: -- Subject: Re: CVS commit: src/sys/arch/sh3/sh3 | On Mon, Sep 26, 2011 at 18:43:08 -0400, Christos Zoulas wrote: | | Module Name:src | Committed By: christos | Date: Mon Sep 26 22:43:07 UTC 2011 | | Modified Files: | src/sys/arch/sh3/sh3: cpu_in_cksum.S | | Log Message: | compute the entry size correctly. | | | To generate a diff of this commit: | cvs rdiff -u -r1.2 -r1.3 src/sys/arch/sh3/sh3/cpu_in_cksum.S | | It was correct. cksum128mod is a local subroutine. No, the name was wrong then. I will fix it. christos
Re: CVS commit: src/sys/arch/sh3/sh3
On Mon, Sep 26, 2011 at 20:33:19 -0400, Christos Zoulas wrote: On Sep 27, 3:34am, u...@stderr.spb.ru (Valeriy E. Ushakov) wrote: -- Subject: Re: CVS commit: src/sys/arch/sh3/sh3 | On Mon, Sep 26, 2011 at 18:43:08 -0400, Christos Zoulas wrote: | | Module Name: src | Committed By: christos | Date: Mon Sep 26 22:43:07 UTC 2011 | | Modified Files: |src/sys/arch/sh3/sh3: cpu_in_cksum.S | | Log Message: | compute the entry size correctly. | | | To generate a diff of this commit: | cvs rdiff -u -r1.2 -r1.3 src/sys/arch/sh3/sh3/cpu_in_cksum.S | | It was correct. cksum128mod is a local subroutine. No, the name was wrong then. I will fix it. Ah, I guess it was missed in the in_cksum - cpu_in_cksum rename. Thanks! -uwe
CVS commit: src/usr.sbin/cpuctl
Module Name:src
Committed By: jruoho
Date: Mon Sep 26 06:51:58 UTC 2011
Modified Files:
src/usr.sbin/cpuctl: cpuctl.c
Log Message:
Fix wrong err(3) message (no such thing as IOC_CPU_GETINFO).
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/usr.sbin/cpuctl/cpuctl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/cpuctl/cpuctl.c
diff -u src/usr.sbin/cpuctl/cpuctl.c:1.17 src/usr.sbin/cpuctl/cpuctl.c:1.18
--- src/usr.sbin/cpuctl/cpuctl.c:1.17 Sun Sep 11 14:54:49 2011
+++ src/usr.sbin/cpuctl/cpuctl.c Mon Sep 26 06:51:57 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cpuctl.c,v 1.17 2011/09/11 14:54:49 jdc Exp $ */
+/* $NetBSD: cpuctl.c,v 1.18 2011/09/26 06:51:57 jruoho Exp $ */
/*-
* Copyright (c) 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#ifndef lint
#include sys/cdefs.h
-__RCSID($NetBSD: cpuctl.c,v 1.17 2011/09/11 14:54:49 jdc Exp $);
+__RCSID($NetBSD: cpuctl.c,v 1.18 2011/09/26 06:51:57 jruoho Exp $);
#endif /* not lint */
#include sys/param.h
@@ -247,7 +247,7 @@ cpu_list(char **argv)
for (i = 0; i cnt; i++) {
cs.cs_id = i;
if (ioctl(fd, IOC_CPU_GETSTATE, cs) 0)
- err(EXIT_FAILURE, IOC_CPU_GETINFO);
+ err(EXIT_FAILURE, IOC_CPU_GETSTATE);
if (ioctl(fd, IOC_CPU_MAPID, cs.cs_id) 0)
err(EXIT_FAILURE, IOC_CPU_MAPID);
if (cs.cs_online)
CVS commit: [netbsd-5] src/sys/arch/xen/xen
Module Name:src Committed By: sborrill Date: Mon Sep 26 09:56:55 UTC 2011 Modified Files: src/sys/arch/xen/xen [netbsd-5]: hypervisor.c Log Message: Patch to fix build on Xen 2 (fallout from pullup #1672) To generate a diff of this commit: cvs rdiff -u -r1.42.4.4 -r1.42.4.5 src/sys/arch/xen/xen/hypervisor.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/xen/xen/hypervisor.c diff -u src/sys/arch/xen/xen/hypervisor.c:1.42.4.4 src/sys/arch/xen/xen/hypervisor.c:1.42.4.5 --- src/sys/arch/xen/xen/hypervisor.c:1.42.4.4 Fri Sep 23 12:44:51 2011 +++ src/sys/arch/xen/xen/hypervisor.c Mon Sep 26 09:56:54 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: hypervisor.c,v 1.42.4.4 2011/09/23 12:44:51 sborrill Exp $ */ +/* $NetBSD: hypervisor.c,v 1.42.4.5 2011/09/26 09:56:54 sborrill Exp $ */ /* * Copyright (c) 2005 Manuel Bouyer. @@ -63,7 +63,7 @@ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: hypervisor.c,v 1.42.4.4 2011/09/23 12:44:51 sborrill Exp $); +__KERNEL_RCSID(0, $NetBSD: hypervisor.c,v 1.42.4.5 2011/09/26 09:56:54 sborrill Exp $); #include sys/param.h #include sys/systm.h @@ -100,7 +100,6 @@ __KERNEL_RCSID(0, $NetBSD: hypervisor.c #include xen/xen3-public/version.h #endif -#if defined(DOM0OPS) || defined(XEN3) #include sys/dirent.h #include sys/stat.h #include sys/tree.h @@ -108,6 +107,7 @@ __KERNEL_RCSID(0, $NetBSD: hypervisor.c #include miscfs/specfs/specdev.h #include miscfs/kernfs/kernfs.h #include xen/kernfs_machdep.h +#if defined(DOM0OPS) || defined(XEN3) #include dev/isa/isavar.h #endif /* DOM0OPS || XEN3 */ #ifdef XEN3
CVS commit: xsrc/external/mit/xf86-input-ws/dist/src
Module Name:xsrc Committed By: tsutsui Date: Mon Sep 26 14:38:59 UTC 2011 Modified Files: xsrc/external/mit/xf86-input-ws/dist/src: ws.c Log Message: Use #ifndef __NetBSD__ instead of #if 0 which were added in rev 1.5: port to netbsd wscons To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xf86-input-ws/dist/src/ws.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/xf86-input-ws/dist/src/ws.c diff -u xsrc/external/mit/xf86-input-ws/dist/src/ws.c:1.5 xsrc/external/mit/xf86-input-ws/dist/src/ws.c:1.6 --- xsrc/external/mit/xf86-input-ws/dist/src/ws.c:1.5 Tue Aug 2 09:33:33 2011 +++ xsrc/external/mit/xf86-input-ws/dist/src/ws.c Mon Sep 26 14:38:59 2011 @@ -892,7 +892,7 @@ wsSetProperty(DeviceIntPtr device, Atom priv-coords.maxx = priv-max_x; priv-coords.miny = priv-min_y; priv-coords.maxy = priv-max_y; -#if 0 +#ifndef __NetBSD__ priv-coords.swapxy = priv-swap_axes; #endif @@ -901,11 +901,11 @@ wsSetProperty(DeviceIntPtr device, Atom coords.maxx = priv-max_x; coords.miny = priv-min_y; coords.maxy = priv-max_y; -#if 0 +#ifndef __NetBSD__ coords.swapxy = priv-swap_axes; #endif coords.samplelen = priv-raw; -#if 0 +#ifndef __NetBSD__ coords.resx = priv-coords.resx; coords.resy = priv-coords.resy; #endif
CVS commit: xsrc/external/mit/xf86-input-ws/dist/src
Module Name:xsrc
Committed By: tsutsui
Date: Mon Sep 26 14:47:53 UTC 2011
Modified Files:
xsrc/external/mit/xf86-input-ws/dist/src: ws.c
Log Message:
Restore #ifndef __NetBSD__ portions (disabling OpenBSD specific TPANEL stuff?)
which were accidentally removed in rev 1.4:
merge xf86-input-ws 1.3.0 from openbsd-current.
Pointed out by nonaka@, and this fixes WSMOUSEIO_SCALIBCOORDS ioctl errors
and coredumps after the driver is loaded on hpcarm W-ZERO3.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xf86-input-ws/dist/src/ws.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-input-ws/dist/src/ws.c
diff -u xsrc/external/mit/xf86-input-ws/dist/src/ws.c:1.6 xsrc/external/mit/xf86-input-ws/dist/src/ws.c:1.7
--- xsrc/external/mit/xf86-input-ws/dist/src/ws.c:1.6 Mon Sep 26 14:38:59 2011
+++ xsrc/external/mit/xf86-input-ws/dist/src/ws.c Mon Sep 26 14:47:53 2011
@@ -282,6 +282,7 @@ wsPreInit12(InputDriverPtr drv, InputInf
pInfo-name);
}
+#ifndef __NetBSD__
if (priv-type == WSMOUSE_TYPE_TPANEL priv-raw) {
if (ioctl(pInfo-fd, WSMOUSEIO_GCALIBCOORDS,
priv-coords) != 0) {
@@ -298,12 +299,15 @@ wsPreInit12(InputDriverPtr drv, InputInf
priv-min_y = priv-coords.miny;
priv-max_y = priv-coords.maxy;
} else {
+#endif
/* in calibrated mode, coordinate space, is screen coords */
priv-min_x = 0;
priv-max_x = screenInfo.screens[priv-screen_no]-width - 1;
priv-min_y = 0;
priv-max_y = screenInfo.screens[priv-screen_no]-height - 1;
+#ifndef __NetBSD__
}
+#endif
/* Allow options to override this */
priv-min_x = xf86SetIntOption(pInfo-options, MinX, priv-min_x);
xf86Msg(X_INFO, %s minimum x position: %d\n,
@@ -506,6 +510,7 @@ wsDeviceOn(DeviceIntPtr pWS)
return !Success;
}
+#ifndef __NetBSD__
if (priv-type == WSMOUSE_TYPE_TPANEL) {
/* get calibration values */
if (ioctl(pInfo-fd, WSMOUSEIO_GCALIBCOORDS, coords) != 0) {
@@ -525,6 +530,7 @@ wsDeviceOn(DeviceIntPtr pWS)
}
}
}
+#endif
priv-buffer = XisbNew(pInfo-fd,
sizeof(struct wscons_event) * NUMEVENTS);
if (priv-buffer == NULL) {
@@ -547,6 +553,7 @@ wsDeviceOff(DeviceIntPtr pWS)
DBG(1, ErrorF(WS DEVICE OFF\n));
wsmbEmuFinalize(pInfo);
+#ifndef __NetBSD__
if (priv-type == WSMOUSE_TYPE_TPANEL) {
/* Restore calibration data */
memcpy(coords, priv-coords, sizeof coords);
@@ -555,6 +562,7 @@ wsDeviceOff(DeviceIntPtr pWS)
strerror(errno));
}
}
+#endif
if (pInfo-fd = 0) {
xf86RemoveEnabledDevice(pInfo);
wsClose(pInfo);
CVS commit: xsrc/external/mit/xf86-input-ws/dist/src
Module Name:xsrc
Committed By: tsutsui
Date: Mon Sep 26 18:04:37 UTC 2011
Modified Files:
xsrc/external/mit/xf86-input-ws/dist/src: ws.c
Log Message:
Also wrap variables used only in !__NetBSD__ block.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xf86-input-ws/dist/src/ws.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-input-ws/dist/src/ws.c
diff -u xsrc/external/mit/xf86-input-ws/dist/src/ws.c:1.7 xsrc/external/mit/xf86-input-ws/dist/src/ws.c:1.8
--- xsrc/external/mit/xf86-input-ws/dist/src/ws.c:1.7 Mon Sep 26 14:47:53 2011
+++ xsrc/external/mit/xf86-input-ws/dist/src/ws.c Mon Sep 26 18:04:36 2011
@@ -501,7 +501,9 @@ wsDeviceOn(DeviceIntPtr pWS)
{
InputInfoPtr pInfo = (InputInfoPtr)pWS-public.devicePrivate;
WSDevicePtr priv = (WSDevicePtr)pInfo-private;
+#ifndef __NetBSD__
struct wsmouse_calibcoords coords;
+#endif
DBG(1, ErrorF(WS DEVICE ON\n));
if ((pInfo-fd 0) (wsOpen(pInfo) != Success)) {
@@ -549,7 +551,9 @@ wsDeviceOff(DeviceIntPtr pWS)
{
InputInfoPtr pInfo = (InputInfoPtr)pWS-public.devicePrivate;
WSDevicePtr priv = pInfo-private;
+#ifndef __NetBSD__
struct wsmouse_calibcoords coords;
+#endif
DBG(1, ErrorF(WS DEVICE OFF\n));
wsmbEmuFinalize(pInfo);
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: jakllsch
Date: Mon Sep 26 18:07:38 UTC 2011
Modified Files:
src/sys/dev/pci: cxdtv.c cxdtvreg.h
Log Message:
Define and use symbolic bits in registers.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/pci/cxdtv.c
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/pci/cxdtvreg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/cxdtv.c
diff -u src/sys/dev/pci/cxdtv.c:1.8 src/sys/dev/pci/cxdtv.c:1.9
--- src/sys/dev/pci/cxdtv.c:1.8 Mon Aug 29 14:47:08 2011
+++ src/sys/dev/pci/cxdtv.c Mon Sep 26 18:07:37 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cxdtv.c,v 1.8 2011/08/29 14:47:08 jmcneill Exp $ */
+/* $NetBSD: cxdtv.c,v 1.9 2011/09/26 18:07:37 jakllsch Exp $ */
/*
* Copyright (c) 2008, 2011 Jonathan A. Kollasch
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cxdtv.c,v 1.8 2011/08/29 14:47:08 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: cxdtv.c,v 1.9 2011/09/26 18:07:37 jakllsch Exp $);
#include sys/param.h
#include sys/kernel.h
@@ -780,7 +780,7 @@ cxdtv_risc_field(struct cxdtv_softc *sc,
rm = sc-sc_riscbuf;
- /* htole32 will be done when program is copied to chip sram */
+ /* htole32 will be done when program is copied to chip SRAM */
/* XXX */
*(rm++) = (CX_RISC_SYNC|0);
@@ -881,33 +881,32 @@ cxdtv_mpeg_trigger(struct cxdtv_softc *s
/* software reset */
- /* serial MPEG port on HD5500 */
switch(sc-sc_vendor) {
case PCI_VENDOR_ATI:
/* both ATI boards with DTV are the same */
bus_space_write_4(sc-sc_memt, sc-sc_memh,
- CXDTV_TS_GEN_CONTROL, 0x40);
+ CXDTV_TS_GEN_CONTROL, IPB_SW_RST);
delay(100);
/* parallel MPEG port */
bus_space_write_4(sc-sc_memt, sc-sc_memh,
- CXDTV_PINMUX_IO, 0x80); /* XXX bit defines */
+ CXDTV_PINMUX_IO, MPEG_PAR_EN);
break;
case PCI_VENDOR_PCHDTV:
if (sc-sc_product == PCI_PRODUCT_PCHDTV_HD5500) {
bus_space_write_4(sc-sc_memt, sc-sc_memh,
- CXDTV_TS_GEN_CONTROL, 0x48);
+ CXDTV_TS_GEN_CONTROL, IPB_SW_RST|IPB_SMODE);
delay(100);
- /* serial MPEG port */
bus_space_write_4(sc-sc_memt, sc-sc_memh,
- CXDTV_PINMUX_IO, 0x00); /* XXX bit defines */
+ CXDTV_PINMUX_IO, 0x00); /* serial MPEG port */
/* byte-width start-of-packet */
bus_space_write_4(sc-sc_memt, sc-sc_memh,
CXDTV_HW_SOP_CONTROL,
0x47 16 | 188 4 | 1);
bus_space_write_4(sc-sc_memt, sc-sc_memh,
- CXDTV_TS_SOP_STATUS, 1 13);
+ CXDTV_TS_SOP_STATUS, IPB_SOP_BYTEWIDE);
+ /* serial MPEG port on HD5500 */
bus_space_write_4(sc-sc_memt, sc-sc_memh,
- CXDTV_TS_GEN_CONTROL, 0x08);
+ CXDTV_TS_GEN_CONTROL, IPB_SMODE);
}
break;
default:
@@ -917,7 +916,7 @@ cxdtv_mpeg_trigger(struct cxdtv_softc *s
bus_space_write_4(sc-sc_memt, sc-sc_memh, CXDTV_TS_LNGTH,
CXDTV_TS_PKTSIZE);
- /* Configure for standard MPEG TS, 1 good to sync */
+ /* Configure for standard MPEG TS, 1 good packet to sync */
bus_space_write_4(sc-sc_memt, sc-sc_memh, CXDTV_HW_SOP_CONTROL,
0x47 16 | 188 4 | 1);
Index: src/sys/dev/pci/cxdtvreg.h
diff -u src/sys/dev/pci/cxdtvreg.h:1.1 src/sys/dev/pci/cxdtvreg.h:1.2
--- src/sys/dev/pci/cxdtvreg.h:1.1 Mon Jul 11 00:46:04 2011
+++ src/sys/dev/pci/cxdtvreg.h Mon Sep 26 18:07:38 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cxdtvreg.h,v 1.1 2011/07/11 00:46:04 jakllsch Exp $ */
+/* $NetBSD: cxdtvreg.h,v 1.2 2011/09/26 18:07:38 jakllsch Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill jmcne...@invisible.ca
@@ -76,7 +76,10 @@
#define CXDTV_DEV_CNTRL2_RUN_RISC __BIT(5)
-/* mpeg ts registers */
+/* PINMUX_IO */
+#define MPEG_PAR_EN __BIT(7)
+
+/* MPEG TS registers */
#define CXDTV_DMA28_PTR1 0x30009c
#define CXDTV_DMA28_PTR2 0x3000dc
@@ -98,14 +101,34 @@
#define CXDTV_TS_INT_MSTAT 0x200078
#define CXDTV_TS_INT_SSTAT 0x20007c
-/* for TS_DMA_CNTRL */
+/* TS_DMA_CNTRL */
#define CXDTV_TS_RISC_EN __BIT(4)
#define CXDTV_TS_FIFO_EN __BIT(0)
-#define CXDTV_TS_RISCI2 0x10
-#define CXDTV_TS_RISCI1 0x01
+/* TS_INT_* */
+#define CXDTV_TS_RISCI2 __BIT(4)
+#define CXDTV_TS_RISCI1 __BIT(0)
#define CXDTV_TS_RISCI (CXDTV_TS_RISCI2|CXDTV_TS_RISCI1)
+/* HW_SOP_CONTROL */
+
+/* TS_GEN_CONTROL */
+#define MPEG_IN_SYNC __BIT(0)
+#define IPB_MCLK_POL __BIT(1)
+#define IPB_PUNC_CLK __BIT(2)
+#define IPB_SMODE __BIT(3)
+#define IPB_BIT_RVRS __BIT(4)
+#define IPB_ERR_ACK __BIT(5)
+#define IPB_SW_RST __BIT(6)
+#define IPB_STAT_CLR __BIT(7)
+
+/* TS_SOP_STATUS */
+#define MPG_BAD_SOP_STAT __BITS(11,0)
+#define IPB_SOP_SYNC_CHK __BIT(12)
+#define IPB_SOP_BYTEWIDE __BIT(13)
+#define IPB_SOP_SEL __BITS(15, 14)
+#define IPB_TSSOP_POL __BIT(16)
+
/* RISC instructions */
#define CX_RISC_WRITECR 0xd000
#define CX_RISC_WRITECM 0xc000
CVS commit: src/external/mit/xorg/server/drivers/xf86-input-ws
Module Name:src
Committed By: tsutsui
Date: Mon Sep 26 18:08:09 UTC 2011
Modified Files:
src/external/mit/xorg/server/drivers/xf86-input-ws: Makefile
Log Message:
Set WARNS?=2.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/external/mit/xorg/server/drivers/xf86-input-ws/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/drivers/xf86-input-ws/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-input-ws/Makefile:1.1 src/external/mit/xorg/server/drivers/xf86-input-ws/Makefile:1.2
--- src/external/mit/xorg/server/drivers/xf86-input-ws/Makefile:1.1 Sat Nov 28 12:10:24 2009
+++ src/external/mit/xorg/server/drivers/xf86-input-ws/Makefile Mon Sep 26 18:08:09 2011
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2009/11/28 12:10:24 mbalmer Exp $
+# $NetBSD: Makefile,v 1.2 2011/09/26 18:08:09 tsutsui Exp $
+
+WARNS?= 2
DRIVER= xf86-input-ws
DRIVER_NAME= ws_drv
@@ -10,6 +12,4 @@ CPPFLAGS+= -DHAVE_CONFIG_H \
-I${X11SRCDIR.${DRIVER}}/../include \
-I${X11SRCDIR.${DRIVER}}/include
-COPTS.ws.c= -Wno-error # XXX deprecated
-
.include ../Makefile.xf86-driver
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: jakllsch Date: Mon Sep 26 18:14:07 UTC 2011 Modified Files: src/sys/arch/i386/conf: ALL Log Message: options PMS_DISABLE_POWERHOOK is obsolete. To generate a diff of this commit: cvs rdiff -u -r1.320 -r1.321 src/sys/arch/i386/conf/ALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/ALL diff -u src/sys/arch/i386/conf/ALL:1.320 src/sys/arch/i386/conf/ALL:1.321 --- src/sys/arch/i386/conf/ALL:1.320 Thu Sep 22 01:15:31 2011 +++ src/sys/arch/i386/conf/ALL Mon Sep 26 18:14:07 2011 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.320 2011/09/22 01:15:31 jakllsch Exp $ +# $NetBSD: ALL,v 1.321 2011/09/26 18:14:07 jakllsch Exp $ # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp # # ALL machine description file @@ -17,7 +17,7 @@ include arch/i386/conf/std.i386 options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident ALL-$Revision: 1.320 $ +#ident ALL-$Revision: 1.321 $ maxusers 64 # estimated number of users @@ -556,7 +556,6 @@ npx0 at isa? port 0xf0 irq 13 # x86 math pckbc0 at isa? # PC keyboard controller pckbd* at pckbc? # PC keyboard pms* at pckbc? # PS/2 mouse for wsmouse -options PMS_DISABLE_POWERHOOK # Disable PS/2 reset on resume options PMS_SYNAPTICS_TOUCHPAD # Enable support for Synaptics Touchpads options PMS_ELANTECH_TOUCHPAD # Enable support for Elantech Touchpads vga0 at isa?
CVS commit: src/external/gpl3/gdb/dist/gdb
Module Name:src
Committed By: christos
Date: Mon Sep 26 18:55:57 UTC 2011
Added Files:
src/external/gpl3/gdb/dist/gdb: nbsd-thread.c
Log Message:
Resurrect old thread debugging code. Not hooked in, compiles.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/gpl3/gdb/dist/gdb/nbsd-thread.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/external/gpl3/gdb/dist/gdb/nbsd-thread.c
diff -u /dev/null src/external/gpl3/gdb/dist/gdb/nbsd-thread.c:1.1
--- /dev/null Mon Sep 26 14:55:57 2011
+++ src/external/gpl3/gdb/dist/gdb/nbsd-thread.c Mon Sep 26 14:55:56 2011
@@ -0,0 +1,1297 @@
+/* Thread debugging back-end code for NetBSD, for GDB.
+ Copyright 2002
+ Wasabi Systems, Inc.
+
+ This file is part of GDB.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+
+#include defs.h
+
+#include sys/types.h
+#include sys/ptrace.h
+
+#include pthread.h
+#include pthread_dbg.h
+
+#include symtab.h
+#include symfile.h
+#include objfiles.h
+#include solib.h
+#include gdbthread.h
+#include bfd.h
+#include elf-bfd.h
+#include target.h
+#include inferior.h
+#include gdbcmd.h
+#include gdbcore.h
+
+#include machine/reg.h
+
+#ifndef HAVE_GREGSET_T
+typedef struct reg gregset_t;
+#endif
+
+#ifndef HAVE_FPREGSET_T
+typedef struct fpreg fpregset_t;
+#endif
+
+#include gregset.h
+
+/* nbsd_thread_present indicates that new_objfile has spotted
+ libpthread and that post_attach() or create_inferior() should fire
+ up thread debugging if it isn't already active. */
+static int nbsd_thread_present = 0;
+
+/* nbsd_thread_active indicates that thread debugging is up and running, and
+ in particular that main_ta and main_ptid are valid. */
+static int nbsd_thread_active = 0;
+
+/* nbsd_thread_core indicates that we're working on a corefile, not a
+ live process. */
+static int nbsd_thread_core = 0;
+
+static ptid_t main_ptid; /* Real process ID */
+
+static ptid_t cached_thread;
+
+struct target_ops nbsd_thread_ops;
+struct target_ops nbsd_core_ops;
+
+struct td_proc_callbacks_t nbsd_thread_callbacks;
+struct td_proc_callbacks_t nbsd_core_callbacks;
+
+/* place to store core_ops before we overwrite it */
+static struct target_ops orig_core_ops;
+
+extern struct target_ops child_ops; /* target vector for inftarg.c */
+extern struct target_ops core_ops; /* target vector for corelow.c */
+
+extern int child_suppress_run;
+
+static ptid_t find_active_thread (void);
+static void nbsd_find_new_threads (struct target_ops *);
+
+#define GET_PID(ptid) ptid_get_pid (ptid)
+#define GET_LWP(ptid) ptid_get_lwp (ptid)
+#define GET_THREAD(ptid) ptid_get_tid (ptid)
+
+#define IS_LWP(ptid) (GET_LWP (ptid) != 0)
+#define IS_THREAD(ptid) (GET_THREAD (ptid) != 0)
+
+#define BUILD_LWP(lwp, ptid) ptid_build (GET_PID(ptid), lwp, 0)
+#define BUILD_THREAD(tid, ptid) ptid_build (GET_PID(ptid), 0, tid)
+
+static td_proc_t *main_ta;
+
+struct nbsd_thread_proc_arg {
+ struct target_ops *ops;
+ struct regcache *cache;
+} main_arg;
+
+static const char *syncnames[] = {
+ unknown, mutex, cond var, spinlock, thread
+};
+
+struct string_map
+ {
+int num;
+char *str;
+ };
+
+static char *
+td_err_string (int errcode)
+{
+ static struct string_map
+td_err_table[] =
+ {
+{TD_ERR_OK, generic \call succeeded\},
+{TD_ERR_ERR, generic error.},
+{TD_ERR_NOSYM, symbol not found},
+{TD_ERR_NOOBJ, no object can be found to satisfy query},
+{TD_ERR_BADTHREAD, thread can not answer request},
+{TD_ERR_INUSE, debugging interface already in use for this process},
+{TD_ERR_NOLIB, process is not using libpthread},
+{TD_ERR_NOMEM, out of memory},
+{TD_ERR_IO, process callback error},
+{TD_ERR_INVAL, invalid argument},
+ };
+ const int td_err_size = sizeof td_err_table / sizeof (struct string_map);
+ int i;
+ static char buf[90];
+
+ for (i = 0; i td_err_size; i++)
+if (td_err_table[i].num == errcode)
+ return td_err_table[i].str;
+
+ sprintf (buf, Unknown thread_db error code: %d, errcode);
+
+ return buf;
+}
+
+static void
+nbsd_thread_activate (void)
+{
+ nbsd_thread_active = 1;
+ main_ptid = inferior_ptid;
+ cached_thread = minus_one_ptid;
+ nbsd_find_new_threads (NULL);
+ inferior_ptid
CVS commit: src/share/man/man4
Module Name:src Committed By: sjg Date: Mon Sep 26 19:02:39 UTC 2011 Modified Files: src/share/man/man4: filemon.4 Log Message: Update description for V4. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/share/man/man4/filemon.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/filemon.4 diff -u src/share/man/man4/filemon.4:1.4 src/share/man/man4/filemon.4:1.5 --- src/share/man/man4/filemon.4:1.4 Mon Apr 4 07:17:08 2011 +++ src/share/man/man4/filemon.4 Mon Sep 26 19:02:39 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: filemon.4,v 1.4 2011/04/04 07:17:08 wiz Exp $ +.\ $NetBSD: filemon.4,v 1.5 2011/09/26 19:02:39 sjg Exp $ .\ .\ Copyright (c) 2011, Juniper Networks, Inc. .\ @@ -50,7 +50,7 @@ looks like: .Bd -literal -offset indent # filemon version 2 # Target pid 7437 -V 2 +V 4 E 21848 /bin/cat R 21848 /lib/libc.so.12 R 21848 /etc/motd @@ -91,7 +91,7 @@ is two pathnames. is two pathnames. .It Dv R .Xr open 2 -read-only. +for read or read-write. .It Dv W .Xr open 2 for writing or read-write.
CVS commit: src/external/gpl3/gdb/dist/gdb
Module Name:src
Committed By: christos
Date: Mon Sep 26 20:38:54 UTC 2011
Modified Files:
src/external/gpl3/gdb/dist/gdb: amd64nbsd-nat.c nbsd-thread.c
Log Message:
Provide regset functions and gut parts that the new debugging thread library
does not provide yet, so that we can link. As expected this does not work
yet.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gdb/dist/gdb/amd64nbsd-nat.c
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/gdb/dist/gdb/nbsd-thread.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gdb/dist/gdb/amd64nbsd-nat.c
diff -u src/external/gpl3/gdb/dist/gdb/amd64nbsd-nat.c:1.2 src/external/gpl3/gdb/dist/gdb/amd64nbsd-nat.c:1.3
--- src/external/gpl3/gdb/dist/gdb/amd64nbsd-nat.c:1.2 Sun Sep 25 12:30:24 2011
+++ src/external/gpl3/gdb/dist/gdb/amd64nbsd-nat.c Mon Sep 26 16:38:54 2011
@@ -32,6 +32,17 @@
#include machine/frame.h
#include machine/pcb.h
+#include machine/reg.h
+
+#ifndef HAVE_GREGSET_T
+typedef struct reg gregset_t;
+#endif
+
+#ifndef HAVE_FPREGSET_T
+typedef struct fpreg fpregset_t;
+#endif
+
+#include gregset.h
/* Mapping between the general-purpose registers in NetBSD/amd64
`struct reg' format and GDB's register cache layout for
@@ -113,6 +124,45 @@ amd64nbsd_supply_pcb (struct regcache *r
return 1;
}
+void
+supply_gregset (struct regcache *regcache, const gregset_t *gregsetp)
+{
+ amd64_supply_native_gregset (regcache, gregsetp, -1);
+}
+
+/* Fill register REGNUM (if it is a general-purpose register) in
+ *GREGSETP with the value in GDB's register cache. If REGNUM is -1,
+ do this for all registers. */
+
+void
+fill_gregset (const struct regcache *regcache,
+ gregset_t *gregsetp, int regnum)
+{
+ amd64_collect_native_gregset (regcache, gregsetp, regnum);
+}
+
+/* Transfering floating-point registers between GDB, inferiors and cores. */
+
+/* Fill GDB's register cache with the floating-point and SSE register
+ values in *FPREGSETP. */
+
+void
+supply_fpregset (struct regcache *regcache, const fpregset_t *fpregsetp)
+{
+ amd64_supply_fxsave (regcache, -1, fpregsetp);
+}
+
+/* Fill register REGNUM (if it is a floating-point or SSE register) in
+ *FPREGSETP with the value in GDB's register cache. If REGNUM is
+ -1, do this for all registers. */
+
+void
+fill_fpregset (const struct regcache *regcache,
+ fpregset_t *fpregsetp, int regnum)
+{
+ amd64_collect_fxsave (regcache, regnum, fpregsetp);
+}
+
/* Provide a prototype to silence -Wmissing-prototypes. */
void _initialize_amd64nbsd_nat (void);
Index: src/external/gpl3/gdb/dist/gdb/nbsd-thread.c
diff -u src/external/gpl3/gdb/dist/gdb/nbsd-thread.c:1.1 src/external/gpl3/gdb/dist/gdb/nbsd-thread.c:1.2
--- src/external/gpl3/gdb/dist/gdb/nbsd-thread.c:1.1 Mon Sep 26 14:55:56 2011
+++ src/external/gpl3/gdb/dist/gdb/nbsd-thread.c Mon Sep 26 16:38:54 2011
@@ -75,14 +75,6 @@ struct target_ops nbsd_core_ops;
struct td_proc_callbacks_t nbsd_thread_callbacks;
struct td_proc_callbacks_t nbsd_core_callbacks;
-/* place to store core_ops before we overwrite it */
-static struct target_ops orig_core_ops;
-
-extern struct target_ops child_ops; /* target vector for inftarg.c */
-extern struct target_ops core_ops; /* target vector for corelow.c */
-
-extern int child_suppress_run;
-
static ptid_t find_active_thread (void);
static void nbsd_find_new_threads (struct target_ops *);
@@ -169,12 +161,13 @@ nbsd_thread_deactivate (void)
static void
nbsd_thread_attach (struct target_ops *ops, char *args, int from_tty)
{
+ struct target_ops *beneath = find_target_beneath (ops);
nbsd_thread_core = 0;
if (nbsd_thread_present !nbsd_thread_active)
push_target(nbsd_thread_ops);
- child_ops.to_attach (ops, args, from_tty);
+ beneath-to_attach (beneath, args, from_tty);
/* seems like a good place to activate, but isn't. Let it happen in
nbsd_thread_post_attach(), after a wait has occurred. */
@@ -183,7 +176,10 @@ nbsd_thread_attach (struct target_ops *o
static void
nbsd_thread_post_attach (int pid)
{
- child_ops.to_post_attach (pid);
+#if 0
+ struct target_ops *beneath = find_target_beneath (ops);
+ beneath-to_post_attach (pid);
+#endif
if (nbsd_thread_present !nbsd_thread_active)
nbsd_thread_activate ();
@@ -209,7 +205,7 @@ nbsd_thread_detach (struct target_ops *o
cache so that attach - detach - attach works. */
clear_solib();
symbol_file_clear(0);
- child_ops.to_detach (beneath, args, from_tty);
+ beneath-to_detach (beneath, args, from_tty);
}
static int nsusp;
@@ -266,6 +262,7 @@ static void
nbsd_thread_resume (struct target_ops *ops, ptid_t ptid, int step,
enum target_signal signo)
{
+ struct target_ops *beneath = find_target_beneath (ops);
/* If a particular thread is specified, then gdb wants to resume or
step just that thread. If it isn't on a
CVS commit: src/tools
Module Name:src
Committed By: christos
Date: Mon Sep 26 21:16:14 UTC 2011
Modified Files:
src/tools/gcc: Makefile
src/tools/gdb: Makefile
Log Message:
remove pre-gcc-4.5 mknative remnants that have long ceased to function.
To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/tools/gcc/Makefile
cvs rdiff -u -r1.19 -r1.20 src/tools/gdb/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gcc/Makefile
diff -u src/tools/gcc/Makefile:1.45 src/tools/gcc/Makefile:1.46
--- src/tools/gcc/Makefile:1.45 Tue Sep 20 22:15:18 2011
+++ src/tools/gcc/Makefile Mon Sep 26 17:16:14 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2011/09/21 02:15:18 mrg Exp $
+# $NetBSD: Makefile,v 1.46 2011/09/26 21:16:14 christos Exp $
.include bsd.own.mk
@@ -109,13 +109,8 @@ GCCSRCDIR=${.CURDIR}/../../gnu/dist/gcc4
GCCSRCDIR=${.CURDIR}/../../external/gpl3/gcc/dist
.endif
-.if ${HAVE_GCC} = 45
CXXADDFLAGS= --sysroot=${DESTDIR}
CCADDFLAGS= --sysroot=${DESTDIR} -L${DESTDIR}/lib -L${DESTDIR}/usr/lib -B${DESTDIR}/usr/lib/ -I${.OBJDIR}/.native/gcc/include
-.else
-CXXADDFLAGS= ${CPPFLAG_ISYSTEMXX} ${DESTDIR}/usr/include/g++
-CCADDFLAGS= ${CPPFLAG_ISYSTEM} ${DESTDIR}/usr/include -L${DESTDIR}/lib -L${DESTDIR}/usr/lib -B${DESTDIR}/usr/lib/
-.endif
NEWCONFIGDIR?= ${.CURDIR}/../..
MKNATIVE?= ${.CURDIR}/mknative-gcc
Index: src/tools/gdb/Makefile
diff -u src/tools/gdb/Makefile:1.19 src/tools/gdb/Makefile:1.20
--- src/tools/gdb/Makefile:1.19 Sun Sep 25 22:36:19 2011
+++ src/tools/gdb/Makefile Mon Sep 26 17:16:14 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2011/09/26 02:36:19 christos Exp $
+# $NetBSD: Makefile,v 1.20 2011/09/26 21:16:14 christos Exp $
.include bsd.own.mk
@@ -17,11 +17,7 @@ INSTALL_TARGET= install-gdb
.include ${.CURDIR}/../Makefile.gnuhost
-.if ${HAVE_GCC} = 45
CCADDFLAGS= --sysroot=${DESTDIR} -L${DESTDIR}/lib -L${DESTDIR}/usr/lib -B${DESTDIR}/usr/lib/ -I${.OBJDIR}/.native/gcc/include
-.else
-CCADDFLAGS= ${CPPFLAG_ISYSTEM} ${DESTDIR}/usr/include -L${DESTDIR}/lib -L${DESTDIR}/usr/lib -B${DESTDIR}/usr/lib/
-.endif
NEWCONFIGDIR?= ${.CURDIR}/../..
MKNATIVE?= ${.CURDIR}/mknative-gdb
CVS commit: src/sys/arch/xen/xen
Module Name:src
Committed By: jym
Date: Mon Sep 26 21:44:09 UTC 2011
Modified Files:
src/sys/arch/xen/xen: if_xennet_xenbus.c
Log Message:
Fix a fallout with my xensuspend merge: talk_to_backend() returns a
boolean, so checking for true with == 0 is... wrong.
Now xennet(4) should work as expected, and not stay in the InitWait state
(which blocks network communication with the backend).
Thanks to riz@ and sborrill@ for reporting breakage with -current
xennet(4) after my merge.
To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/xen/xen/if_xennet_xenbus.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/xen/xen/if_xennet_xenbus.c
diff -u src/sys/arch/xen/xen/if_xennet_xenbus.c:1.52 src/sys/arch/xen/xen/if_xennet_xenbus.c:1.53
--- src/sys/arch/xen/xen/if_xennet_xenbus.c:1.52 Tue Sep 20 00:12:24 2011
+++ src/sys/arch/xen/xen/if_xennet_xenbus.c Mon Sep 26 21:44:09 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: if_xennet_xenbus.c,v 1.52 2011/09/20 00:12:24 jym Exp $ */
+/* $NetBSD: if_xennet_xenbus.c,v 1.53 2011/09/26 21:44:09 jym Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -85,7 +85,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_xennet_xenbus.c,v 1.52 2011/09/20 00:12:24 jym Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_xennet_xenbus.c,v 1.53 2011/09/26 21:44:09 jym Exp $);
#include opt_xen.h
#include opt_nfs_boot.h
@@ -223,7 +223,7 @@ static void xennet_free_rx_buffer(struct
static void xennet_tx_complete(struct xennet_xenbus_softc *);
static void xennet_rx_mbuf_free(struct mbuf *, void *, size_t, void *);
static int xennet_handler(void *);
-static int xennet_talk_to_backend(struct xennet_xenbus_softc *);
+static bool xennet_talk_to_backend(struct xennet_xenbus_softc *);
#ifdef XENNET_DEBUG_DUMP
static void xennet_hex_dump(const unsigned char *, size_t, const char *, int);
#endif
@@ -518,7 +518,7 @@ abort_resume:
return false;
}
-static int
+static bool
xennet_talk_to_backend(struct xennet_xenbus_softc *sc)
{
int error;
@@ -657,7 +657,7 @@ static void xennet_backend_changed(void
case XenbusStateInitWait:
if (sc-sc_backend_status == BEST_CONNECTED)
break;
- if (xennet_talk_to_backend(sc) == 0)
+ if (xennet_talk_to_backend(sc))
xenbus_switch_state(sc-sc_xbusd, NULL,
XenbusStateConnected);
break;
CVS commit: src/sys/arch/sh3/sh3
Module Name:src Committed By: christos Date: Mon Sep 26 22:43:07 UTC 2011 Modified Files: src/sys/arch/sh3/sh3: cpu_in_cksum.S Log Message: compute the entry size correctly. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/sh3/sh3/cpu_in_cksum.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/sh3/sh3/cpu_in_cksum.S diff -u src/sys/arch/sh3/sh3/cpu_in_cksum.S:1.2 src/sys/arch/sh3/sh3/cpu_in_cksum.S:1.3 --- src/sys/arch/sh3/sh3/cpu_in_cksum.S:1.2 Fri Feb 1 21:15:40 2008 +++ src/sys/arch/sh3/sh3/cpu_in_cksum.S Mon Sep 26 18:43:07 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu_in_cksum.S,v 1.2 2008/02/02 02:15:40 uwe Exp $ */ +/* $NetBSD: cpu_in_cksum.S,v 1.3 2011/09/26 22:43:07 christos Exp $ */ /*- * Copyright (c) 2000 SHIMIZU Ryo r...@misakimix.org @@ -31,7 +31,7 @@ #include machine/asm.h #include assym.h -__KERNEL_RCSID(0, $NetBSD: cpu_in_cksum.S,v 1.2 2008/02/02 02:15:40 uwe Exp $) +__KERNEL_RCSID(0, $NetBSD: cpu_in_cksum.S,v 1.3 2011/09/26 22:43:07 christos Exp $) #define reg_tmp0 r0 @@ -244,9 +244,6 @@ out_of_mbufs: .L_message_out_of_data: .asciz cksum: out of data (%d byte short)\n - SET_ENTRY_SIZE(in_cksum) - - .align 2 cksum128mod: mov reg_mlen,reg_tmp0 @@ -305,3 +302,4 @@ cksum128_tail: mov #0,reg_tmp0 rts addc reg_tmp0,reg_sum + SET_ENTRY_SIZE(cpu_in_cksum)
CVS commit: src/sys/arch/sh3/sh3
Module Name:src Committed By: christos Date: Tue Sep 27 00:35:38 UTC 2011 Modified Files: src/sys/arch/sh3/sh3: cpu_in_cksum.S Log Message: move the size marker back to where it was, but fix the name. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/sh3/sh3/cpu_in_cksum.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/sh3/sh3/cpu_in_cksum.S diff -u src/sys/arch/sh3/sh3/cpu_in_cksum.S:1.3 src/sys/arch/sh3/sh3/cpu_in_cksum.S:1.4 --- src/sys/arch/sh3/sh3/cpu_in_cksum.S:1.3 Mon Sep 26 18:43:07 2011 +++ src/sys/arch/sh3/sh3/cpu_in_cksum.S Mon Sep 26 20:35:38 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu_in_cksum.S,v 1.3 2011/09/26 22:43:07 christos Exp $ */ +/* $NetBSD: cpu_in_cksum.S,v 1.4 2011/09/27 00:35:38 christos Exp $ */ /*- * Copyright (c) 2000 SHIMIZU Ryo r...@misakimix.org @@ -31,7 +31,7 @@ #include machine/asm.h #include assym.h -__KERNEL_RCSID(0, $NetBSD: cpu_in_cksum.S,v 1.3 2011/09/26 22:43:07 christos Exp $) +__KERNEL_RCSID(0, $NetBSD: cpu_in_cksum.S,v 1.4 2011/09/27 00:35:38 christos Exp $) #define reg_tmp0 r0 @@ -244,6 +244,9 @@ out_of_mbufs: .L_message_out_of_data: .asciz cksum: out of data (%d byte short)\n + SET_ENTRY_SIZE(cpu_in_cksum) + + .align 2 cksum128mod: mov reg_mlen,reg_tmp0 @@ -302,4 +305,3 @@ cksum128_tail: mov #0,reg_tmp0 rts addc reg_tmp0,reg_sum - SET_ENTRY_SIZE(cpu_in_cksum)
CVS commit: src
Module Name:src Committed By: jym Date: Tue Sep 27 00:36:51 UTC 2011 Modified Files: src/distrib/sets/lists/comp: mi src/share/man/man9: KASSERT.9 Makefile Log Message: Document new *ASSERTMSG() prototype, and update KASSERT(9). See also http://mail-index.netbsd.org/tech-kern/2011/09/07/msg011427.html To generate a diff of this commit: cvs rdiff -u -r1.1679 -r1.1680 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.12 -r1.13 src/share/man/man9/KASSERT.9 cvs rdiff -u -r1.349 -r1.350 src/share/man/man9/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1679 src/distrib/sets/lists/comp/mi:1.1680 --- src/distrib/sets/lists/comp/mi:1.1679 Sun Sep 25 04:11:47 2011 +++ src/distrib/sets/lists/comp/mi Tue Sep 27 00:36:49 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1679 2011/09/25 04:11:47 christos Exp $ +# $NetBSD: mi,v 1.1680 2011/09/27 00:36:49 jym Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -9410,6 +9410,7 @@ ./usr/share/man/cat9/KASSERT.0 comp-sys-catman .cat ./usr/share/man/cat9/KASSERTMSG.0 comp-sys-catman .cat ./usr/share/man/cat9/KDASSERT.0 comp-sys-catman .cat +./usr/share/man/cat9/KDASSERTMSG.0 comp-sys-catman .cat ./usr/share/man/cat9/KNOTE.0 comp-sys-catman .cat ./usr/share/man/cat9/LWP_CACHE_CREDS.0 comp-sys-catman .cat ./usr/share/man/cat9/MALLOC.0 comp-sys-catman .cat @@ -15503,6 +15504,7 @@ ./usr/share/man/html9/KASSERT.html comp-sys-htmlman html ./usr/share/man/html9/KASSERTMSG.html comp-sys-htmlman html ./usr/share/man/html9/KDASSERT.html comp-sys-htmlman html +./usr/share/man/html9/KDASSERTMSG.html comp-sys-htmlman html ./usr/share/man/html9/KNOTE.html comp-sys-htmlman html ./usr/share/man/html9/LWP_CACHE_CREDS.html comp-sys-htmlman html ./usr/share/man/html9/MALLOC.html comp-sys-htmlman html @@ -21681,6 +21683,7 @@ ./usr/share/man/man9/KASSERT.9 comp-sys-man .man ./usr/share/man/man9/KASSERTMSG.9 comp-sys-man .man ./usr/share/man/man9/KDASSERT.9 comp-sys-man .man +./usr/share/man/man9/KDASSERTMSG.9 comp-sys-man .man ./usr/share/man/man9/KNOTE.9 comp-sys-man .man ./usr/share/man/man9/LWP_CACHE_CREDS.9 comp-sys-man .man ./usr/share/man/man9/MALLOC.9 comp-sys-man .man Index: src/share/man/man9/KASSERT.9 diff -u src/share/man/man9/KASSERT.9:1.12 src/share/man/man9/KASSERT.9:1.13 --- src/share/man/man9/KASSERT.9:1.12 Wed Apr 6 05:40:19 2011 +++ src/share/man/man9/KASSERT.9 Tue Sep 27 00:36:51 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: KASSERT.9,v 1.12 2011/04/06 05:40:19 jruoho Exp $ +.\ $NetBSD: KASSERT.9,v 1.13 2011/09/27 00:36:51 jym Exp $ .\ .\ Copyright (c) 2006 Igor Sobrado .\ All rights reserved. @@ -24,21 +24,24 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd April 6, 2011 +.Dd September 27, 2011 .Dt KASSERT 9 .Os .Sh NAME .Nm KASSERT , .Nm KASSERTMSG , -.Nm KDASSERT +.Nm KDASSERT , +.Nm KDASSERTMSG .Nd kernel expression verification macros .Sh SYNOPSIS .Ft void .Fn KASSERT expression .Ft void -.Fn KASSERTMSG expression message +.Fn KASSERTMSG expression format ... .Ft void .Fn KDASSERT expression +.Ft void +.Fn KDASSERTMSG expression format ... .Sh DESCRIPTION These machine independent assertion-checking macros cause a kernel .Xr panic 9 @@ -62,6 +65,8 @@ the macros are defined to be no-ops. .It The .Fn KDASSERT +and +.Fn KDASSERTMSG tests are included only in kernels compiled with the .Dv DEBUG configuration option. @@ -91,11 +96,16 @@ vs. diagnostic), the expression that fai number the failure happened on. The .Fn KASSERTMSG -macro appends additional -.Fa message +and +.Fn KDASSERTMSG +macros append to the .Xr panic 9 -format string. +format string the message specified by +.Fa format +and its subsequent arguments, similar to +.Xr printf 9 +functions. .Sh SEE ALSO .Xr config 1 , .Xr options 4 , Index: src/share/man/man9/Makefile diff -u src/share/man/man9/Makefile:1.349 src/share/man/man9/Makefile:1.350 --- src/share/man/man9/Makefile:1.349 Sat Jul 30 18:19:05 2011 +++ src/share/man/man9/Makefile Tue Sep 27 00:36:51 2011 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.349 2011/07/30 18:19:05 rmind Exp $ +# $NetBSD: Makefile,v 1.350 2011/09/27 00:36:51 jym Exp $ # Makefile for section 9 (kernel function and variable) manual pages. @@ -81,7 +81,8 @@ MLINKS+=dmover.9 dmover_backend_register MAN+= CTASSERT.9 MAN+= KASSERT.9 MLINKS+=KASSERT.9 KASSERTMSG.9 \ - KASSERT.9 KDASSERT.9 + KASSERT.9 KDASSERT.9 \ + KASSERT.9 KDASSERTMSG.9 MLINKS+=accept_filter.9 accept_filt_add.9 MLINKS+=accept_filter.9 accept_filt_del.9
CVS commit: src/sys/compat/svr4
Module Name:src Committed By: christos Date: Tue Sep 27 00:52:56 UTC 2011 Modified Files: src/sys/compat/svr4: svr4_misc.c Log Message: return the namemax from the bsd statvfs which is filesystem dependent, not a random value. To generate a diff of this commit: cvs rdiff -u -r1.154 -r1.155 src/sys/compat/svr4/svr4_misc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/compat/svr4/svr4_misc.c diff -u src/sys/compat/svr4/svr4_misc.c:1.154 src/sys/compat/svr4/svr4_misc.c:1.155 --- src/sys/compat/svr4/svr4_misc.c:1.154 Tue Nov 30 05:43:02 2010 +++ src/sys/compat/svr4/svr4_misc.c Mon Sep 26 20:52:55 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: svr4_misc.c,v 1.154 2010/11/30 10:43:02 dholland Exp $ */ +/* $NetBSD: svr4_misc.c,v 1.155 2011/09/27 00:52:55 christos Exp $ */ /*- * Copyright (c) 1994, 2008 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: svr4_misc.c,v 1.154 2010/11/30 10:43:02 dholland Exp $); +__KERNEL_RCSID(0, $NetBSD: svr4_misc.c,v 1.155 2011/09/27 00:52:55 christos Exp $); #include sys/param.h #include sys/systm.h @@ -1076,7 +1076,7 @@ svr4_copyout_statvfs(const struct statvf sfs-f_flag |= SVR4_ST_RDONLY; if (bfs-f_flag MNT_NOSUID) sfs-f_flag |= SVR4_ST_NOSUID; - sfs-f_namemax = MAXNAMLEN; + sfs-f_namemax = bfs-f_namemax; memcpy(sfs-f_fstr, bfs-f_fstypename, sizeof(sfs-f_fstr)); /* XXX */ memset(sfs-f_filler, 0, sizeof(sfs-f_filler)); @@ -1108,7 +1108,7 @@ svr4_copyout_statvfs64(const struct stat sfs-f_flag |= SVR4_ST_RDONLY; if (bfs-f_flag MNT_NOSUID) sfs-f_flag |= SVR4_ST_NOSUID; - sfs-f_namemax = MAXNAMLEN; + sfs-f_namemax = bfs-f_namemax; memcpy(sfs-f_fstr, bfs-f_fstypename, sizeof(sfs-f_fstr)); /* XXX */ memset(sfs-f_filler, 0, sizeof(sfs-f_filler));
CVS commit: src/sys/coda
Module Name:src Committed By: christos Date: Tue Sep 27 00:54:47 UTC 2011 Modified Files: src/sys/coda: coda_vfsops.c Log Message: use CODA_MAXNAMLEN instead of bogus MAXNAMLEN To generate a diff of this commit: cvs rdiff -u -r1.69 -r1.70 src/sys/coda/coda_vfsops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/coda/coda_vfsops.c diff -u src/sys/coda/coda_vfsops.c:1.69 src/sys/coda/coda_vfsops.c:1.70 --- src/sys/coda/coda_vfsops.c:1.69 Mon Jun 29 01:08:15 2009 +++ src/sys/coda/coda_vfsops.c Mon Sep 26 20:54:47 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: coda_vfsops.c,v 1.69 2009/06/29 05:08:15 dholland Exp $ */ +/* $NetBSD: coda_vfsops.c,v 1.70 2011/09/27 00:54:47 christos Exp $ */ /* * @@ -45,7 +45,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: coda_vfsops.c,v 1.69 2009/06/29 05:08:15 dholland Exp $); +__KERNEL_RCSID(0, $NetBSD: coda_vfsops.c,v 1.70 2011/09/27 00:54:47 christos Exp $); #ifndef _KERNEL_OPT #define NVCODA 4 @@ -257,7 +257,7 @@ coda_mount(struct mount *vfsp, /* Alloca vfsp-mnt_stat.f_fsidx.__fsid_val[0] = 0; vfsp-mnt_stat.f_fsidx.__fsid_val[1] = makefstype(MOUNT_CODA); vfsp-mnt_stat.f_fsid = vfsp-mnt_stat.f_fsidx.__fsid_val[0]; -vfsp-mnt_stat.f_namemax = MAXNAMLEN; +vfsp-mnt_stat.f_namemax = CODA_MAXNAMLEN; mi-mi_vfsp = vfsp; /*
CVS commit: src/sys/compat/svr4_32
Module Name:src Committed By: christos Date: Tue Sep 27 00:56:14 UTC 2011 Modified Files: src/sys/compat/svr4_32: svr4_32_misc.c Log Message: use the filesystem specific namemax not a hard-coded MAXNAMLEN To generate a diff of this commit: cvs rdiff -u -r1.73 -r1.74 src/sys/compat/svr4_32/svr4_32_misc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/compat/svr4_32/svr4_32_misc.c diff -u src/sys/compat/svr4_32/svr4_32_misc.c:1.73 src/sys/compat/svr4_32/svr4_32_misc.c:1.74 --- src/sys/compat/svr4_32/svr4_32_misc.c:1.73 Tue Nov 30 05:43:02 2010 +++ src/sys/compat/svr4_32/svr4_32_misc.c Mon Sep 26 20:56:14 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: svr4_32_misc.c,v 1.73 2010/11/30 10:43:02 dholland Exp $ */ +/* $NetBSD: svr4_32_misc.c,v 1.74 2011/09/27 00:56:14 christos Exp $ */ /*- * Copyright (c) 1994, 2008 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: svr4_32_misc.c,v 1.73 2010/11/30 10:43:02 dholland Exp $); +__KERNEL_RCSID(0, $NetBSD: svr4_32_misc.c,v 1.74 2011/09/27 00:56:14 christos Exp $); #include sys/param.h #include sys/systm.h @@ -1084,7 +1084,7 @@ svr4_32_copyout_statvfs(const struct sta sfs-f_flag |= SVR4_ST_RDONLY; if (bfs-f_flag MNT_NOSUID) sfs-f_flag |= SVR4_ST_NOSUID; - sfs-f_namemax = MAXNAMLEN; + sfs-f_namemax = bfs-f_namemax; memcpy(sfs-f_fstr, bfs-f_fstypename, sizeof(sfs-f_fstr)); /* XXX */ memset(sfs-f_filler, 0, sizeof(sfs-f_filler)); @@ -1116,7 +1116,7 @@ svr4_32_copyout_statvfs64(const struct s sfs-f_flag |= SVR4_ST_RDONLY; if (bfs-f_flag MNT_NOSUID) sfs-f_flag |= SVR4_ST_NOSUID; - sfs-f_namemax = MAXNAMLEN; + sfs-f_namemax = bfs-f_namemax; memcpy(sfs-f_fstr, bfs-f_fstypename, sizeof(sfs-f_fstr)); /* XXX */ memset(sfs-f_filler, 0, sizeof(sfs-f_filler));
CVS commit: src/sys/fs/cd9660
Module Name:src
Committed By: christos
Date: Tue Sep 27 01:01:44 UTC 2011
Modified Files:
src/sys/fs/cd9660: cd9660_util.c cd9660_vfsops.c iso.h
Log Message:
define and use ISO_MAXNAMLEN instead of MAXNAMLEN
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/fs/cd9660/cd9660_util.c \
src/sys/fs/cd9660/iso.h
cvs rdiff -u -r1.72 -r1.73 src/sys/fs/cd9660/cd9660_vfsops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/fs/cd9660/cd9660_util.c
diff -u src/sys/fs/cd9660/cd9660_util.c:1.9 src/sys/fs/cd9660/cd9660_util.c:1.10
--- src/sys/fs/cd9660/cd9660_util.c:1.9 Wed Feb 27 14:43:36 2008
+++ src/sys/fs/cd9660/cd9660_util.c Mon Sep 26 21:01:43 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cd9660_util.c,v 1.9 2008/02/27 19:43:36 matt Exp $ */
+/* $NetBSD: cd9660_util.c,v 1.10 2011/09/27 01:01:43 christos Exp $ */
/*-
* Copyright (c) 1994
@@ -37,7 +37,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cd9660_util.c,v 1.9 2008/02/27 19:43:36 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: cd9660_util.c,v 1.10 2011/09/27 01:01:43 christos Exp $);
#include sys/param.h
#include sys/systm.h
@@ -187,10 +187,10 @@ isofntrans(const u_char *infn, int infnl
break;
}
- sz = wput(outfn, MAXNAMLEN - fnidx, c, joliet_level);
+ sz = wput(outfn, ISO_MAXNAMLEN - fnidx, c, joliet_level);
if (sz == 0) {
/* not enough space to write the character */
- if (fnidx MAXNAMLEN) {
+ if (fnidx ISO_MAXNAMLEN) {
*outfn = '?';
fnidx++;
}
Index: src/sys/fs/cd9660/iso.h
diff -u src/sys/fs/cd9660/iso.h:1.9 src/sys/fs/cd9660/iso.h:1.10
--- src/sys/fs/cd9660/iso.h:1.9 Sat Jan 27 02:20:31 2007
+++ src/sys/fs/cd9660/iso.h Mon Sep 26 21:01:44 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: iso.h,v 1.9 2007/01/27 07:20:31 cbiere Exp $ */
+/* $NetBSD: iso.h,v 1.10 2011/09/27 01:01:44 christos Exp $ */
/*-
* Copyright (c) 1994
@@ -62,6 +62,8 @@ struct iso_volume_descriptor {
#define ISO_STANDARD_ID CD001
#define ISO_ECMA_ID CDW01
+#define ISO_MAXNAMLEN 255
+
struct iso_primary_descriptor {
char type [ISODCL ( 1, 1)]; /* 711 */
char id[ISODCL ( 2, 6)];
Index: src/sys/fs/cd9660/cd9660_vfsops.c
diff -u src/sys/fs/cd9660/cd9660_vfsops.c:1.72 src/sys/fs/cd9660/cd9660_vfsops.c:1.73
--- src/sys/fs/cd9660/cd9660_vfsops.c:1.72 Sat Jun 11 23:35:52 2011
+++ src/sys/fs/cd9660/cd9660_vfsops.c Mon Sep 26 21:01:43 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cd9660_vfsops.c,v 1.72 2011/06/12 03:35:52 rmind Exp $ */
+/* $NetBSD: cd9660_vfsops.c,v 1.73 2011/09/27 01:01:43 christos Exp $ */
/*-
* Copyright (c) 1994
@@ -37,7 +37,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cd9660_vfsops.c,v 1.72 2011/06/12 03:35:52 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: cd9660_vfsops.c,v 1.73 2011/09/27 01:01:43 christos Exp $);
#if defined(_KERNEL_OPT)
#include opt_compat_netbsd.h
@@ -444,7 +444,7 @@ iso_mountfs(struct vnode *devvp, struct
mp-mnt_stat.f_fsidx.__fsid_val[0] = (long)dev;
mp-mnt_stat.f_fsidx.__fsid_val[1] = makefstype(MOUNT_CD9660);
mp-mnt_stat.f_fsid = mp-mnt_stat.f_fsidx.__fsid_val[0];
- mp-mnt_stat.f_namemax = MAXNAMLEN;
+ mp-mnt_stat.f_namemax = ISO_MAXNAMLEN;
mp-mnt_flag |= MNT_LOCAL;
mp-mnt_iflag |= IMNT_MPSAFE;
mp-mnt_dev_bshift = iso_bsize;
CVS commit: src/sys
Module Name:src
Committed By: jym
Date: Tue Sep 27 01:02:39 UTC 2011
Modified Files:
src/sys/arch/evbmips/evbmips: interrupt.c
src/sys/arch/mips/mips: mips_softint.c pmap_tlb.c syscall.c
vm_machdep.c
src/sys/arch/mips/ralink: ralink_gpio.c ralink_intr.c
src/sys/arch/mips/rmi: rmixl_fmn.c rmixl_intr.c
src/sys/arch/powerpc/booke: booke_pmap.c e500_intr.c trap.c
src/sys/arch/powerpc/booke/dev: pq3etsec.c
src/sys/arch/powerpc/booke/pci: pq3pci.c
src/sys/arch/powerpc/include: userret.h
src/sys/arch/powerpc/include/oea: pmap.h
src/sys/arch/powerpc/pic: intr.c
src/sys/arch/powerpc/powerpc: process_machdep.c softint_machdep.c
trap.c
src/sys/arch/x86/x86: pmap.c
src/sys/arch/xen/x86: xen_ipi.c
src/sys/common/pmap/tlb: pmap.c pmap_tlb.c
src/sys/dev/ic: siisata.c
src/sys/dev/usb: usb_mem.c
src/sys/kern: kern_mutex_obj.c kern_softint.c kern_synch.c subr_evcnt.c
subr_pcu.c subr_pool.c
src/sys/lib/libkern: libkern.h
src/sys/uvm: uvm_bio.c uvm_map.c uvm_pglist.c
Log Message:
Modify *ASSERTMSG() so they are now used as variadic macros. The main goal
is to provide routines that do as KASSERT(9) says: append a message
to the panic format string when the assertion triggers, with optional
arguments.
Fix call sites to reflect the new definition.
Discussed on tech-kern@. See
http://mail-index.netbsd.org/tech-kern/2011/09/07/msg011427.html
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/evbmips/evbmips/interrupt.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/mips/mips/mips_softint.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/mips/mips/pmap_tlb.c
cvs rdiff -u -r1.45 -r1.46 src/sys/arch/mips/mips/syscall.c
cvs rdiff -u -r1.140 -r1.141 src/sys/arch/mips/mips/vm_machdep.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/mips/ralink/ralink_gpio.c \
src/sys/arch/mips/ralink/ralink_intr.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/mips/rmi/rmixl_fmn.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/mips/rmi/rmixl_intr.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/powerpc/booke/booke_pmap.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/powerpc/booke/e500_intr.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/powerpc/booke/trap.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/powerpc/booke/dev/pq3etsec.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/powerpc/booke/pci/pq3pci.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/powerpc/include/userret.h
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/powerpc/include/oea/pmap.h
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/powerpc/pic/intr.c
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/powerpc/powerpc/process_machdep.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/powerpc/powerpc/softint_machdep.c
cvs rdiff -u -r1.144 -r1.145 src/sys/arch/powerpc/powerpc/trap.c
cvs rdiff -u -r1.131 -r1.132 src/sys/arch/x86/x86/pmap.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/xen/x86/xen_ipi.c
cvs rdiff -u -r1.9 -r1.10 src/sys/common/pmap/tlb/pmap.c
cvs rdiff -u -r1.10 -r1.11 src/sys/common/pmap/tlb/pmap_tlb.c
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/ic/siisata.c
cvs rdiff -u -r1.49 -r1.50 src/sys/dev/usb/usb_mem.c
cvs rdiff -u -r1.4 -r1.5 src/sys/kern/kern_mutex_obj.c
cvs rdiff -u -r1.37 -r1.38 src/sys/kern/kern_softint.c
cvs rdiff -u -r1.290 -r1.291 src/sys/kern/kern_synch.c
cvs rdiff -u -r1.10 -r1.11 src/sys/kern/subr_evcnt.c
cvs rdiff -u -r1.9 -r1.10 src/sys/kern/subr_pcu.c
cvs rdiff -u -r1.189 -r1.190 src/sys/kern/subr_pool.c
cvs rdiff -u -r1.100 -r1.101 src/sys/lib/libkern/libkern.h
cvs rdiff -u -r1.78 -r1.79 src/sys/uvm/uvm_bio.c
cvs rdiff -u -r1.304 -r1.305 src/sys/uvm/uvm_map.c
cvs rdiff -u -r1.61 -r1.62 src/sys/uvm/uvm_pglist.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbmips/evbmips/interrupt.c
diff -u src/sys/arch/evbmips/evbmips/interrupt.c:1.17 src/sys/arch/evbmips/evbmips/interrupt.c:1.18
--- src/sys/arch/evbmips/evbmips/interrupt.c:1.17 Sun Jul 10 00:03:53 2011
+++ src/sys/arch/evbmips/evbmips/interrupt.c Tue Sep 27 01:02:33 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: interrupt.c,v 1.17 2011/07/10 00:03:53 matt Exp $ */
+/* $NetBSD: interrupt.c,v 1.18 2011/09/27 01:02:33 jym Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: interrupt.c,v 1.17 2011/07/10 00:03:53 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: interrupt.c,v 1.18 2011/09/27 01:02:33 jym Exp $);
#include sys/param.h
#include sys/cpu.h
@@ -66,15 +66,14 @@ cpu_intr(int ppl, vaddr_t pc, uint32_t s
splx(ipl); /* lower to interrupt level */
KASSERTMSG(ci-ci_cpl == ipl,
- (%s: cpl (%d) != ipl (%d),
- __func__, ci-ci_cpl, ipl));
+ %s: cpl (%d) != ipl (%d), __func__, ci-ci_cpl, ipl);
KASSERT(pending != 0);
if (pending MIPS_INT_MASK_5) {
struct clockframe cf;
KASSERTMSG(ipl == IPL_SCHED,
-
CVS commit: src/sys/nfs
Module Name:src
Committed By: christos
Date: Tue Sep 27 01:05:09 UTC 2011
Modified Files:
src/sys/nfs: nfs_srvsubs.c nfs_vnops.c
Log Message:
use NFS_MAXPATHLEN instead of MAXPATHLEN
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/nfs/nfs_srvsubs.c
cvs rdiff -u -r1.291 -r1.292 src/sys/nfs/nfs_vnops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/nfs/nfs_srvsubs.c
diff -u src/sys/nfs/nfs_srvsubs.c:1.11 src/sys/nfs/nfs_srvsubs.c:1.12
--- src/sys/nfs/nfs_srvsubs.c:1.11 Mon Aug 8 12:04:07 2011
+++ src/sys/nfs/nfs_srvsubs.c Mon Sep 26 21:05:08 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_srvsubs.c,v 1.11 2011/08/08 16:04:07 dholland Exp $ */
+/* $NetBSD: nfs_srvsubs.c,v 1.12 2011/09/27 01:05:08 christos Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -70,7 +70,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: nfs_srvsubs.c,v 1.11 2011/08/08 16:04:07 dholland Exp $);
+__KERNEL_RCSID(0, $NetBSD: nfs_srvsubs.c,v 1.12 2011/09/27 01:05:08 christos Exp $);
#include sys/param.h
#include sys/proc.h
@@ -129,7 +129,7 @@ nfs_namei(struct nameidata *ndp, nfsrvfh
*retdirp = NULL;
ndp-ni_pathbuf = NULL;
- if ((len + 1) MAXPATHLEN)
+ if ((len + 1) NFS_MAXPATHLEN)
return (ENAMETOOLONG);
if (len == 0)
return (EACCES);
Index: src/sys/nfs/nfs_vnops.c
diff -u src/sys/nfs/nfs_vnops.c:1.291 src/sys/nfs/nfs_vnops.c:1.292
--- src/sys/nfs/nfs_vnops.c:1.291 Sat Jun 11 23:35:59 2011
+++ src/sys/nfs/nfs_vnops.c Mon Sep 26 21:05:08 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_vnops.c,v 1.291 2011/06/12 03:35:59 rmind Exp $ */
+/* $NetBSD: nfs_vnops.c,v 1.292 2011/09/27 01:05:08 christos Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -39,7 +39,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: nfs_vnops.c,v 1.291 2011/06/12 03:35:59 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: nfs_vnops.c,v 1.292 2011/09/27 01:05:08 christos Exp $);
#ifdef _KERNEL_OPT
#include opt_nfs.h
@@ -1131,7 +1131,7 @@ nfs_readlinkrpc(struct vnode *vp, struct
if (v3) {
nfsm_dissect(tl, uint32_t *, NFSX_UNSIGNED);
len = fxdr_unsigned(uint32_t, *tl);
- if (len MAXPATHLEN) {
+ if (len NFS_MAXPATHLEN) {
/*
* this pathname is too long for us.
*/
CVS commit: src/sys/nfs
Module Name:src
Committed By: christos
Date: Tue Sep 27 01:07:38 UTC 2011
Modified Files:
src/sys/nfs: nfs_bio.c nfs_export.c
Log Message:
use NFS_MAXNAMLEN for all names.
To generate a diff of this commit:
cvs rdiff -u -r1.187 -r1.188 src/sys/nfs/nfs_bio.c
cvs rdiff -u -r1.50 -r1.51 src/sys/nfs/nfs_export.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/nfs/nfs_bio.c
diff -u src/sys/nfs/nfs_bio.c:1.187 src/sys/nfs/nfs_bio.c:1.188
--- src/sys/nfs/nfs_bio.c:1.187 Sat Jun 18 22:42:53 2011
+++ src/sys/nfs/nfs_bio.c Mon Sep 26 21:07:38 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_bio.c,v 1.187 2011/06/19 02:42:53 rmind Exp $ */
+/* $NetBSD: nfs_bio.c,v 1.188 2011/09/27 01:07:38 christos Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: nfs_bio.c,v 1.187 2011/06/19 02:42:53 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: nfs_bio.c,v 1.188 2011/09/27 01:07:38 christos Exp $);
#ifdef _KERNEL_OPT
#include opt_nfs.h
@@ -177,7 +177,7 @@ nfs_bioread(struct vnode *vp, struct uio
case VLNK:
nfsstats.biocache_readlinks++;
- bp = nfs_getcacheblk(vp, (daddr_t)0, NFS_MAXPATHLEN, l);
+ bp = nfs_getcacheblk(vp, (daddr_t)0, MAXPATHLEN, l);
if (!bp)
return (EINTR);
if ((bp-b_oflags BO_DONE) == 0) {
@@ -188,7 +188,7 @@ nfs_bioread(struct vnode *vp, struct uio
return (error);
}
}
- n = MIN(uio-uio_resid, NFS_MAXPATHLEN - bp-b_resid);
+ n = MIN(uio-uio_resid, MAXPATHLEN - bp-b_resid);
got_buf = 1;
on = 0;
break;
Index: src/sys/nfs/nfs_export.c
diff -u src/sys/nfs/nfs_export.c:1.50 src/sys/nfs/nfs_export.c:1.51
--- src/sys/nfs/nfs_export.c:1.50 Thu Mar 31 15:40:53 2011
+++ src/sys/nfs/nfs_export.c Mon Sep 26 21:07:38 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_export.c,v 1.50 2011/03/31 19:40:53 dyoung Exp $ */
+/* $NetBSD: nfs_export.c,v 1.51 2011/09/27 01:07:38 christos Exp $ */
/*-
* Copyright (c) 1997, 1998, 2004, 2005, 2008 The NetBSD Foundation, Inc.
@@ -77,7 +77,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: nfs_export.c,v 1.50 2011/03/31 19:40:53 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: nfs_export.c,v 1.51 2011/09/27 01:07:38 christos Exp $);
#include sys/param.h
#include sys/systm.h
@@ -783,9 +783,9 @@ setpublicfs(struct mount *mp, struct net
* If an indexfile was specified, pull it in.
*/
if (argp-ex_indexfile != NULL) {
- nfs_pub.np_index = malloc(MAXNAMLEN + 1, M_TEMP, M_WAITOK);
+ nfs_pub.np_index = malloc(NFS_MAXNAMLEN + 1, M_TEMP, M_WAITOK);
error = copyinstr(argp-ex_indexfile, nfs_pub.np_index,
- MAXNAMLEN, (size_t *)0);
+ NFS_MAXNAMLEN, (size_t *)0);
if (!error) {
/*
* Check for illegal filenames.
CVS commit: src/sys/stand
Module Name:src
Committed By: christos
Date: Tue Sep 27 01:08:55 UTC 2011
Modified Files:
src/sys/stand: ls.c
Log Message:
use NAME_MAX instead of MAXNAMLEN
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/stand/ls.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/stand/ls.c
diff -u src/sys/stand/ls.c:1.16 src/sys/stand/ls.c:1.17
--- src/sys/stand/ls.c:1.16 Wed Mar 18 06:22:45 2009
+++ src/sys/stand/ls.c Mon Sep 26 21:08:55 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ls.c,v 1.16 2009/03/18 10:22:45 cegger Exp $ */
+/* $NetBSD: ls.c,v 1.17 2011/09/27 01:08:55 christos Exp $ */
/*-
* Copyright (c) 1993
@@ -39,7 +39,7 @@ __COPYRIGHT(@(#) Copyright (c) 1993\n\
#if 0
static char sccsid[] = @(#)ls.c 8.1 (Berkeley) 6/11/93;
#else
-__RCSID($NetBSD: ls.c,v 1.16 2009/03/18 10:22:45 cegger Exp $);
+__RCSID($NetBSD: ls.c,v 1.17 2011/09/27 01:08:55 christos Exp $);
#endif
#endif /* not lint */
@@ -96,7 +96,7 @@ ls(register int fd)
dp += ((DP *)dp)-d_reclen) {
if (((DP *)dp)-d_fileno == 0)
continue;
- if (((DP *)dp)-d_namlen MAXNAMLEN+1) {
+ if (((DP *)dp)-d_namlen NAME_MAX + 1) {
printf(Corrupt file name length! Run fsck soon!\n);
return;
}
CVS commit: src/sys/fs/tmpfs
Module Name:src
Committed By: christos
Date: Tue Sep 27 01:10:44 UTC 2011
Modified Files:
src/sys/fs/tmpfs: tmpfs.h tmpfs_vfsops.c tmpfs_vnops.c
Log Message:
define and use TMPFS_MAXNAMLEN instead of MAXNAMLEN
To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/sys/fs/tmpfs/tmpfs.h
cvs rdiff -u -r1.51 -r1.52 src/sys/fs/tmpfs/tmpfs_vfsops.c
cvs rdiff -u -r1.90 -r1.91 src/sys/fs/tmpfs/tmpfs_vnops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/fs/tmpfs/tmpfs.h
diff -u src/sys/fs/tmpfs/tmpfs.h:1.44 src/sys/fs/tmpfs/tmpfs.h:1.45
--- src/sys/fs/tmpfs/tmpfs.h:1.44 Sun May 29 18:29:06 2011
+++ src/sys/fs/tmpfs/tmpfs.h Mon Sep 26 21:10:43 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tmpfs.h,v 1.44 2011/05/29 22:29:06 rmind Exp $ */
+/* $NetBSD: tmpfs.h,v 1.45 2011/09/27 01:10:43 christos Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 The NetBSD Foundation, Inc.
@@ -63,8 +63,9 @@ TAILQ_HEAD(tmpfs_dir, tmpfs_dirent);
#if defined(_KERNEL)
+#define TMPFS_MAXNAMLEN 255
/* Validate maximum td_namelen length. */
-CTASSERT(MAXNAMLEN UINT16_MAX);
+CTASSERT(TMPFS_MAXNAMLEN UINT16_MAX);
#define TMPFS_DIRCOOKIE_DOT 0
#define TMPFS_DIRCOOKIE_DOTDOT 1
Index: src/sys/fs/tmpfs/tmpfs_vfsops.c
diff -u src/sys/fs/tmpfs/tmpfs_vfsops.c:1.51 src/sys/fs/tmpfs/tmpfs_vfsops.c:1.52
--- src/sys/fs/tmpfs/tmpfs_vfsops.c:1.51 Sun May 29 18:29:07 2011
+++ src/sys/fs/tmpfs/tmpfs_vfsops.c Mon Sep 26 21:10:43 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tmpfs_vfsops.c,v 1.51 2011/05/29 22:29:07 rmind Exp $ */
+/* $NetBSD: tmpfs_vfsops.c,v 1.52 2011/09/27 01:10:43 christos Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: tmpfs_vfsops.c,v 1.51 2011/05/29 22:29:07 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: tmpfs_vfsops.c,v 1.52 2011/09/27 01:10:43 christos Exp $);
#include sys/param.h
#include sys/types.h
@@ -181,7 +181,7 @@ tmpfs_mount(struct mount *mp, const char
mp-mnt_data = tmp;
mp-mnt_flag |= MNT_LOCAL;
- mp-mnt_stat.f_namemax = MAXNAMLEN;
+ mp-mnt_stat.f_namemax = TMPFS_MAXNAMLEN;
mp-mnt_fs_bshift = PAGE_SHIFT;
mp-mnt_dev_bshift = DEV_BSHIFT;
mp-mnt_iflag |= IMNT_MPSAFE;
Index: src/sys/fs/tmpfs/tmpfs_vnops.c
diff -u src/sys/fs/tmpfs/tmpfs_vnops.c:1.90 src/sys/fs/tmpfs/tmpfs_vnops.c:1.91
--- src/sys/fs/tmpfs/tmpfs_vnops.c:1.90 Sat Aug 27 11:32:28 2011
+++ src/sys/fs/tmpfs/tmpfs_vnops.c Mon Sep 26 21:10:43 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tmpfs_vnops.c,v 1.90 2011/08/27 15:32:28 hannken Exp $ */
+/* $NetBSD: tmpfs_vnops.c,v 1.91 2011/09/27 01:10:43 christos Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: tmpfs_vnops.c,v 1.90 2011/08/27 15:32:28 hannken Exp $);
+__KERNEL_RCSID(0, $NetBSD: tmpfs_vnops.c,v 1.91 2011/09/27 01:10:43 christos Exp $);
#include sys/param.h
#include sys/dirent.h
@@ -1119,7 +1119,7 @@ tmpfs_sane_rename(struct vnode *fdvp, st
* we can't sleep, hence the early allocation above.
*/
if (newname != NULL) {
- KASSERT(tcnp-cn_namelen = MAXNAMLEN);
+ KASSERT(tcnp-cn_namelen = TMPFS_MAXNAMLEN);
tmpfs_strname_free(tmpfs, fde-td_name, fde-td_namelen);
fde-td_namelen = (uint16_t)tcnp-cn_namelen;
CVS commit: src/sys/fs/udf
Module Name:src
Committed By: christos
Date: Tue Sep 27 01:13:16 UTC 2011
Modified Files:
src/sys/fs/udf: udf.h udf_subr.c udf_vfsops.c
Log Message:
- rename UDF_MAX_NAMELEN - UDF_MAXNAMLEN
- use NAME_MAX instead of MAXNAMLEN
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/sys/fs/udf/udf.h
cvs rdiff -u -r1.116 -r1.117 src/sys/fs/udf/udf_subr.c
cvs rdiff -u -r1.60 -r1.61 src/sys/fs/udf/udf_vfsops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/fs/udf/udf.h
diff -u src/sys/fs/udf/udf.h:1.43 src/sys/fs/udf/udf.h:1.44
--- src/sys/fs/udf/udf.h:1.43 Fri Sep 24 21:42:40 2010
+++ src/sys/fs/udf/udf.h Mon Sep 26 21:13:16 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: udf.h,v 1.43 2010/09/25 01:42:40 matt Exp $ */
+/* $NetBSD: udf.h,v 1.44 2011/09/27 01:13:16 christos Exp $ */
/*
* Copyright (c) 2006, 2008 Reinoud Zandijk
@@ -139,7 +139,7 @@ extern int udf_verbose;
/* constants */
-#define UDF_MAX_NAMELEN 255 /* as per SPEC */
+#define UDF_MAXNAMLEN 255 /* as per SPEC */
#define UDF_TRANS_ZERO ((uint64_t) -1)
#define UDF_TRANS_UNMAPPED ((uint64_t) -2)
#define UDF_TRANS_INTERN ((uint64_t) -3)
Index: src/sys/fs/udf/udf_subr.c
diff -u src/sys/fs/udf/udf_subr.c:1.116 src/sys/fs/udf/udf_subr.c:1.117
--- src/sys/fs/udf/udf_subr.c:1.116 Tue Aug 16 10:29:16 2011
+++ src/sys/fs/udf/udf_subr.c Mon Sep 26 21:13:16 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: udf_subr.c,v 1.116 2011/08/16 14:29:16 mbalmer Exp $ */
+/* $NetBSD: udf_subr.c,v 1.117 2011/09/27 01:13:16 christos Exp $ */
/*
* Copyright (c) 2006, 2008 Reinoud Zandijk
@@ -29,7 +29,7 @@
#include sys/cdefs.h
#ifndef lint
-__KERNEL_RCSID(0, $NetBSD: udf_subr.c,v 1.116 2011/08/16 14:29:16 mbalmer Exp $);
+__KERNEL_RCSID(0, $NetBSD: udf_subr.c,v 1.117 2011/09/27 01:13:16 christos Exp $);
#endif /* not lint */
@@ -4178,7 +4178,7 @@ udf_to_unix_name(char *result, int resul
} else {
/* assume 8bit char length byte latin-1 */
assert(*id == 8);
- assert(strlen((char *) (id+1)) = MAXNAMLEN);
+ assert(strlen((char *) (id+1)) = NAME_MAX);
strncpy((char *) result, (char *) (id+1), strlen((char *) (id+1)));
}
free(raw_name, M_UDFTEMP);
@@ -5259,7 +5259,7 @@ udf_dir_attach(struct udf_mount *ump, st
/* append to the dirhash */
/* NOTE do not use dirent anymore or it won't match later! */
- udf_to_unix_name(dirent.d_name, MAXNAMLEN,
+ udf_to_unix_name(dirent.d_name, NAME_MAX,
(char *) fid-data + udf_rw16(fid-l_iu), fid-l_fi, osta_charspec);
dirent.d_namlen = strlen(dirent.d_name);
dirhash_enter(dirh, dirent, chosen_fid_pos,
@@ -6359,7 +6359,7 @@ brokendir:
/* create resulting dirent structure */
fid_name = (char *) fid-data + udf_rw16(fid-l_iu);
- udf_to_unix_name(dirent-d_name, MAXNAMLEN,
+ udf_to_unix_name(dirent-d_name, NAME_MAX,
fid_name, fid-l_fi, ump-logical_vol-desc_charset);
/* '..' has no name, so provide one */
Index: src/sys/fs/udf/udf_vfsops.c
diff -u src/sys/fs/udf/udf_vfsops.c:1.60 src/sys/fs/udf/udf_vfsops.c:1.61
--- src/sys/fs/udf/udf_vfsops.c:1.60 Thu Jun 24 09:03:11 2010
+++ src/sys/fs/udf/udf_vfsops.c Mon Sep 26 21:13:16 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: udf_vfsops.c,v 1.60 2010/06/24 13:03:11 hannken Exp $ */
+/* $NetBSD: udf_vfsops.c,v 1.61 2011/09/27 01:13:16 christos Exp $ */
/*
* Copyright (c) 2006, 2008 Reinoud Zandijk
@@ -28,7 +28,7 @@
#include sys/cdefs.h
#ifndef lint
-__KERNEL_RCSID(0, $NetBSD: udf_vfsops.c,v 1.60 2010/06/24 13:03:11 hannken Exp $);
+__KERNEL_RCSID(0, $NetBSD: udf_vfsops.c,v 1.61 2011/09/27 01:13:16 christos Exp $);
#endif /* not lint */
@@ -576,7 +576,7 @@ udf_mountfs(struct vnode *devvp, struct
mp-mnt_stat.f_fsidx.__fsid_val[0] = (uint32_t) devvp-v_rdev;
mp-mnt_stat.f_fsidx.__fsid_val[1] = makefstype(MOUNT_UDF);
mp-mnt_stat.f_fsid = mp-mnt_stat.f_fsidx.__fsid_val[0];
- mp-mnt_stat.f_namemax = UDF_MAX_NAMELEN;
+ mp-mnt_stat.f_namemax = UDF_MAXNAMLEN;
mp-mnt_flag |= MNT_LOCAL;
// mp-mnt_iflag |= IMNT_MPSAFE;
CVS commit: src/sys/fs/hfs
Module Name:src
Committed By: christos
Date: Tue Sep 27 01:14:47 UTC 2011
Modified Files:
src/sys/fs/hfs: hfs_vnops.c
Log Message:
use NAME_MAX instead of MAXNAMLEN
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/fs/hfs/hfs_vnops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/fs/hfs/hfs_vnops.c
diff -u src/sys/fs/hfs/hfs_vnops.c:1.23 src/sys/fs/hfs/hfs_vnops.c:1.24
--- src/sys/fs/hfs/hfs_vnops.c:1.23 Wed May 18 23:11:56 2011
+++ src/sys/fs/hfs/hfs_vnops.c Mon Sep 26 21:14:47 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: hfs_vnops.c,v 1.23 2011/05/19 03:11:56 rmind Exp $ */
+/* $NetBSD: hfs_vnops.c,v 1.24 2011/09/27 01:14:47 christos Exp $ */
/*-
* Copyright (c) 2005, 2007 The NetBSD Foundation, Inc.
@@ -101,7 +101,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: hfs_vnops.c,v 1.23 2011/05/19 03:11:56 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: hfs_vnops.c,v 1.24 2011/09/27 01:14:47 christos Exp $);
#ifdef _KERNEL_OPT
#include opt_ipsec.h
@@ -923,11 +923,11 @@ struct vop_readdir_args /* {
DPRINTF((numchildren = %u\n, numchildren));
for (curchild = 0; curchild numchildren uio-uio_resid 0;
curchild++) {
- namlen = utf16_to_utf8(curent.d_name, MAXNAMLEN,
+ namlen = utf16_to_utf8(curent.d_name, NAME_MAX,
childnames[curchild].unicode, childnames[curchild].length,
0, NULL);
/* XXX: check conversion errors? */
- if (namlen MAXNAMLEN) {
+ if (namlen NAME_MAX) {
/* XXX: how to handle name too long? */
continue;
}
CVS commit: src/sys/netsmb
Module Name:src
Committed By: christos
Date: Tue Sep 27 01:16:35 UTC 2011
Modified Files:
src/sys/netsmb: smb.h
Log Message:
remove unused constant
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/netsmb/smb.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netsmb/smb.h
diff -u src/sys/netsmb/smb.h:1.17 src/sys/netsmb/smb.h:1.18
--- src/sys/netsmb/smb.h:1.17 Sun Dec 11 01:25:32 2005
+++ src/sys/netsmb/smb.h Mon Sep 26 21:16:35 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: smb.h,v 1.17 2005/12/11 06:25:32 christos Exp $ */
+/* $NetBSD: smb.h,v 1.18 2011/09/27 01:16:35 christos Exp $ */
/*
* Copyright (c) 2000-2001 Boris Popov
@@ -394,7 +394,6 @@ enum smb_dialects {
#define SMB_MAXSHARENAMELEN 128
#define SMB_MAXPKTLEN 0x1
#define SMB_MAXCHALLENGELEN 8
-#define SMB_MAXFNAMELEN 255 /* Keep in sync with MAXNAMLEN */
#define SMB_MAXRCN 3 /* number of reconnect attempts */
CVS commit: src/sys/miscfs/fdesc
Module Name:src
Committed By: christos
Date: Tue Sep 27 01:22:12 UTC 2011
Modified Files:
src/sys/miscfs/fdesc: fdesc.h fdesc_vfsops.c
Log Message:
define FDESC_MAXNAMLEN and use it.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/miscfs/fdesc/fdesc.h
cvs rdiff -u -r1.85 -r1.86 src/sys/miscfs/fdesc/fdesc_vfsops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/miscfs/fdesc/fdesc.h
diff -u src/sys/miscfs/fdesc/fdesc.h:1.20 src/sys/miscfs/fdesc/fdesc.h:1.21
--- src/sys/miscfs/fdesc/fdesc.h:1.20 Fri Jul 31 15:47:47 2009
+++ src/sys/miscfs/fdesc/fdesc.h Mon Sep 26 21:22:12 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: fdesc.h,v 1.20 2009/07/31 19:47:47 pooka Exp $ */
+/* $NetBSD: fdesc.h,v 1.21 2011/09/27 01:22:12 christos Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -66,6 +66,8 @@ struct fdescnode {
#define VTOFDESC(vp) ((struct fdescnode *)(vp)-v_data)
+#define FDESC_MAXNAMLEN 255
+
extern dev_t devctty;
extern void fdesc_init(void);
extern void fdesc_done(void);
Index: src/sys/miscfs/fdesc/fdesc_vfsops.c
diff -u src/sys/miscfs/fdesc/fdesc_vfsops.c:1.85 src/sys/miscfs/fdesc/fdesc_vfsops.c:1.86
--- src/sys/miscfs/fdesc/fdesc_vfsops.c:1.85 Thu Jun 24 09:03:12 2010
+++ src/sys/miscfs/fdesc/fdesc_vfsops.c Mon Sep 26 21:22:12 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: fdesc_vfsops.c,v 1.85 2010/06/24 13:03:12 hannken Exp $ */
+/* $NetBSD: fdesc_vfsops.c,v 1.86 2011/09/27 01:22:12 christos Exp $ */
/*
* Copyright (c) 1992, 1993, 1995
@@ -41,7 +41,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: fdesc_vfsops.c,v 1.85 2010/06/24 13:03:12 hannken Exp $);
+__KERNEL_RCSID(0, $NetBSD: fdesc_vfsops.c,v 1.86 2011/09/27 01:22:12 christos Exp $);
#if defined(_KERNEL_OPT)
#include opt_compat_netbsd.h
@@ -97,7 +97,7 @@ fdesc_mount(struct mount *mp, const char
rvp-v_type = VDIR;
rvp-v_vflag |= VV_ROOT;
- mp-mnt_stat.f_namemax = MAXNAMLEN;
+ mp-mnt_stat.f_namemax = FDESC_MAXNAMLEN;
mp-mnt_flag |= MNT_LOCAL;
mp-mnt_data = rvp;
vfs_getnewfsid(mp);
CVS commit: src/sys/miscfs/kernfs
Module Name:src
Committed By: christos
Date: Tue Sep 27 01:23:05 UTC 2011
Modified Files:
src/sys/miscfs/kernfs: kernfs.h kernfs_vfsops.c
Log Message:
define KERNFS_MAXNAMLEN and use it.`
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/sys/miscfs/kernfs/kernfs.h
cvs rdiff -u -r1.90 -r1.91 src/sys/miscfs/kernfs/kernfs_vfsops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/miscfs/kernfs/kernfs.h
diff -u src/sys/miscfs/kernfs/kernfs.h:1.35 src/sys/miscfs/kernfs/kernfs.h:1.36
--- src/sys/miscfs/kernfs/kernfs.h:1.35 Sat Jan 10 21:45:53 2009
+++ src/sys/miscfs/kernfs/kernfs.h Mon Sep 26 21:23:05 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: kernfs.h,v 1.35 2009/01/11 02:45:53 christos Exp $ */
+/* $NetBSD: kernfs.h,v 1.36 2011/09/27 01:23:05 christos Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -119,6 +119,8 @@ struct kernfs_mount {
#define VTOKERN(vp) ((struct kernfs_node *)(vp)-v_data)
#define KERNFSTOV(kfs) ((kfs)-kfs_vnode)
+#define KERNFS_MAXNAMLEN 255
+
extern const struct kern_target kern_targets[];
extern int nkern_targets;
extern const int static_nkern_targets;
Index: src/sys/miscfs/kernfs/kernfs_vfsops.c
diff -u src/sys/miscfs/kernfs/kernfs_vfsops.c:1.90 src/sys/miscfs/kernfs/kernfs_vfsops.c:1.91
--- src/sys/miscfs/kernfs/kernfs_vfsops.c:1.90 Mon Nov 30 05:59:20 2009
+++ src/sys/miscfs/kernfs/kernfs_vfsops.c Mon Sep 26 21:23:05 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: kernfs_vfsops.c,v 1.90 2009/11/30 10:59:20 pooka Exp $ */
+/* $NetBSD: kernfs_vfsops.c,v 1.91 2011/09/27 01:23:05 christos Exp $ */
/*
* Copyright (c) 1992, 1993, 1995
@@ -39,7 +39,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kernfs_vfsops.c,v 1.90 2009/11/30 10:59:20 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: kernfs_vfsops.c,v 1.91 2011/09/27 01:23:05 christos Exp $);
#ifdef _KERNEL_OPT
#include opt_compat_netbsd.h
@@ -145,7 +145,7 @@ kernfs_mount(struct mount *mp, const cha
fmp = malloc(sizeof(struct kernfs_mount), M_KERNFSMNT, M_WAITOK|M_ZERO);
TAILQ_INIT(fmp-nodelist);
- mp-mnt_stat.f_namemax = MAXNAMLEN;
+ mp-mnt_stat.f_namemax = KERNFS_MAXNAMLEN;
mp-mnt_flag |= MNT_LOCAL;
mp-mnt_data = fmp;
vfs_getnewfsid(mp);
CVS commit: src/sys/miscfs/procfs
Module Name:src
Committed By: christos
Date: Tue Sep 27 01:23:59 UTC 2011
Modified Files:
src/sys/miscfs/procfs: procfs.h procfs_vfsops.c
Log Message:
define PROCFS_MAXNAMLEN and use it.
To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 src/sys/miscfs/procfs/procfs.h
cvs rdiff -u -r1.85 -r1.86 src/sys/miscfs/procfs/procfs_vfsops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/miscfs/procfs/procfs.h
diff -u src/sys/miscfs/procfs/procfs.h:1.66 src/sys/miscfs/procfs/procfs.h:1.67
--- src/sys/miscfs/procfs/procfs.h:1.66 Sun Sep 4 13:32:10 2011
+++ src/sys/miscfs/procfs/procfs.h Mon Sep 26 21:23:59 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: procfs.h,v 1.66 2011/09/04 17:32:10 jmcneill Exp $ */
+/* $NetBSD: procfs.h,v 1.67 2011/09/27 01:23:59 christos Exp $ */
/*
* Copyright (c) 1993
@@ -130,6 +130,7 @@ struct pfsnode {
#define PROCFS_NOTELEN 64 /* max length of a note (/proc/$pid/note) */
#define PROCFS_CTLLEN 8 /* max length of a ctl msg (/proc/$pid/ctl */
+#define PROCFS_MAXNAMLEN 255
#endif /* _KERNEL */
Index: src/sys/miscfs/procfs/procfs_vfsops.c
diff -u src/sys/miscfs/procfs/procfs_vfsops.c:1.85 src/sys/miscfs/procfs/procfs_vfsops.c:1.86
--- src/sys/miscfs/procfs/procfs_vfsops.c:1.85 Mon Nov 30 05:59:20 2009
+++ src/sys/miscfs/procfs/procfs_vfsops.c Mon Sep 26 21:23:59 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: procfs_vfsops.c,v 1.85 2009/11/30 10:59:20 pooka Exp $ */
+/* $NetBSD: procfs_vfsops.c,v 1.86 2011/09/27 01:23:59 christos Exp $ */
/*
* Copyright (c) 1993
@@ -76,7 +76,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: procfs_vfsops.c,v 1.85 2009/11/30 10:59:20 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: procfs_vfsops.c,v 1.86 2011/09/27 01:23:59 christos Exp $);
#if defined(_KERNEL_OPT)
#include opt_compat_netbsd.h
@@ -157,7 +157,7 @@ procfs_mount(
pmnt = (struct procfsmount *) malloc(sizeof(struct procfsmount),
M_UFSMNT, M_WAITOK); /* XXX need new malloc type */
- mp-mnt_stat.f_namemax = MAXNAMLEN;
+ mp-mnt_stat.f_namemax = PROCFS_MAXNAMLEN;
mp-mnt_flag |= MNT_LOCAL;
mp-mnt_data = pmnt;
vfs_getnewfsid(mp);
CVS commit: src/sys/rump/librump/rumpvfs
Module Name:src
Committed By: christos
Date: Tue Sep 27 01:25:33 UTC 2011
Modified Files:
src/sys/rump/librump/rumpvfs: rump_vfs_private.h rumpfs.c
Log Message:
define RUMPFS_MAXNAMLEN and use it.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/rump/librump/rumpvfs/rump_vfs_private.h
cvs rdiff -u -r1.99 -r1.100 src/sys/rump/librump/rumpvfs/rumpfs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/librump/rumpvfs/rump_vfs_private.h
diff -u src/sys/rump/librump/rumpvfs/rump_vfs_private.h:1.14 src/sys/rump/librump/rumpvfs/rump_vfs_private.h:1.15
--- src/sys/rump/librump/rumpvfs/rump_vfs_private.h:1.14 Tue Sep 7 17:11:10 2010
+++ src/sys/rump/librump/rumpvfs/rump_vfs_private.h Mon Sep 26 21:25:32 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rump_vfs_private.h,v 1.14 2010/09/07 21:11:10 pooka Exp $ */
+/* $NetBSD: rump_vfs_private.h,v 1.15 2011/09/27 01:25:32 christos Exp $ */
/*
* Copyright (c) 2008 Antti Kantee. All Rights Reserved.
@@ -57,6 +57,8 @@ void rump_vfs_drainbufs(int);
#include sys/vnode.h
#include rump/rump.h
+#define RUMPFS_MAXNAMLEN 255
+
#include rumpvfs_if_priv.h
#endif /* _SYS_RUMP_VFS_PRIVATE_H_ */
Index: src/sys/rump/librump/rumpvfs/rumpfs.c
diff -u src/sys/rump/librump/rumpvfs/rumpfs.c:1.99 src/sys/rump/librump/rumpvfs/rumpfs.c:1.100
--- src/sys/rump/librump/rumpvfs/rumpfs.c:1.99 Tue Aug 23 03:40:32 2011
+++ src/sys/rump/librump/rumpvfs/rumpfs.c Mon Sep 26 21:25:32 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpfs.c,v 1.99 2011/08/23 07:40:32 hannken Exp $ */
+/* $NetBSD: rumpfs.c,v 1.100 2011/09/27 01:25:32 christos Exp $ */
/*
* Copyright (c) 2009, 2010, 2011 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rumpfs.c,v 1.99 2011/08/23 07:40:32 hannken Exp $);
+__KERNEL_RCSID(0, $NetBSD: rumpfs.c,v 1.100 2011/09/27 01:25:32 christos Exp $);
#include sys/param.h
#include sys/atomic.h
@@ -229,7 +229,7 @@ static struct rumpfs_node *makeprivate(e
*/
struct etfs {
- char et_key[MAXPATHLEN];
+ char et_key[RUMPFS_MAXPATHLEN];
size_t et_keylen;
bool et_prefixkey;
bool et_removing;
@@ -1076,7 +1076,7 @@ rump_vop_symlink(void *v)
int rv;
linklen = strlen(target);
- KASSERT(linklen MAXPATHLEN);
+ KASSERT(linklen RUMPFS_MAXPATHLEN);
rn = makeprivate(VLNK, NODEV, linklen, false);
if ((cnp-cn_flags ISWHITEOUT) != 0)
rn-rn_va.va_flags |= UF_OPAQUE;
@@ -1086,7 +1086,7 @@ rump_vop_symlink(void *v)
makedir(rnd, cnp, rn);
- KASSERT(linklen MAXPATHLEN);
+ KASSERT(linklen RUMPFS_MAXPATHLEN);
rn-rn_linktarg = PNBUF_GET();
rn-rn_linklen = linklen;
strcpy(rn-rn_linktarg, target);
@@ -1500,7 +1500,7 @@ rump_vop_pathconf(void *v)
*retval = 43; /* this one goes to 11 */
return 0;
case _PC_SYMLINK_MAX:
- *retval = MAXPATHLEN;
+ *retval = RUMPFS_MAXPATHLEN;
return 0;
case _PC_2_SYMLINKS:
*retval = 1;
CVS commit: src/sys/fs/cd9660
Module Name:src Committed By: christos Date: Tue Sep 27 01:27:44 UTC 2011 Modified Files: src/sys/fs/cd9660: cd9660_lookup.c cd9660_rrip.c cd9660_vnops.c Log Message: use ISO_MAXNAMLEN instead of NAME_MAX To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/fs/cd9660/cd9660_lookup.c cvs rdiff -u -r1.16 -r1.17 src/sys/fs/cd9660/cd9660_rrip.c cvs rdiff -u -r1.39 -r1.40 src/sys/fs/cd9660/cd9660_vnops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/fs/cd9660/cd9660_lookup.c diff -u src/sys/fs/cd9660/cd9660_lookup.c:1.18 src/sys/fs/cd9660/cd9660_lookup.c:1.19 --- src/sys/fs/cd9660/cd9660_lookup.c:1.18 Thu Jun 24 09:03:09 2010 +++ src/sys/fs/cd9660/cd9660_lookup.c Mon Sep 26 21:27:44 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: cd9660_lookup.c,v 1.18 2010/06/24 13:03:09 hannken Exp $ */ +/* $NetBSD: cd9660_lookup.c,v 1.19 2011/09/27 01:27:44 christos Exp $ */ /*- * Copyright (c) 1989, 1993, 1994 @@ -39,7 +39,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: cd9660_lookup.c,v 1.18 2010/06/24 13:03:09 hannken Exp $); +__KERNEL_RCSID(0, $NetBSD: cd9660_lookup.c,v 1.19 2011/09/27 01:27:44 christos Exp $); #include sys/param.h #include sys/namei.h @@ -116,7 +116,7 @@ cd9660_lookup(void *v) ino_t ino = 0; int reclen; u_short namelen; - char altname[NAME_MAX]; + char altname[ISO_MAXNAMLEN]; int res; int assoc, len; const char *name; Index: src/sys/fs/cd9660/cd9660_rrip.c diff -u src/sys/fs/cd9660/cd9660_rrip.c:1.16 src/sys/fs/cd9660/cd9660_rrip.c:1.17 --- src/sys/fs/cd9660/cd9660_rrip.c:1.16 Fri May 16 05:21:59 2008 +++ src/sys/fs/cd9660/cd9660_rrip.c Mon Sep 26 21:27:44 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: cd9660_rrip.c,v 1.16 2008/05/16 09:21:59 hannken Exp $ */ +/* $NetBSD: cd9660_rrip.c,v 1.17 2011/09/27 01:27:44 christos Exp $ */ /*- * Copyright (c) 1993, 1994 @@ -37,7 +37,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: cd9660_rrip.c,v 1.16 2008/05/16 09:21:59 hannken Exp $); +__KERNEL_RCSID(0, $NetBSD: cd9660_rrip.c,v 1.17 2011/09/27 01:27:44 christos Exp $); #include sys/param.h #include sys/systm.h @@ -620,7 +620,7 @@ cd9660_rrip_getname(struct iso_directory analyze.outbuf = outbuf; analyze.outlen = outlen; - analyze.maxlen = NAME_MAX; + analyze.maxlen = ISO_MAXNAMLEN; analyze.inump = inump; analyze.imp = imp; analyze.fields = ISO_SUSP_ALTNAME | ISO_SUSP_RELDIR | ISO_SUSP_CLINK | ISO_SUSP_PLINK; Index: src/sys/fs/cd9660/cd9660_vnops.c diff -u src/sys/fs/cd9660/cd9660_vnops.c:1.39 src/sys/fs/cd9660/cd9660_vnops.c:1.40 --- src/sys/fs/cd9660/cd9660_vnops.c:1.39 Mon Mar 29 09:11:32 2010 +++ src/sys/fs/cd9660/cd9660_vnops.c Mon Sep 26 21:27:44 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: cd9660_vnops.c,v 1.39 2010/03/29 13:11:32 pooka Exp $ */ +/* $NetBSD: cd9660_vnops.c,v 1.40 2011/09/27 01:27:44 christos Exp $ */ /*- * Copyright (c) 1994 @@ -37,7 +37,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: cd9660_vnops.c,v 1.39 2010/03/29 13:11:32 pooka Exp $); +__KERNEL_RCSID(0, $NetBSD: cd9660_vnops.c,v 1.40 2011/09/27 01:27:44 christos Exp $); #include sys/param.h #include sys/systm.h @@ -757,7 +757,7 @@ cd9660_pathconf(void *v) return (0); case _PC_NAME_MAX: if (VTOI(ap-a_vp)-i_mnt-iso_ftype == ISO_FTYPE_RRIP) - *ap-a_retval = NAME_MAX; + *ap-a_retval = ISO_MAXNAMLEN; else *ap-a_retval = 37; return (0);
CVS commit: src/sys/ufs/ufs
Module Name:src Committed By: christos Date: Tue Sep 27 01:30:54 UTC 2011 Modified Files: src/sys/ufs/ufs: ufs_vnops.c Log Message: use FFS_MAXNAMLEN instead of NAME_MAX, making sure that it matches with EXT2FS_MAXNAMLEN and LFS_MAXNAMLEN. To generate a diff of this commit: cvs rdiff -u -r1.202 -r1.203 src/sys/ufs/ufs/ufs_vnops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/ufs/ufs/ufs_vnops.c diff -u src/sys/ufs/ufs/ufs_vnops.c:1.202 src/sys/ufs/ufs/ufs_vnops.c:1.203 --- src/sys/ufs/ufs/ufs_vnops.c:1.202 Wed Aug 3 06:03:51 2011 +++ src/sys/ufs/ufs/ufs_vnops.c Mon Sep 26 21:30:54 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ufs_vnops.c,v 1.202 2011/08/03 10:03:51 hannken Exp $ */ +/* $NetBSD: ufs_vnops.c,v 1.203 2011/09/27 01:30:54 christos Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -66,7 +66,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ufs_vnops.c,v 1.202 2011/08/03 10:03:51 hannken Exp $); +__KERNEL_RCSID(0, $NetBSD: ufs_vnops.c,v 1.203 2011/09/27 01:30:54 christos Exp $); #if defined(_KERNEL_OPT) #include opt_ffs.h @@ -108,6 +108,8 @@ __KERNEL_RCSID(0, $NetBSD: ufs_vnops.c, #include ufs/ffs/ffs_extern.h #include ufs/lfs/lfs_extern.h +CTASSERT(EXT2FS_MAXNAMLEN == FFS_MAXNAMLEN); +CTASSERT(LFS_MAXNAMLEN == FFS_MAXNAMLEN); #include uvm/uvm.h static int ufs_chmod(struct vnode *, int, kauth_cred_t, struct lwp *); @@ -2706,7 +2708,7 @@ ufs_pathconf(void *v) *ap-a_retval = LINK_MAX; return (0); case _PC_NAME_MAX: - *ap-a_retval = NAME_MAX; + *ap-a_retval = FFS_MAXNAMLEN; return (0); case _PC_PATH_MAX: *ap-a_retval = PATH_MAX;
CVS commit: src/sys/fs/tmpfs
Module Name:src Committed By: christos Date: Tue Sep 27 01:32:21 UTC 2011 Modified Files: src/sys/fs/tmpfs: tmpfs_vnops.c Log Message: return TMPFS_MAXNAMLEN instead of NAME_MAX To generate a diff of this commit: cvs rdiff -u -r1.91 -r1.92 src/sys/fs/tmpfs/tmpfs_vnops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/fs/tmpfs/tmpfs_vnops.c diff -u src/sys/fs/tmpfs/tmpfs_vnops.c:1.91 src/sys/fs/tmpfs/tmpfs_vnops.c:1.92 --- src/sys/fs/tmpfs/tmpfs_vnops.c:1.91 Mon Sep 26 21:10:43 2011 +++ src/sys/fs/tmpfs/tmpfs_vnops.c Mon Sep 26 21:32:21 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: tmpfs_vnops.c,v 1.91 2011/09/27 01:10:43 christos Exp $ */ +/* $NetBSD: tmpfs_vnops.c,v 1.92 2011/09/27 01:32:21 christos Exp $ */ /* * Copyright (c) 2005, 2006, 2007 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: tmpfs_vnops.c,v 1.91 2011/09/27 01:10:43 christos Exp $); +__KERNEL_RCSID(0, $NetBSD: tmpfs_vnops.c,v 1.92 2011/09/27 01:32:21 christos Exp $); #include sys/param.h #include sys/dirent.h @@ -2373,7 +2373,7 @@ tmpfs_pathconf(void *v) *retval = LINK_MAX; break; case _PC_NAME_MAX: - *retval = NAME_MAX; + *retval = TMPFS_MAXNAMLEN; break; case _PC_PATH_MAX: *retval = PATH_MAX;
CVS commit: src/sys/fs/udf
Module Name:src Committed By: christos Date: Tue Sep 27 01:33:30 UTC 2011 Modified Files: src/sys/fs/udf: udf_vnops.c Log Message: return UDF_MAXNAMLEN instead of NAME_MAX To generate a diff of this commit: cvs rdiff -u -r1.66 -r1.67 src/sys/fs/udf/udf_vnops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/fs/udf/udf_vnops.c diff -u src/sys/fs/udf/udf_vnops.c:1.66 src/sys/fs/udf/udf_vnops.c:1.67 --- src/sys/fs/udf/udf_vnops.c:1.66 Sat Jun 11 23:35:55 2011 +++ src/sys/fs/udf/udf_vnops.c Mon Sep 26 21:33:30 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: udf_vnops.c,v 1.66 2011/06/12 03:35:55 rmind Exp $ */ +/* $NetBSD: udf_vnops.c,v 1.67 2011/09/27 01:33:30 christos Exp $ */ /* * Copyright (c) 2006, 2008 Reinoud Zandijk @@ -32,7 +32,7 @@ #include sys/cdefs.h #ifndef lint -__KERNEL_RCSID(0, $NetBSD: udf_vnops.c,v 1.66 2011/06/12 03:35:55 rmind Exp $); +__KERNEL_RCSID(0, $NetBSD: udf_vnops.c,v 1.67 2011/09/27 01:33:30 christos Exp $); #endif /* not lint */ @@ -1218,7 +1218,7 @@ udf_pathconf(void *v) *ap-a_retval = (116)-1; /* 16 bits */ return 0; case _PC_NAME_MAX: - *ap-a_retval = NAME_MAX; + *ap-a_retval = UDF_MAXNAMLEN; return 0; case _PC_PATH_MAX: *ap-a_retval = PATH_MAX;
CVS commit: src/sys/fs/nilfs
Module Name:src
Committed By: christos
Date: Tue Sep 27 01:34:41 UTC 2011
Modified Files:
src/sys/fs/nilfs: nilfs.h nilfs_vnops.c
Log Message:
define NILFS_MAXNAMLEN and use it.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/fs/nilfs/nilfs.h
cvs rdiff -u -r1.13 -r1.14 src/sys/fs/nilfs/nilfs_vnops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/fs/nilfs/nilfs.h
diff -u src/sys/fs/nilfs/nilfs.h:1.1 src/sys/fs/nilfs/nilfs.h:1.2
--- src/sys/fs/nilfs/nilfs.h:1.1 Sat Jul 18 12:31:42 2009
+++ src/sys/fs/nilfs/nilfs.h Mon Sep 26 21:34:41 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: nilfs.h,v 1.1 2009/07/18 16:31:42 reinoud Exp $ */
+/* $NetBSD: nilfs.h,v 1.2 2011/09/27 01:34:41 christos Exp $ */
/*
* Copyright (c) 2008, 2009 Reinoud Zandijk
@@ -106,6 +106,8 @@ struct nilfs_node;
struct nilfs_mount;
+#define NILFS_MAXNAMLEN 255
+
/* structure and derivatives */
struct nilfs_mdt {
uint32_t entries_per_block;
Index: src/sys/fs/nilfs/nilfs_vnops.c
diff -u src/sys/fs/nilfs/nilfs_vnops.c:1.13 src/sys/fs/nilfs/nilfs_vnops.c:1.14
--- src/sys/fs/nilfs/nilfs_vnops.c:1.13 Sat Jun 18 22:42:53 2011
+++ src/sys/fs/nilfs/nilfs_vnops.c Mon Sep 26 21:34:41 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: nilfs_vnops.c,v 1.13 2011/06/19 02:42:53 rmind Exp $ */
+/* $NetBSD: nilfs_vnops.c,v 1.14 2011/09/27 01:34:41 christos Exp $ */
/*
* Copyright (c) 2008, 2009 Reinoud Zandijk
@@ -28,7 +28,7 @@
#include sys/cdefs.h
#ifndef lint
-__KERNEL_RCSID(0, $NetBSD: nilfs_vnops.c,v 1.13 2011/06/19 02:42:53 rmind Exp $);
+__KERNEL_RCSID(0, $NetBSD: nilfs_vnops.c,v 1.14 2011/09/27 01:34:41 christos Exp $);
#endif /* not lint */
@@ -902,7 +902,7 @@ nilfs_pathconf(void *v)
*ap-a_retval = (116)-1; /* 16 bits */
return 0;
case _PC_NAME_MAX:
- *ap-a_retval = NAME_MAX;
+ *ap-a_retval = NILFS_MAXNAMLEN;
return 0;
case _PC_PATH_MAX:
*ap-a_retval = PATH_MAX;
CVS commit: src/sys/sys
Module Name:src
Committed By: christos
Date: Tue Sep 27 01:40:32 UTC 2011
Modified Files:
src/sys/sys: dirent.h extattr.h mqueue.h param.h syslimits.h xattr.h
Log Message:
Introduce KERNEL_NAME_MAX = 255, and bump NAME_MAX to 511. This makes
NAME_MAX match MAXNAMLEN, while at the same time does not allow names
to exceed KERNEL_NAME_MAX (enforced in vfs_lookup) so that binaries
don't break.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/sys/dirent.h
cvs rdiff -u -r1.7 -r1.8 src/sys/sys/extattr.h
cvs rdiff -u -r1.13 -r1.14 src/sys/sys/mqueue.h
cvs rdiff -u -r1.393 -r1.394 src/sys/sys/param.h
cvs rdiff -u -r1.24 -r1.25 src/sys/sys/syslimits.h
cvs rdiff -u -r1.4 -r1.5 src/sys/sys/xattr.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/sys/dirent.h
diff -u src/sys/sys/dirent.h:1.27 src/sys/sys/dirent.h:1.28
--- src/sys/sys/dirent.h:1.27 Tue Aug 9 16:05:04 2011
+++ src/sys/sys/dirent.h Mon Sep 26 21:40:32 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: dirent.h,v 1.27 2011/08/09 20:05:04 dholland Exp $ */
+/* $NetBSD: dirent.h,v 1.28 2011/09/27 01:40:32 christos Exp $ */
/*-
* Copyright (c) 1989, 1993
@@ -52,7 +52,7 @@ struct dirent {
uint16_t d_namlen; /* length of string in d_name */
uint8_t d_type; /* file type, see below */
#if defined(_NETBSD_SOURCE)
-#define MAXNAMLEN 511
+#define MAXNAMLEN 511 /* must be kept in sync with NAME_MAX */
char d_name[MAXNAMLEN + 1]; /* name must be no longer than this */
#else
char d_name[511 + 1]; /* name must be no longer than this */
Index: src/sys/sys/extattr.h
diff -u src/sys/sys/extattr.h:1.7 src/sys/sys/extattr.h:1.8
--- src/sys/sys/extattr.h:1.7 Wed Aug 3 00:11:17 2011
+++ src/sys/sys/extattr.h Mon Sep 26 21:40:32 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: extattr.h,v 1.7 2011/08/03 04:11:17 manu Exp $ */
+/* $NetBSD: extattr.h,v 1.8 2011/09/27 01:40:32 christos Exp $ */
/*-
* Copyright (c) 1999-2001 Robert N. M. Watson
@@ -52,12 +52,12 @@
#ifdef _KERNEL
-#include sys/syslimits.h
+#include sys/param.h
/* VOP_LISTEXTATTR flags */
#define EXTATTR_LIST_LENPREFIX 1 /* names with length prefix */
-#define EXTATTR_MAXNAMELEN NAME_MAX
+#define EXTATTR_MAXNAMELEN KERNEL_NAME_MAX
struct lwp;
struct vnode;
int extattr_check_cred(struct vnode *, int, kauth_cred_t,
Index: src/sys/sys/mqueue.h
diff -u src/sys/sys/mqueue.h:1.13 src/sys/sys/mqueue.h:1.14
--- src/sys/sys/mqueue.h:1.13 Sun Apr 24 16:17:53 2011
+++ src/sys/sys/mqueue.h Mon Sep 26 21:40:32 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mqueue.h,v 1.13 2011/04/24 20:17:53 rmind Exp $ */
+/* $NetBSD: mqueue.h,v 1.14 2011/09/27 01:40:32 christos Exp $ */
/*
* Copyright (c) 2007-2009 Mindaugas Rasiukevicius rmind at NetBSD org
@@ -50,6 +50,7 @@ struct mq_attr {
#include sys/queue.h
#include sys/selinfo.h
#include sys/types.h
+#include sys/param.h
/*
* Flags below are used in mq_flags for internal purposes.
@@ -62,7 +63,7 @@ struct mq_attr {
#define MQ_RECEIVE 0x2000
/* Maximal length of mqueue name */
-#define MQ_NAMELEN (NAME_MAX + 1)
+#define MQ_NAMELEN (KERNEL_NAME_MAX + 1)
/* Default size of the message */
#define MQ_DEF_MSGSIZE 1024
Index: src/sys/sys/param.h
diff -u src/sys/sys/param.h:1.393 src/sys/sys/param.h:1.394
--- src/sys/sys/param.h:1.393 Fri Sep 23 10:47:41 2011
+++ src/sys/sys/param.h Mon Sep 26 21:40:32 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: param.h,v 1.393 2011/09/23 14:47:41 christos Exp $ */
+/* $NetBSD: param.h,v 1.394 2011/09/27 01:40:32 christos Exp $ */
/*-
* Copyright (c) 1982, 1986, 1989, 1993
@@ -323,6 +323,15 @@
#define MAXPATHLEN PATH_MAX
#define MAXSYMLINKS 32
+/*
+ * This is the maximum individual filename component length enforced by
+ * namei. Filesystems cannot exceed this limit. The upper bound for that
+ * limit is NAME_MAX. We don't bump it for now, for compatibility with
+ * old binaries during the time where MAXPATHLEN was 511 and NAME_MAX was
+ * 255
+ */
+#define KERNEL_NAME_MAX 255
+
/* Bit map related macros. */
#define setbit(a,i) ((a)[(i)/NBBY] |= 1((i)%NBBY))
#define clrbit(a,i) ((a)[(i)/NBBY] = ~(1((i)%NBBY)))
Index: src/sys/sys/syslimits.h
diff -u src/sys/sys/syslimits.h:1.24 src/sys/sys/syslimits.h:1.25
--- src/sys/sys/syslimits.h:1.24 Mon Feb 25 12:29:13 2008
+++ src/sys/sys/syslimits.h Mon Sep 26 21:40:32 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: syslimits.h,v 1.24 2008/02/25 17:29:13 ad Exp $ */
+/* $NetBSD: syslimits.h,v 1.25 2011/09/27 01:40:32 christos Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -46,7 +46,8 @@
#define LINK_MAX 32767 /* max file link count */
#define MAX_CANON 255 /* max bytes in term canon input line */
#define MAX_INPUT 255 /* max bytes in terminal input */
-#define NAME_MAX 255 /* max bytes in a file name */
+#define NAME_MAX 511 /* max bytes in a file name, must be
+ /* kept in sync with MAXPATHLEN */
#define NGROUPS_MAX 16 /* max
CVS commit: src/sys/kern
Module Name:src
Committed By: christos
Date: Tue Sep 27 01:42:46 UTC 2011
Modified Files:
src/sys/kern: vfs_lookup.c
Log Message:
use KERNEL_NAME_MAX to enforce the same limit to names as before, and
make sure that MAXNAMLEN == NAME_MAX
To generate a diff of this commit:
cvs rdiff -u -r1.190 -r1.191 src/sys/kern/vfs_lookup.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/vfs_lookup.c
diff -u src/sys/kern/vfs_lookup.c:1.190 src/sys/kern/vfs_lookup.c:1.191
--- src/sys/kern/vfs_lookup.c:1.190 Thu Sep 1 11:31:27 2011
+++ src/sys/kern/vfs_lookup.c Mon Sep 26 21:42:45 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_lookup.c,v 1.190 2011/09/01 15:31:27 yamt Exp $ */
+/* $NetBSD: vfs_lookup.c,v 1.191 2011/09/27 01:42:45 christos Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -37,7 +37,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vfs_lookup.c,v 1.190 2011/09/01 15:31:27 yamt Exp $);
+__KERNEL_RCSID(0, $NetBSD: vfs_lookup.c,v 1.191 2011/09/27 01:42:45 christos Exp $);
#include opt_magiclinks.h
@@ -63,6 +63,8 @@ __KERNEL_RCSID(0, $NetBSD: vfs_lookup.c
int vfs_magiclinks = MAGICLINKS;
+__CTASSERT(MAXNAMLEN == NAME_MAX);
+
/*
* Substitute replacement text for 'magic' strings in symlinks.
* Returns 0 if successful, and returns non-zero if an error
@@ -810,7 +812,7 @@ lookup_parsepath(struct namei_state *sta
cp = NULL;
cnp-cn_hash = namei_hash(cnp-cn_nameptr, cp);
cnp-cn_namelen = cp - cnp-cn_nameptr;
- if (cnp-cn_namelen NAME_MAX) {
+ if (cnp-cn_namelen KERNEL_NAME_MAX) {
return ENAMETOOLONG;
}
#ifdef NAMEI_DIAGNOSTIC
@@ -1545,7 +1547,7 @@ do_lookup_for_nfsd_index(struct namei_st
cp = NULL;
cnp-cn_hash = namei_hash(cnp-cn_nameptr, cp);
cnp-cn_namelen = cp - cnp-cn_nameptr;
- KASSERT(cnp-cn_namelen = NAME_MAX);
+ KASSERT(cnp-cn_namelen = KERNEL_NAME_MAX);
ndp-ni_pathlen -= cnp-cn_namelen;
ndp-ni_next = cp;
state-slashes = 0;
@@ -1606,7 +1608,7 @@ lookup_for_nfsd_index(struct nameidata *
* Note: the name sent in here (is not|should not be) allowed
* to contain a slash.
*/
- if (strlen(ndp-ni_pathbuf-pb_path) NAME_MAX) {
+ if (strlen(ndp-ni_pathbuf-pb_path) KERNEL_NAME_MAX) {
return ENAMETOOLONG;
}
if (strchr(ndp-ni_pathbuf-pb_path, '/')) {
CVS commit: src/sys/ufs/ufs
Module Name:src Committed By: christos Date: Tue Sep 27 01:43:39 UTC 2011 Modified Files: src/sys/ufs/ufs: ufs_vnops.c Log Message: it is __CTASSERT() To generate a diff of this commit: cvs rdiff -u -r1.203 -r1.204 src/sys/ufs/ufs/ufs_vnops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/ufs/ufs/ufs_vnops.c diff -u src/sys/ufs/ufs/ufs_vnops.c:1.203 src/sys/ufs/ufs/ufs_vnops.c:1.204 --- src/sys/ufs/ufs/ufs_vnops.c:1.203 Mon Sep 26 21:30:54 2011 +++ src/sys/ufs/ufs/ufs_vnops.c Mon Sep 26 21:43:39 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: ufs_vnops.c,v 1.203 2011/09/27 01:30:54 christos Exp $ */ +/* $NetBSD: ufs_vnops.c,v 1.204 2011/09/27 01:43:39 christos Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -66,7 +66,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ufs_vnops.c,v 1.203 2011/09/27 01:30:54 christos Exp $); +__KERNEL_RCSID(0, $NetBSD: ufs_vnops.c,v 1.204 2011/09/27 01:43:39 christos Exp $); #if defined(_KERNEL_OPT) #include opt_ffs.h @@ -108,10 +108,11 @@ __KERNEL_RCSID(0, $NetBSD: ufs_vnops.c, #include ufs/ffs/ffs_extern.h #include ufs/lfs/lfs_extern.h -CTASSERT(EXT2FS_MAXNAMLEN == FFS_MAXNAMLEN); -CTASSERT(LFS_MAXNAMLEN == FFS_MAXNAMLEN); #include uvm/uvm.h +__CTASSERT(EXT2FS_MAXNAMLEN == FFS_MAXNAMLEN); +__CTASSERT(LFS_MAXNAMLEN == FFS_MAXNAMLEN); + static int ufs_chmod(struct vnode *, int, kauth_cred_t, struct lwp *); static int ufs_chown(struct vnode *, uid_t, gid_t, kauth_cred_t, struct lwp *);
CVS commit: src/sys/rump/librump/rumpvfs
Module Name:src Committed By: christos Date: Tue Sep 27 01:45:04 UTC 2011 Modified Files: src/sys/rump/librump/rumpvfs: rumpfs.c Log Message: use RUMPFS_MAXNAMLEN consistently. To generate a diff of this commit: cvs rdiff -u -r1.100 -r1.101 src/sys/rump/librump/rumpvfs/rumpfs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/rump/librump/rumpvfs/rumpfs.c diff -u src/sys/rump/librump/rumpvfs/rumpfs.c:1.100 src/sys/rump/librump/rumpvfs/rumpfs.c:1.101 --- src/sys/rump/librump/rumpvfs/rumpfs.c:1.100 Mon Sep 26 21:25:32 2011 +++ src/sys/rump/librump/rumpvfs/rumpfs.c Mon Sep 26 21:45:04 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: rumpfs.c,v 1.100 2011/09/27 01:25:32 christos Exp $ */ +/* $NetBSD: rumpfs.c,v 1.101 2011/09/27 01:45:04 christos Exp $ */ /* * Copyright (c) 2009, 2010, 2011 Antti Kantee. All Rights Reserved. @@ -26,7 +26,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: rumpfs.c,v 1.100 2011/09/27 01:25:32 christos Exp $); +__KERNEL_RCSID(0, $NetBSD: rumpfs.c,v 1.101 2011/09/27 01:45:04 christos Exp $); #include sys/param.h #include sys/atomic.h @@ -1479,7 +1479,7 @@ rump_vop_pathconf(void *v) *retval = LINK_MAX; return 0; case _PC_NAME_MAX: - *retval = NAME_MAX; + *retval = RUMPFS_MAXNAMLEN; return 0; case _PC_PATH_MAX: *retval = PATH_MAX; @@ -1661,7 +1661,7 @@ rumpfs_mountfs(struct mount *mp) VOP_UNLOCK(rfsmp-rfsmp_rvp); mp-mnt_data = rfsmp; - mp-mnt_stat.f_namemax = MAXNAMLEN; + mp-mnt_stat.f_namemax = RUMPFS_MAXNAMLEN; mp-mnt_stat.f_iosize = 512; mp-mnt_flag |= MNT_LOCAL; mp-mnt_iflag |= IMNT_MPSAFE | IMNT_CAN_RWTORO;
CVS commit: src/sys/fs/puffs
Module Name:src
Committed By: christos
Date: Tue Sep 27 01:48:58 UTC 2011
Modified Files:
src/sys/fs/puffs: puffs_msgif.h
Log Message:
don't get affected by the NAME_MAX bump. Use the same constant as the
rest of the extrattr code.
To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 src/sys/fs/puffs/puffs_msgif.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/fs/puffs/puffs_msgif.h
diff -u src/sys/fs/puffs/puffs_msgif.h:1.76 src/sys/fs/puffs/puffs_msgif.h:1.77
--- src/sys/fs/puffs/puffs_msgif.h:1.76 Mon Jul 4 04:07:30 2011
+++ src/sys/fs/puffs/puffs_msgif.h Mon Sep 26 21:48:57 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: puffs_msgif.h,v 1.76 2011/07/04 08:07:30 manu Exp $ */
+/* $NetBSD: puffs_msgif.h,v 1.77 2011/09/27 01:48:57 christos Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 Antti Kantee. All Rights Reserved.
@@ -253,7 +253,7 @@ struct puffs_kcred {
#define PUFFS_MSG_MAXSIZE 2*MAXPHYS
#define PUFFS_MSGSTRUCT_MAX 4096 /* approximate */
-#define PUFFS_EXTNAMELEN NAME_MAX /* currently same as EXTATTR_MAXNAMELEN */
+#define PUFFS_EXTNAMELEN KERNEL_NAME_MAX /* currently same as EXTATTR_MAXNAMELEN */
#define PUFFS_TOMOVE(a,b) (MIN((a), b-pmp_msg_maxsize - PUFFS_MSGSTRUCT_MAX))
CVS commit: src/sys/sys
Module Name:src Committed By: christos Date: Tue Sep 27 01:51:42 UTC 2011 Modified Files: src/sys/sys: syslimits.h Log Message: fix comment. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/sys/sys/syslimits.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/sys/syslimits.h diff -u src/sys/sys/syslimits.h:1.25 src/sys/sys/syslimits.h:1.26 --- src/sys/sys/syslimits.h:1.25 Mon Sep 26 21:40:32 2011 +++ src/sys/sys/syslimits.h Mon Sep 26 21:51:42 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: syslimits.h,v 1.25 2011/09/27 01:40:32 christos Exp $ */ +/* $NetBSD: syslimits.h,v 1.26 2011/09/27 01:51:42 christos Exp $ */ /* * Copyright (c) 1988, 1993 @@ -46,7 +46,7 @@ #define LINK_MAX 32767 /* max file link count */ #define MAX_CANON 255 /* max bytes in term canon input line */ #define MAX_INPUT 255 /* max bytes in terminal input */ -#define NAME_MAX 511 /* max bytes in a file name, must be +#define NAME_MAX 511 /* max bytes in a file name, must be */ /* kept in sync with MAXPATHLEN */ #define NGROUPS_MAX 16 /* max supplemental group id's */ #define UID_MAX 2147483647U /* max value for a uid_t (2^31-2) */
CVS commit: src/sys
Module Name:src
Committed By: christos
Date: Tue Sep 27 02:05:10 UTC 2011
Modified Files:
src/sys/fs/smbfs: smbfs_smb.c
src/sys/netsmb: smb.h
Log Message:
rename SMBFS_MAXFNAMELEN to SMBFS_MAXNAMLEN for consistency
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/sys/fs/smbfs/smbfs_smb.c
cvs rdiff -u -r1.18 -r1.19 src/sys/netsmb/smb.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/fs/smbfs/smbfs_smb.c
diff -u src/sys/fs/smbfs/smbfs_smb.c:1.41 src/sys/fs/smbfs/smbfs_smb.c:1.42
--- src/sys/fs/smbfs/smbfs_smb.c:1.41 Tue Oct 20 16:55:01 2009
+++ src/sys/fs/smbfs/smbfs_smb.c Mon Sep 26 22:05:10 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: smbfs_smb.c,v 1.41 2009/10/20 20:55:01 tron Exp $ */
+/* $NetBSD: smbfs_smb.c,v 1.42 2011/09/27 02:05:10 christos Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: smbfs_smb.c,v 1.41 2009/10/20 20:55:01 tron Exp $);
+__KERNEL_RCSID(0, $NetBSD: smbfs_smb.c,v 1.42 2011/09/27 02:05:10 christos Exp $);
#include sys/param.h
#include sys/systm.h
@@ -1122,7 +1122,7 @@ static int
smbfs_findopenLM2(struct smbfs_fctx *ctx, struct smbnode *dnp,
const char *wildcard, int wclen, int attr, struct smb_cred *scred)
{
- ctx-f_name = malloc(SMB_MAXFNAMELEN, M_SMBFSDATA, M_WAITOK);
+ ctx-f_name = malloc(SMB_MAXNAMLEN, M_SMBFSDATA, M_WAITOK);
if (ctx-f_name == NULL)
return ENOMEM;
ctx-f_infolevel = SMB_DIALECT(SSTOVC(ctx-f_ssp)) SMB_DIALECT_NTLM0_12 ?
@@ -1205,7 +1205,7 @@ smbfs_findnextLM2(struct smbfs_fctx *ctx
return EINVAL;
#endif
}
- nmlen = min(size, SMB_MAXFNAMELEN);
+ nmlen = min(size, SMB_MAXNAMLEN);
cp = ctx-f_name;
error = md_get_mem(mbp, cp, nmlen, MB_MSYSTEM);
if (error)
Index: src/sys/netsmb/smb.h
diff -u src/sys/netsmb/smb.h:1.18 src/sys/netsmb/smb.h:1.19
--- src/sys/netsmb/smb.h:1.18 Mon Sep 26 21:16:35 2011
+++ src/sys/netsmb/smb.h Mon Sep 26 22:05:10 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: smb.h,v 1.18 2011/09/27 01:16:35 christos Exp $ */
+/* $NetBSD: smb.h,v 1.19 2011/09/27 02:05:10 christos Exp $ */
/*
* Copyright (c) 2000-2001 Boris Popov
@@ -394,6 +394,7 @@ enum smb_dialects {
#define SMB_MAXSHARENAMELEN 128
#define SMB_MAXPKTLEN 0x1
#define SMB_MAXCHALLENGELEN 8
+#define SMB_MAXNAMLEN 255
#define SMB_MAXRCN 3 /* number of reconnect attempts */
CVS commit: src/sys/ufs/ufs
Module Name:src
Committed By: christos
Date: Tue Sep 27 02:10:32 UTC 2011
Modified Files:
src/sys/ufs/ufs: ufs_vnops.c
Log Message:
include the proper headers to make {LFS,EXT2FS}_MAXNAMLEN visible
To generate a diff of this commit:
cvs rdiff -u -r1.204 -r1.205 src/sys/ufs/ufs/ufs_vnops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/ufs/ufs/ufs_vnops.c
diff -u src/sys/ufs/ufs/ufs_vnops.c:1.204 src/sys/ufs/ufs/ufs_vnops.c:1.205
--- src/sys/ufs/ufs/ufs_vnops.c:1.204 Mon Sep 26 21:43:39 2011
+++ src/sys/ufs/ufs/ufs_vnops.c Mon Sep 26 22:10:32 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: ufs_vnops.c,v 1.204 2011/09/27 01:43:39 christos Exp $ */
+/* $NetBSD: ufs_vnops.c,v 1.205 2011/09/27 02:10:32 christos Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ufs_vnops.c,v 1.204 2011/09/27 01:43:39 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: ufs_vnops.c,v 1.205 2011/09/27 02:10:32 christos Exp $);
#if defined(_KERNEL_OPT)
#include opt_ffs.h
@@ -105,8 +105,10 @@ __KERNEL_RCSID(0, $NetBSD: ufs_vnops.c,
#include ufs/ufs/dirhash.h
#endif
#include ufs/ext2fs/ext2fs_extern.h
+#include ufs/ext2fs/ext2fs_dir.h
#include ufs/ffs/ffs_extern.h
#include ufs/lfs/lfs_extern.h
+#include ufs/lfs/lfs.h
#include uvm/uvm.h
CVS commit: src/sys/kern
Module Name:src Committed By: christos Date: Tue Sep 27 02:10:55 UTC 2011 Modified Files: src/sys/kern: vfs_lookup.c Log Message: include sys/dirent.h to make MAXNAMLEN visible. To generate a diff of this commit: cvs rdiff -u -r1.191 -r1.192 src/sys/kern/vfs_lookup.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/kern/vfs_lookup.c diff -u src/sys/kern/vfs_lookup.c:1.191 src/sys/kern/vfs_lookup.c:1.192 --- src/sys/kern/vfs_lookup.c:1.191 Mon Sep 26 21:42:45 2011 +++ src/sys/kern/vfs_lookup.c Mon Sep 26 22:10:55 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: vfs_lookup.c,v 1.191 2011/09/27 01:42:45 christos Exp $ */ +/* $NetBSD: vfs_lookup.c,v 1.192 2011/09/27 02:10:55 christos Exp $ */ /* * Copyright (c) 1982, 1986, 1989, 1993 @@ -37,7 +37,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: vfs_lookup.c,v 1.191 2011/09/27 01:42:45 christos Exp $); +__KERNEL_RCSID(0, $NetBSD: vfs_lookup.c,v 1.192 2011/09/27 02:10:55 christos Exp $); #include opt_magiclinks.h @@ -56,6 +56,7 @@ __KERNEL_RCSID(0, $NetBSD: vfs_lookup.c #include sys/syslog.h #include sys/kauth.h #include sys/ktrace.h +#include sys/dirent.h #ifndef MAGICLINKS #define MAGICLINKS 0
CVS commit: src/usr.sbin/cpuctl
Module Name:src Committed By: jruoho Date: Mon Sep 26 06:51:58 UTC 2011 Modified Files: src/usr.sbin/cpuctl: cpuctl.c Log Message: Fix wrong err(3) message (no such thing as IOC_CPU_GETINFO). To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/usr.sbin/cpuctl/cpuctl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/binutils
Module Name:src Committed By: mrg Date: Mon Sep 26 09:27:00 UTC 2011 Modified Files: src/external/gpl3/binutils/lib/libbfd/arch/arm: bfd.h bfdver.h config.h defs.mk src/external/gpl3/binutils/lib/libiberty/arch/arm: config.h defs.mk src/external/gpl3/binutils/lib/libopcodes/arch/arm: config.h src/external/gpl3/binutils/usr.bin/common/arch/arm: config.h defs.mk src/external/gpl3/binutils/usr.bin/gas/arch/arm: config.h defs.mk src/external/gpl3/binutils/usr.bin/gprof/arch/arm: defs.mk gconfig.h src/external/gpl3/binutils/usr.bin/ld/arch/arm: config.h defs.mk Log Message: mknative files for arm / binutils 2.21.1a (built with a hack to gas/config/tc-arm.c.) To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/binutils/lib/libbfd/arch/arm/bfd.h cvs rdiff -u -r1.5 -r1.6 \ src/external/gpl3/binutils/lib/libbfd/arch/arm/bfdver.h cvs rdiff -u -r1.1 -r1.2 \ src/external/gpl3/binutils/lib/libbfd/arch/arm/config.h \ src/external/gpl3/binutils/lib/libbfd/arch/arm/defs.mk cvs rdiff -u -r1.1 -r1.2 \ src/external/gpl3/binutils/lib/libiberty/arch/arm/config.h \ src/external/gpl3/binutils/lib/libiberty/arch/arm/defs.mk cvs rdiff -u -r1.1 -r1.2 \ src/external/gpl3/binutils/lib/libopcodes/arch/arm/config.h cvs rdiff -u -r1.1 -r1.2 \ src/external/gpl3/binutils/usr.bin/common/arch/arm/config.h cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/binutils/usr.bin/common/arch/arm/defs.mk cvs rdiff -u -r1.1 -r1.2 \ src/external/gpl3/binutils/usr.bin/gas/arch/arm/config.h \ src/external/gpl3/binutils/usr.bin/gas/arch/arm/defs.mk cvs rdiff -u -r1.1 -r1.2 \ src/external/gpl3/binutils/usr.bin/gprof/arch/arm/defs.mk \ src/external/gpl3/binutils/usr.bin/gprof/arch/arm/gconfig.h cvs rdiff -u -r1.1 -r1.2 \ src/external/gpl3/binutils/usr.bin/ld/arch/arm/config.h \ src/external/gpl3/binutils/usr.bin/ld/arch/arm/defs.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/binutils
Module Name:src Committed By: mrg Date: Mon Sep 26 09:33:46 UTC 2011 Modified Files: src/external/gpl3/binutils/lib/libbfd/arch/armeb: bfd.h bfdver.h config.h defs.mk src/external/gpl3/binutils/lib/libiberty/arch/armeb: config.h defs.mk src/external/gpl3/binutils/lib/libopcodes/arch/armeb: config.h src/external/gpl3/binutils/usr.bin/common/arch/armeb: config.h defs.mk src/external/gpl3/binutils/usr.bin/gas/arch/armeb: config.h defs.mk src/external/gpl3/binutils/usr.bin/gprof/arch/armeb: defs.mk gconfig.h src/external/gpl3/binutils/usr.bin/ld/arch/armeb: config.h defs.mk Log Message: mknative files for armeb / binutils 2.21.1a To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/binutils/lib/libbfd/arch/armeb/bfd.h cvs rdiff -u -r1.5 -r1.6 \ src/external/gpl3/binutils/lib/libbfd/arch/armeb/bfdver.h cvs rdiff -u -r1.1 -r1.2 \ src/external/gpl3/binutils/lib/libbfd/arch/armeb/config.h \ src/external/gpl3/binutils/lib/libbfd/arch/armeb/defs.mk cvs rdiff -u -r1.1 -r1.2 \ src/external/gpl3/binutils/lib/libiberty/arch/armeb/config.h \ src/external/gpl3/binutils/lib/libiberty/arch/armeb/defs.mk cvs rdiff -u -r1.1 -r1.2 \ src/external/gpl3/binutils/lib/libopcodes/arch/armeb/config.h cvs rdiff -u -r1.1 -r1.2 \ src/external/gpl3/binutils/usr.bin/common/arch/armeb/config.h cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/binutils/usr.bin/common/arch/armeb/defs.mk cvs rdiff -u -r1.1 -r1.2 \ src/external/gpl3/binutils/usr.bin/gas/arch/armeb/config.h \ src/external/gpl3/binutils/usr.bin/gas/arch/armeb/defs.mk cvs rdiff -u -r1.1 -r1.2 \ src/external/gpl3/binutils/usr.bin/gprof/arch/armeb/defs.mk \ src/external/gpl3/binutils/usr.bin/gprof/arch/armeb/gconfig.h cvs rdiff -u -r1.1 -r1.2 \ src/external/gpl3/binutils/usr.bin/ld/arch/armeb/config.h \ src/external/gpl3/binutils/usr.bin/ld/arch/armeb/defs.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5] src/sys/arch/xen/xen
Module Name:src Committed By: sborrill Date: Mon Sep 26 09:56:55 UTC 2011 Modified Files: src/sys/arch/xen/xen [netbsd-5]: hypervisor.c Log Message: Patch to fix build on Xen 2 (fallout from pullup #1672) To generate a diff of this commit: cvs rdiff -u -r1.42.4.4 -r1.42.4.5 src/sys/arch/xen/xen/hypervisor.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/gdb/lib/libgdb
Module Name:src Committed By: christos Date: Mon Sep 26 14:31:26 UTC 2011 Modified Files: src/external/gpl3/gdb/lib/libgdb: Makefile Removed Files: src/external/gpl3/gdb/lib/libgdb/arch/x86_64: gstdint.h Log Message: use gstdint.h from libdecnumber. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/gdb/lib/libgdb/Makefile cvs rdiff -u -r1.1 -r0 src/external/gpl3/gdb/lib/libgdb/arch/x86_64/gstdint.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/xf86-input-ws/dist/src
Module Name:xsrc Committed By: tsutsui Date: Mon Sep 26 14:38:59 UTC 2011 Modified Files: xsrc/external/mit/xf86-input-ws/dist/src: ws.c Log Message: Use #ifndef __NetBSD__ instead of #if 0 which were added in rev 1.5: port to netbsd wscons To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 xsrc/external/mit/xf86-input-ws/dist/src/ws.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/xf86-input-ws/dist/src
Module Name:xsrc Committed By: tsutsui Date: Mon Sep 26 14:47:53 UTC 2011 Modified Files: xsrc/external/mit/xf86-input-ws/dist/src: ws.c Log Message: Restore #ifndef __NetBSD__ portions (disabling OpenBSD specific TPANEL stuff?) which were accidentally removed in rev 1.4: merge xf86-input-ws 1.3.0 from openbsd-current. Pointed out by nonaka@, and this fixes WSMOUSEIO_SCALIBCOORDS ioctl errors and coredumps after the driver is loaded on hpcarm W-ZERO3. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/xf86-input-ws/dist/src/ws.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/lib/xkeyboard-config/rules
Module Name:src Committed By: tsutsui Date: Mon Sep 26 15:19:45 UTC 2011 Modified Files: src/external/mit/xorg/lib/xkeyboard-config/rules: base base.lst evdev evdev.lst Log Message: Regenerate these compiled files properly in our own xsrc/external/mit/xkeyboard-config/dist/ directory, i.e. - pull changes from xkeyboard-config 2.0 to 2.3 - put back entries for sharp machines (zaurus and hpcarm wzero3s) removed in rev 1.4 (xkeyboard-config 2.0 merge) XXX1: can't we generate these files during build? XXX2: hpcarm W-ZERO3 keyboard on X still has some troubles... To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ src/external/mit/xorg/lib/xkeyboard-config/rules/base \ src/external/mit/xorg/lib/xkeyboard-config/rules/base.lst \ src/external/mit/xorg/lib/xkeyboard-config/rules/evdev \ src/external/mit/xorg/lib/xkeyboard-config/rules/evdev.lst Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/xf86-input-ws/dist/src
Module Name:xsrc Committed By: tsutsui Date: Mon Sep 26 18:04:37 UTC 2011 Modified Files: xsrc/external/mit/xf86-input-ws/dist/src: ws.c Log Message: Also wrap variables used only in !__NetBSD__ block. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/xf86-input-ws/dist/src/ws.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci
Module Name:src Committed By: jakllsch Date: Mon Sep 26 18:07:38 UTC 2011 Modified Files: src/sys/dev/pci: cxdtv.c cxdtvreg.h Log Message: Define and use symbolic bits in registers. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/dev/pci/cxdtv.c cvs rdiff -u -r1.1 -r1.2 src/sys/dev/pci/cxdtvreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/server/drivers/xf86-input-ws
Module Name:src Committed By: tsutsui Date: Mon Sep 26 18:08:09 UTC 2011 Modified Files: src/external/mit/xorg/server/drivers/xf86-input-ws: Makefile Log Message: Set WARNS?=2. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 \ src/external/mit/xorg/server/drivers/xf86-input-ws/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: jakllsch Date: Mon Sep 26 18:14:07 UTC 2011 Modified Files: src/sys/arch/i386/conf: ALL Log Message: options PMS_DISABLE_POWERHOOK is obsolete. To generate a diff of this commit: cvs rdiff -u -r1.320 -r1.321 src/sys/arch/i386/conf/ALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/gdb/dist/gdb
Module Name:src Committed By: christos Date: Mon Sep 26 18:55:57 UTC 2011 Added Files: src/external/gpl3/gdb/dist/gdb: nbsd-thread.c Log Message: Resurrect old thread debugging code. Not hooked in, compiles. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/external/gpl3/gdb/dist/gdb/nbsd-thread.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man4
Module Name:src Committed By: sjg Date: Mon Sep 26 19:02:39 UTC 2011 Modified Files: src/share/man/man4: filemon.4 Log Message: Update description for V4. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/share/man/man4/filemon.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/gdb/dist/gdb
Module Name:src Committed By: christos Date: Mon Sep 26 20:38:54 UTC 2011 Modified Files: src/external/gpl3/gdb/dist/gdb: amd64nbsd-nat.c nbsd-thread.c Log Message: Provide regset functions and gut parts that the new debugging thread library does not provide yet, so that we can link. As expected this does not work yet. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gdb/dist/gdb/amd64nbsd-nat.c cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/gdb/dist/gdb/nbsd-thread.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools
Module Name:src Committed By: christos Date: Mon Sep 26 21:16:14 UTC 2011 Modified Files: src/tools/gcc: Makefile src/tools/gdb: Makefile Log Message: remove pre-gcc-4.5 mknative remnants that have long ceased to function. To generate a diff of this commit: cvs rdiff -u -r1.45 -r1.46 src/tools/gcc/Makefile cvs rdiff -u -r1.19 -r1.20 src/tools/gdb/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/xen/xen
Module Name:src Committed By: jym Date: Mon Sep 26 21:44:09 UTC 2011 Modified Files: src/sys/arch/xen/xen: if_xennet_xenbus.c Log Message: Fix a fallout with my xensuspend merge: talk_to_backend() returns a boolean, so checking for true with == 0 is... wrong. Now xennet(4) should work as expected, and not stay in the InitWait state (which blocks network communication with the backend). Thanks to riz@ and sborrill@ for reporting breakage with -current xennet(4) after my merge. To generate a diff of this commit: cvs rdiff -u -r1.52 -r1.53 src/sys/arch/xen/xen/if_xennet_xenbus.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/sh3/sh3
Module Name:src Committed By: christos Date: Tue Sep 27 00:35:38 UTC 2011 Modified Files: src/sys/arch/sh3/sh3: cpu_in_cksum.S Log Message: move the size marker back to where it was, but fix the name. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/sh3/sh3/cpu_in_cksum.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: jym Date: Tue Sep 27 00:36:51 UTC 2011 Modified Files: src/distrib/sets/lists/comp: mi src/share/man/man9: KASSERT.9 Makefile Log Message: Document new *ASSERTMSG() prototype, and update KASSERT(9). See also http://mail-index.netbsd.org/tech-kern/2011/09/07/msg011427.html To generate a diff of this commit: cvs rdiff -u -r1.1679 -r1.1680 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.12 -r1.13 src/share/man/man9/KASSERT.9 cvs rdiff -u -r1.349 -r1.350 src/share/man/man9/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/svr4
Module Name:src Committed By: christos Date: Tue Sep 27 00:52:56 UTC 2011 Modified Files: src/sys/compat/svr4: svr4_misc.c Log Message: return the namemax from the bsd statvfs which is filesystem dependent, not a random value. To generate a diff of this commit: cvs rdiff -u -r1.154 -r1.155 src/sys/compat/svr4/svr4_misc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/coda
Module Name:src Committed By: christos Date: Tue Sep 27 00:54:47 UTC 2011 Modified Files: src/sys/coda: coda_vfsops.c Log Message: use CODA_MAXNAMLEN instead of bogus MAXNAMLEN To generate a diff of this commit: cvs rdiff -u -r1.69 -r1.70 src/sys/coda/coda_vfsops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/svr4_32
Module Name:src Committed By: christos Date: Tue Sep 27 00:56:14 UTC 2011 Modified Files: src/sys/compat/svr4_32: svr4_32_misc.c Log Message: use the filesystem specific namemax not a hard-coded MAXNAMLEN To generate a diff of this commit: cvs rdiff -u -r1.73 -r1.74 src/sys/compat/svr4_32/svr4_32_misc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/fs/cd9660
Module Name:src Committed By: christos Date: Tue Sep 27 01:01:44 UTC 2011 Modified Files: src/sys/fs/cd9660: cd9660_util.c cd9660_vfsops.c iso.h Log Message: define and use ISO_MAXNAMLEN instead of MAXNAMLEN To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/fs/cd9660/cd9660_util.c \ src/sys/fs/cd9660/iso.h cvs rdiff -u -r1.72 -r1.73 src/sys/fs/cd9660/cd9660_vfsops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src Committed By: jym Date: Tue Sep 27 01:02:39 UTC 2011 Modified Files: src/sys/arch/evbmips/evbmips: interrupt.c src/sys/arch/mips/mips: mips_softint.c pmap_tlb.c syscall.c vm_machdep.c src/sys/arch/mips/ralink: ralink_gpio.c ralink_intr.c src/sys/arch/mips/rmi: rmixl_fmn.c rmixl_intr.c src/sys/arch/powerpc/booke: booke_pmap.c e500_intr.c trap.c src/sys/arch/powerpc/booke/dev: pq3etsec.c src/sys/arch/powerpc/booke/pci: pq3pci.c src/sys/arch/powerpc/include: userret.h src/sys/arch/powerpc/include/oea: pmap.h src/sys/arch/powerpc/pic: intr.c src/sys/arch/powerpc/powerpc: process_machdep.c softint_machdep.c trap.c src/sys/arch/x86/x86: pmap.c src/sys/arch/xen/x86: xen_ipi.c src/sys/common/pmap/tlb: pmap.c pmap_tlb.c src/sys/dev/ic: siisata.c src/sys/dev/usb: usb_mem.c src/sys/kern: kern_mutex_obj.c kern_softint.c kern_synch.c subr_evcnt.c subr_pcu.c subr_pool.c src/sys/lib/libkern: libkern.h src/sys/uvm: uvm_bio.c uvm_map.c uvm_pglist.c Log Message: Modify *ASSERTMSG() so they are now used as variadic macros. The main goal is to provide routines that do as KASSERT(9) says: append a message to the panic format string when the assertion triggers, with optional arguments. Fix call sites to reflect the new definition. Discussed on tech-kern@. See http://mail-index.netbsd.org/tech-kern/2011/09/07/msg011427.html To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/arch/evbmips/evbmips/interrupt.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/mips/mips/mips_softint.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/mips/mips/pmap_tlb.c cvs rdiff -u -r1.45 -r1.46 src/sys/arch/mips/mips/syscall.c cvs rdiff -u -r1.140 -r1.141 src/sys/arch/mips/mips/vm_machdep.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/mips/ralink/ralink_gpio.c \ src/sys/arch/mips/ralink/ralink_intr.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/mips/rmi/rmixl_fmn.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/mips/rmi/rmixl_intr.c cvs rdiff -u -r1.9 -r1.10 src/sys/arch/powerpc/booke/booke_pmap.c cvs rdiff -u -r1.15 -r1.16 src/sys/arch/powerpc/booke/e500_intr.c cvs rdiff -u -r1.12 -r1.13 src/sys/arch/powerpc/booke/trap.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/powerpc/booke/dev/pq3etsec.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/powerpc/booke/pci/pq3pci.c cvs rdiff -u -r1.21 -r1.22 src/sys/arch/powerpc/include/userret.h cvs rdiff -u -r1.25 -r1.26 src/sys/arch/powerpc/include/oea/pmap.h cvs rdiff -u -r1.17 -r1.18 src/sys/arch/powerpc/pic/intr.c cvs rdiff -u -r1.34 -r1.35 src/sys/arch/powerpc/powerpc/process_machdep.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/powerpc/powerpc/softint_machdep.c cvs rdiff -u -r1.144 -r1.145 src/sys/arch/powerpc/powerpc/trap.c cvs rdiff -u -r1.131 -r1.132 src/sys/arch/x86/x86/pmap.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/xen/x86/xen_ipi.c cvs rdiff -u -r1.9 -r1.10 src/sys/common/pmap/tlb/pmap.c cvs rdiff -u -r1.10 -r1.11 src/sys/common/pmap/tlb/pmap_tlb.c cvs rdiff -u -r1.14 -r1.15 src/sys/dev/ic/siisata.c cvs rdiff -u -r1.49 -r1.50 src/sys/dev/usb/usb_mem.c cvs rdiff -u -r1.4 -r1.5 src/sys/kern/kern_mutex_obj.c cvs rdiff -u -r1.37 -r1.38 src/sys/kern/kern_softint.c cvs rdiff -u -r1.290 -r1.291 src/sys/kern/kern_synch.c cvs rdiff -u -r1.10 -r1.11 src/sys/kern/subr_evcnt.c cvs rdiff -u -r1.9 -r1.10 src/sys/kern/subr_pcu.c cvs rdiff -u -r1.189 -r1.190 src/sys/kern/subr_pool.c cvs rdiff -u -r1.100 -r1.101 src/sys/lib/libkern/libkern.h cvs rdiff -u -r1.78 -r1.79 src/sys/uvm/uvm_bio.c cvs rdiff -u -r1.304 -r1.305 src/sys/uvm/uvm_map.c cvs rdiff -u -r1.61 -r1.62 src/sys/uvm/uvm_pglist.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/nfs
Module Name:src Committed By: christos Date: Tue Sep 27 01:07:38 UTC 2011 Modified Files: src/sys/nfs: nfs_bio.c nfs_export.c Log Message: use NFS_MAXNAMLEN for all names. To generate a diff of this commit: cvs rdiff -u -r1.187 -r1.188 src/sys/nfs/nfs_bio.c cvs rdiff -u -r1.50 -r1.51 src/sys/nfs/nfs_export.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/stand
Module Name:src Committed By: christos Date: Tue Sep 27 01:08:55 UTC 2011 Modified Files: src/sys/stand: ls.c Log Message: use NAME_MAX instead of MAXNAMLEN To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/stand/ls.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/fs/tmpfs
Module Name:src Committed By: christos Date: Tue Sep 27 01:10:44 UTC 2011 Modified Files: src/sys/fs/tmpfs: tmpfs.h tmpfs_vfsops.c tmpfs_vnops.c Log Message: define and use TMPFS_MAXNAMLEN instead of MAXNAMLEN To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.45 src/sys/fs/tmpfs/tmpfs.h cvs rdiff -u -r1.51 -r1.52 src/sys/fs/tmpfs/tmpfs_vfsops.c cvs rdiff -u -r1.90 -r1.91 src/sys/fs/tmpfs/tmpfs_vnops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/fs/udf
Module Name:src Committed By: christos Date: Tue Sep 27 01:13:16 UTC 2011 Modified Files: src/sys/fs/udf: udf.h udf_subr.c udf_vfsops.c Log Message: - rename UDF_MAX_NAMELEN - UDF_MAXNAMLEN - use NAME_MAX instead of MAXNAMLEN To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.44 src/sys/fs/udf/udf.h cvs rdiff -u -r1.116 -r1.117 src/sys/fs/udf/udf_subr.c cvs rdiff -u -r1.60 -r1.61 src/sys/fs/udf/udf_vfsops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/fs/hfs
Module Name:src Committed By: christos Date: Tue Sep 27 01:14:47 UTC 2011 Modified Files: src/sys/fs/hfs: hfs_vnops.c Log Message: use NAME_MAX instead of MAXNAMLEN To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/sys/fs/hfs/hfs_vnops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/netsmb
Module Name:src Committed By: christos Date: Tue Sep 27 01:16:35 UTC 2011 Modified Files: src/sys/netsmb: smb.h Log Message: remove unused constant To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/netsmb/smb.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/miscfs/fdesc
Module Name:src Committed By: christos Date: Tue Sep 27 01:22:12 UTC 2011 Modified Files: src/sys/miscfs/fdesc: fdesc.h fdesc_vfsops.c Log Message: define FDESC_MAXNAMLEN and use it. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/miscfs/fdesc/fdesc.h cvs rdiff -u -r1.85 -r1.86 src/sys/miscfs/fdesc/fdesc_vfsops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/miscfs/kernfs
Module Name:src Committed By: christos Date: Tue Sep 27 01:23:05 UTC 2011 Modified Files: src/sys/miscfs/kernfs: kernfs.h kernfs_vfsops.c Log Message: define KERNFS_MAXNAMLEN and use it.` To generate a diff of this commit: cvs rdiff -u -r1.35 -r1.36 src/sys/miscfs/kernfs/kernfs.h cvs rdiff -u -r1.90 -r1.91 src/sys/miscfs/kernfs/kernfs_vfsops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/miscfs/procfs
Module Name:src Committed By: christos Date: Tue Sep 27 01:23:59 UTC 2011 Modified Files: src/sys/miscfs/procfs: procfs.h procfs_vfsops.c Log Message: define PROCFS_MAXNAMLEN and use it. To generate a diff of this commit: cvs rdiff -u -r1.66 -r1.67 src/sys/miscfs/procfs/procfs.h cvs rdiff -u -r1.85 -r1.86 src/sys/miscfs/procfs/procfs_vfsops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/librump/rumpvfs
Module Name:src Committed By: christos Date: Tue Sep 27 01:25:33 UTC 2011 Modified Files: src/sys/rump/librump/rumpvfs: rump_vfs_private.h rumpfs.c Log Message: define RUMPFS_MAXNAMLEN and use it. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/rump/librump/rumpvfs/rump_vfs_private.h cvs rdiff -u -r1.99 -r1.100 src/sys/rump/librump/rumpvfs/rumpfs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/fs/cd9660
Module Name:src Committed By: christos Date: Tue Sep 27 01:27:44 UTC 2011 Modified Files: src/sys/fs/cd9660: cd9660_lookup.c cd9660_rrip.c cd9660_vnops.c Log Message: use ISO_MAXNAMLEN instead of NAME_MAX To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/fs/cd9660/cd9660_lookup.c cvs rdiff -u -r1.16 -r1.17 src/sys/fs/cd9660/cd9660_rrip.c cvs rdiff -u -r1.39 -r1.40 src/sys/fs/cd9660/cd9660_vnops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/ufs/ufs
Module Name:src Committed By: christos Date: Tue Sep 27 01:30:54 UTC 2011 Modified Files: src/sys/ufs/ufs: ufs_vnops.c Log Message: use FFS_MAXNAMLEN instead of NAME_MAX, making sure that it matches with EXT2FS_MAXNAMLEN and LFS_MAXNAMLEN. To generate a diff of this commit: cvs rdiff -u -r1.202 -r1.203 src/sys/ufs/ufs/ufs_vnops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/fs/tmpfs
Module Name:src Committed By: christos Date: Tue Sep 27 01:32:21 UTC 2011 Modified Files: src/sys/fs/tmpfs: tmpfs_vnops.c Log Message: return TMPFS_MAXNAMLEN instead of NAME_MAX To generate a diff of this commit: cvs rdiff -u -r1.91 -r1.92 src/sys/fs/tmpfs/tmpfs_vnops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/fs/udf
Module Name:src Committed By: christos Date: Tue Sep 27 01:33:30 UTC 2011 Modified Files: src/sys/fs/udf: udf_vnops.c Log Message: return UDF_MAXNAMLEN instead of NAME_MAX To generate a diff of this commit: cvs rdiff -u -r1.66 -r1.67 src/sys/fs/udf/udf_vnops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/fs/nilfs
Module Name:src Committed By: christos Date: Tue Sep 27 01:34:41 UTC 2011 Modified Files: src/sys/fs/nilfs: nilfs.h nilfs_vnops.c Log Message: define NILFS_MAXNAMLEN and use it. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/fs/nilfs/nilfs.h cvs rdiff -u -r1.13 -r1.14 src/sys/fs/nilfs/nilfs_vnops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/sys
Module Name:src Committed By: christos Date: Tue Sep 27 01:40:32 UTC 2011 Modified Files: src/sys/sys: dirent.h extattr.h mqueue.h param.h syslimits.h xattr.h Log Message: Introduce KERNEL_NAME_MAX = 255, and bump NAME_MAX to 511. This makes NAME_MAX match MAXNAMLEN, while at the same time does not allow names to exceed KERNEL_NAME_MAX (enforced in vfs_lookup) so that binaries don't break. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/sys/sys/dirent.h cvs rdiff -u -r1.7 -r1.8 src/sys/sys/extattr.h cvs rdiff -u -r1.13 -r1.14 src/sys/sys/mqueue.h cvs rdiff -u -r1.393 -r1.394 src/sys/sys/param.h cvs rdiff -u -r1.24 -r1.25 src/sys/sys/syslimits.h cvs rdiff -u -r1.4 -r1.5 src/sys/sys/xattr.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src Committed By: christos Date: Tue Sep 27 01:42:46 UTC 2011 Modified Files: src/sys/kern: vfs_lookup.c Log Message: use KERNEL_NAME_MAX to enforce the same limit to names as before, and make sure that MAXNAMLEN == NAME_MAX To generate a diff of this commit: cvs rdiff -u -r1.190 -r1.191 src/sys/kern/vfs_lookup.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/ufs/ufs
Module Name:src Committed By: christos Date: Tue Sep 27 01:43:39 UTC 2011 Modified Files: src/sys/ufs/ufs: ufs_vnops.c Log Message: it is __CTASSERT() To generate a diff of this commit: cvs rdiff -u -r1.203 -r1.204 src/sys/ufs/ufs/ufs_vnops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/librump/rumpvfs
Module Name:src Committed By: christos Date: Tue Sep 27 01:45:04 UTC 2011 Modified Files: src/sys/rump/librump/rumpvfs: rumpfs.c Log Message: use RUMPFS_MAXNAMLEN consistently. To generate a diff of this commit: cvs rdiff -u -r1.100 -r1.101 src/sys/rump/librump/rumpvfs/rumpfs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/fs/puffs
Module Name:src Committed By: christos Date: Tue Sep 27 01:48:58 UTC 2011 Modified Files: src/sys/fs/puffs: puffs_msgif.h Log Message: don't get affected by the NAME_MAX bump. Use the same constant as the rest of the extrattr code. To generate a diff of this commit: cvs rdiff -u -r1.76 -r1.77 src/sys/fs/puffs/puffs_msgif.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/sys
Module Name:src Committed By: christos Date: Tue Sep 27 01:51:42 UTC 2011 Modified Files: src/sys/sys: syslimits.h Log Message: fix comment. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/sys/sys/syslimits.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src Committed By: christos Date: Tue Sep 27 02:05:10 UTC 2011 Modified Files: src/sys/fs/smbfs: smbfs_smb.c src/sys/netsmb: smb.h Log Message: rename SMBFS_MAXFNAMELEN to SMBFS_MAXNAMLEN for consistency To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.42 src/sys/fs/smbfs/smbfs_smb.c cvs rdiff -u -r1.18 -r1.19 src/sys/netsmb/smb.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/ufs/ufs
Module Name:src
Committed By: christos
Date: Tue Sep 27 02:10:32 UTC 2011
Modified Files:
src/sys/ufs/ufs: ufs_vnops.c
Log Message:
include the proper headers to make {LFS,EXT2FS}_MAXNAMLEN visible
To generate a diff of this commit:
cvs rdiff -u -r1.204 -r1.205 src/sys/ufs/ufs/ufs_vnops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src Committed By: christos Date: Tue Sep 27 02:10:55 UTC 2011 Modified Files: src/sys/kern: vfs_lookup.c Log Message: include sys/dirent.h to make MAXNAMLEN visible. To generate a diff of this commit: cvs rdiff -u -r1.191 -r1.192 src/sys/kern/vfs_lookup.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
