Re: CVS commit: src/tests/libexec/ld.elf_so/helper_dso1
Module Name: src Committed By: joerg Date: Sat Apr 2 12:53:33 UTC 2011 Modified Files: src/tests/libexec/ld.elf_so/helper_dso1: h_helper_dso1.c Log Message: Don't fail on platforms without TLS BTW, should we skip building ld.elf_so tests in MKPIC=no case? (i.e. move them into src/distrib/sets/lists/tests/shl.mi) --- Izumi Tsutsui
CVS commit: src/sys/kern
Module Name:src Committed By: rmind Date: Sat Apr 2 06:48:22 UTC 2011 Modified Files: src/sys/kern: vfs_mount.c Log Message: Merge vfs_shutdown1() and vfs_shutdown(). To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/kern/vfs_mount.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_mount.c diff -u src/sys/kern/vfs_mount.c:1.2 src/sys/kern/vfs_mount.c:1.3 --- src/sys/kern/vfs_mount.c:1.2 Sat Apr 2 04:45:24 2011 +++ src/sys/kern/vfs_mount.c Sat Apr 2 06:48:20 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: vfs_mount.c,v 1.2 2011/04/02 04:45:24 rmind Exp $ */ +/* $NetBSD: vfs_mount.c,v 1.3 2011/04/02 06:48:20 rmind Exp $ */ /*- * Copyright (c) 1997-2011 The NetBSD Foundation, Inc. @@ -67,7 +67,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: vfs_mount.c,v 1.2 2011/04/02 04:45:24 rmind Exp $); +__KERNEL_RCSID(0, $NetBSD: vfs_mount.c,v 1.3 2011/04/02 06:48:20 rmind Exp $); #include sys/param.h #include sys/kernel.h @@ -1002,39 +1002,29 @@ printf(done\n); } -static void -vfs_shutdown1(struct lwp *l) +/* + * Sync and unmount file systems before shutting down. + */ +void +vfs_shutdown(void) { + lwp_t *l = curlwp; vfs_sync_all(l); /* - * If we've panic'd, don't make the situation potentially + * If we have paniced - do not make the situation potentially * worse by unmounting the file systems. */ - if (panicstr != NULL) + if (panicstr != NULL) { return; + } - /* Release inodes held by texts before update. */ -#ifdef notdef - vnshutdown(); -#endif /* Unmount file systems. */ vfs_unmountall(l); } /* - * Sync and unmount file systems before shutting down. - */ -void -vfs_shutdown(void) -{ - - /* XXX we're certainly not running in lwp0's context! */ - vfs_shutdown1(curlwp); -} - -/* * Print a list of supported file system types (used by vfs_mountroot) */ static void
CVS commit: src/sys/kern
Module Name:src Committed By: rmind Date: Sat Apr 2 07:33:50 UTC 2011 Modified Files: src/sys/kern: vfs_vnode.c Log Message: KNF, slightly improve few comments. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/kern/vfs_vnode.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_vnode.c diff -u src/sys/kern/vfs_vnode.c:1.3 src/sys/kern/vfs_vnode.c:1.4 --- src/sys/kern/vfs_vnode.c:1.3 Sat Apr 2 05:07:57 2011 +++ src/sys/kern/vfs_vnode.c Sat Apr 2 07:33:49 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: vfs_vnode.c,v 1.3 2011/04/02 05:07:57 rmind Exp $ */ +/* $NetBSD: vfs_vnode.c,v 1.4 2011/04/02 07:33:49 rmind Exp $ */ /*- * Copyright (c) 1997-2011 The NetBSD Foundation, Inc. @@ -91,7 +91,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: vfs_vnode.c,v 1.3 2011/04/02 05:07:57 rmind Exp $); +__KERNEL_RCSID(0, $NetBSD: vfs_vnode.c,v 1.4 2011/04/02 07:33:49 rmind Exp $); #include sys/param.h #include sys/kernel.h @@ -309,7 +309,7 @@ } /* - * Return the next vnode from the free list. + * getnewvnode: return the next vnode from the free list. */ int getnewvnode(enum vtagtype tag, struct mount *mp, int (**vops)(void *), @@ -323,9 +323,8 @@ try_again: if (mp != NULL) { /* - * Mark filesystem busy while we're creating a - * vnode. If unmount is in progress, this will - * fail. + * Mark filesystem busy while we are creating a vnode. + * If unmount is in progress, this will fail. */ error = vfs_busy(mp, NULL); if (error) @@ -384,7 +383,7 @@ } tablefull(vnode, increase kern.maxvnodes or NVNODE); *vpp = 0; - return (ENFILE); + return ENFILE; } vp-v_iflag = 0; vp-v_vflag = 0; @@ -405,7 +404,7 @@ vp-v_data = NULL; /* - * initialize uvm_object within vnode. + * Initialize uvm_object within vnode. */ uobj = vp-v_uobj; @@ -420,7 +419,7 @@ vfs_unbusy(mp, true, NULL); } - return (0); + return 0; } /* @@ -497,13 +496,15 @@ } /* - * Grab a particular vnode from the free list, increment its - * reference count and lock it. If the vnode lock bit is set the - * vnode is being eliminated in vgone. In that case, we can not - * grab the vnode, so the process is awakened when the transition is - * completed, and an error returned to indicate that the vnode is no - * longer usable (possibly having been changed to a new file system type). - * Called with v_interlock held. + * vget: get a particular vnode from the free list, increment its reference + * count and lock it. + * + * = Should be called with v_interlock held. + * + * If VI_XLOCK is set, the vnode is being eliminated in vgone()/vclean(). + * In that case, we cannot grab the vnode, so the process is awakened when + * the transition is completed, and an error returned to indicate that the + * vnode is no longer usable (e.g. changed to a new file system type). */ int vget(vnode_t *vp, int flags) @@ -556,7 +557,7 @@ } /* - * vput(), just unlock and vrele() + * vput: unlock and release the reference. */ void vput(vnode_t *vp) @@ -660,7 +661,7 @@ * our caller may hold other vnode locks; defer. */ defer = true; - } else { + } else { /* If we can't acquire the lock, then defer. */ vp-v_iflag = ~VI_INACTREDO; mutex_exit(vp-v_interlock); @@ -1029,7 +1030,7 @@ mutex_enter(vp-v_interlock); if (vp-v_usecount != 0) { mutex_exit(vp-v_interlock); - return (0); + return 0; } if (inter_lkp) { mutex_exit(inter_lkp); @@ -1038,7 +1039,7 @@ vp-v_usecount = 1; vclean(vp, DOCLOSE); vrelel(vp, 0); - return (1); + return 1; } /*
CVS commit: src/libexec/httpd
Module Name:src Committed By: mbalmer Date: Sat Apr 2 07:44:15 UTC 2011 Modified Files: src/libexec/httpd: bozohttpd.8 Log Message: fix typo, bump date To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/libexec/httpd/bozohttpd.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/libexec/httpd/bozohttpd.8 diff -u src/libexec/httpd/bozohttpd.8:1.26 src/libexec/httpd/bozohttpd.8:1.27 --- src/libexec/httpd/bozohttpd.8:1.26 Tue Mar 29 07:22:31 2011 +++ src/libexec/httpd/bozohttpd.8 Sat Apr 2 07:44:15 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: bozohttpd.8,v 1.26 2011/03/29 07:22:31 jmmv Exp $ +.\ $NetBSD: bozohttpd.8,v 1.27 2011/04/02 07:44:15 mbalmer Exp $ .\ .\ $eterna: bozohttpd.8,v 1.99 2010/09/20 22:26:28 mrg Exp $ .\ @@ -26,7 +26,7 @@ .\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\ SUCH DAMAGE. .\ -.Dd March 25, 2011 +.Dd April 2, 2011 .Dt HTTPD 8 .Os .Sh NAME @@ -605,4 +605,4 @@ for inclusion in future releaases. .Sh BUGS .Nm -does not handled HTTP/1.1 chunked input from the client yet. +does not handle HTTP/1.1 chunked input from the client yet.
CVS commit: src/usr.bin/make
Module Name:src Committed By: mbalmer Date: Sat Apr 2 07:58:31 UTC 2011 Modified Files: src/usr.bin/make: util.c Log Message: Declare variable only once. Fixes PR 44795. To generate a diff of this commit: cvs rdiff -u -r1.50 -r1.51 src/usr.bin/make/util.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.bin/make/util.c diff -u src/usr.bin/make/util.c:1.50 src/usr.bin/make/util.c:1.51 --- src/usr.bin/make/util.c:1.50 Thu Jun 3 15:40:16 2010 +++ src/usr.bin/make/util.c Sat Apr 2 07:58:30 2011 @@ -1,15 +1,15 @@ -/* $NetBSD: util.c,v 1.50 2010/06/03 15:40:16 sjg Exp $ */ +/* $NetBSD: util.c,v 1.51 2011/04/02 07:58:30 mbalmer Exp $ */ /* * Missing stuff from OS's */ #ifndef MAKE_NATIVE -static char rcsid[] = $NetBSD: util.c,v 1.50 2010/06/03 15:40:16 sjg Exp $; +static char rcsid[] = $NetBSD: util.c,v 1.51 2011/04/02 07:58:30 mbalmer Exp $; #else #include sys/cdefs.h #ifndef lint -__RCSID($NetBSD: util.c,v 1.50 2010/06/03 15:40:16 sjg Exp $); +__RCSID($NetBSD: util.c,v 1.51 2011/04/02 07:58:30 mbalmer Exp $); #endif #endif @@ -49,7 +49,7 @@ char *p, *q; for (i = 0; (q = environ[i]); i++) { - char *p = strchr(q, '='); + p = strchr(q, '='); if (p == NULL) continue; if (strncmp(name, q, len = p - q) == 0) {
CVS commit: src/sys
Module Name:src Committed By: mbalmer Date: Sat Apr 2 08:11:33 UTC 2011 Modified Files: src/sys/dev/ic: atw.c src/sys/dev/pci: if_vte.c if_wpi.c src/sys/dev/scsipi: if_se.c src/sys/kern: kern_module.c subr_autoconf.c src/sys/net: if_ppp.c src/sys/net80211: ieee80211_ioctl.c Log Message: Fix misplaced parenthesis. From henning.peter...@t-online.de, thanks. To generate a diff of this commit: cvs rdiff -u -r1.152 -r1.153 src/sys/dev/ic/atw.c cvs rdiff -u -r1.1 -r1.2 src/sys/dev/pci/if_vte.c cvs rdiff -u -r1.48 -r1.49 src/sys/dev/pci/if_wpi.c cvs rdiff -u -r1.82 -r1.83 src/sys/dev/scsipi/if_se.c cvs rdiff -u -r1.76 -r1.77 src/sys/kern/kern_module.c cvs rdiff -u -r1.213 -r1.214 src/sys/kern/subr_autoconf.c cvs rdiff -u -r1.132 -r1.133 src/sys/net/if_ppp.c cvs rdiff -u -r1.54 -r1.55 src/sys/net80211/ieee80211_ioctl.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/dev/ic/atw.c diff -u src/sys/dev/ic/atw.c:1.152 src/sys/dev/ic/atw.c:1.153 --- src/sys/dev/ic/atw.c:1.152 Sat Nov 13 08:54:23 2010 +++ src/sys/dev/ic/atw.c Sat Apr 2 08:11:32 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: atw.c,v 1.152 2010/11/13 08:54:23 uebayasi Exp $ */ +/* $NetBSD: atw.c,v 1.153 2011/04/02 08:11:32 mbalmer Exp $ */ /*- * Copyright (c) 1998, 1999, 2000, 2002, 2003, 2004 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: atw.c,v 1.152 2010/11/13 08:54:23 uebayasi Exp $); +__KERNEL_RCSID(0, $NetBSD: atw.c,v 1.153 2011/04/02 08:11:32 mbalmer Exp $); #include sys/param.h @@ -3890,7 +3890,7 @@ if ((error = kauth_authorize_network(curlwp-l_cred, KAUTH_NETWORK_INTERFACE, KAUTH_REQ_NETWORK_INTERFACE_SETPRIV, ifp, - (void *)cmd, NULL) != 0)) + (void *)cmd, NULL)) != 0) break; if (!(IEEE80211_FRAG_MIN = ireq-i_val ireq-i_val = IEEE80211_FRAG_MAX)) Index: src/sys/dev/pci/if_vte.c diff -u src/sys/dev/pci/if_vte.c:1.1 src/sys/dev/pci/if_vte.c:1.2 --- src/sys/dev/pci/if_vte.c:1.1 Wed Jan 26 18:48:13 2011 +++ src/sys/dev/pci/if_vte.c Sat Apr 2 08:11:31 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: if_vte.c,v 1.1 2011/01/26 18:48:13 bouyer Exp $ */ +/* $NetBSD: if_vte.c,v 1.2 2011/04/02 08:11:31 mbalmer Exp $ */ /* * Copyright (c) 2011 Manuel Bouyer. All rights reserved. @@ -55,7 +55,7 @@ /* Driver for DMP Electronics, Inc, Vortex86 RDC R6040 FastEthernet. */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: if_vte.c,v 1.1 2011/01/26 18:48:13 bouyer Exp $); +__KERNEL_RCSID(0, $NetBSD: if_vte.c,v 1.2 2011/04/02 08:11:31 mbalmer Exp $); #include sys/param.h #include sys/systm.h @@ -216,7 +216,7 @@ /* Reset the ethernet controller. */ vte_reset(sc); - if ((error = vte_dma_alloc(sc) != 0)) + if ((error = vte_dma_alloc(sc)) != 0) return; /* Load station address. */ Index: src/sys/dev/pci/if_wpi.c diff -u src/sys/dev/pci/if_wpi.c:1.48 src/sys/dev/pci/if_wpi.c:1.49 --- src/sys/dev/pci/if_wpi.c:1.48 Mon Nov 15 05:57:39 2010 +++ src/sys/dev/pci/if_wpi.c Sat Apr 2 08:11:31 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: if_wpi.c,v 1.48 2010/11/15 05:57:39 uebayasi Exp $*/ +/* $NetBSD: if_wpi.c,v 1.49 2011/04/02 08:11:31 mbalmer Exp $*/ /*- * Copyright (c) 2006, 2007 @@ -18,7 +18,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: if_wpi.c,v 1.48 2010/11/15 05:57:39 uebayasi Exp $); +__KERNEL_RCSID(0, $NetBSD: if_wpi.c,v 1.49 2011/04/02 08:11:31 mbalmer Exp $); /* * Driver for Intel PRO/Wireless 3945ABG 802.11 network adapters. @@ -1147,7 +1147,7 @@ } /* load firmware image from disk */ - if ((error = firmware_open(if_wpi,iwlwifi-3945.ucode, fw) != 0)) { + if ((error = firmware_open(if_wpi,iwlwifi-3945.ucode, fw)) != 0) { aprint_error_dev(sc-sc_dev, could not read firmware file\n); goto fail1; } Index: src/sys/dev/scsipi/if_se.c diff -u src/sys/dev/scsipi/if_se.c:1.82 src/sys/dev/scsipi/if_se.c:1.83 --- src/sys/dev/scsipi/if_se.c:1.82 Tue Jul 27 14:04:55 2010 +++ src/sys/dev/scsipi/if_se.c Sat Apr 2 08:11:32 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: if_se.c,v 1.82 2010/07/27 14:04:55 jakllsch Exp $ */ +/* $NetBSD: if_se.c,v 1.83 2011/04/02 08:11:32 mbalmer Exp $ */ /* * Copyright (c) 1997 Ian W. Dall ian.d...@dsto.defence.gov.au @@ -59,7 +59,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: if_se.c,v 1.82 2010/07/27 14:04:55 jakllsch Exp $); +__KERNEL_RCSID(0, $NetBSD: if_se.c,v 1.83 2011/04/02 08:11:32 mbalmer Exp $); #include opt_inet.h #include opt_atalk.h @@ -946,7 +946,7 @@ break; ifp-if_flags |= IFF_UP; - if ((error = se_set_media(sc, CMEDIA_AUTOSENSE) != 0)) + if ((error = se_set_media(sc, CMEDIA_AUTOSENSE)) != 0) break; switch (ifa-ifa_addr-sa_family) { Index: src/sys/kern/kern_module.c diff -u src/sys/kern/kern_module.c:1.76 src/sys/kern/kern_module.c:1.77 --- src/sys/kern/kern_module.c:1.76 Mon Feb
CVS commit: src/sys/dev/i2c
Module Name:src Committed By: mbalmer Date: Sat Apr 2 08:20:07 UTC 2011 Modified Files: src/sys/dev/i2c: pcf8583.c Log Message: Fix misplaced parenthesis. From henning.peter...@t-online.de, thanks. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/dev/i2c/pcf8583.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/dev/i2c/pcf8583.c diff -u src/sys/dev/i2c/pcf8583.c:1.12 src/sys/dev/i2c/pcf8583.c:1.13 --- src/sys/dev/i2c/pcf8583.c:1.12 Sat Dec 12 14:44:10 2009 +++ src/sys/dev/i2c/pcf8583.c Sat Apr 2 08:20:07 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: pcf8583.c,v 1.12 2009/12/12 14:44:10 tsutsui Exp $ */ +/* $NetBSD: pcf8583.c,v 1.13 2011/04/02 08:20:07 mbalmer Exp $ */ /* * Copyright (c) 2003 Wasabi Systems, Inc. @@ -43,7 +43,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: pcf8583.c,v 1.12 2009/12/12 14:44:10 tsutsui Exp $); +__KERNEL_RCSID(0, $NetBSD: pcf8583.c,v 1.13 2011/04/02 08:20:07 mbalmer Exp $); #include sys/param.h #include sys/systm.h @@ -290,7 +290,7 @@ clock_secs_to_ymdhms(tv-tv_sec, dt); - if ((err = pcfrtc_clock_write(sc, dt, tv-tv_usec / 1) == 0)) + if ((err = pcfrtc_clock_write(sc, dt, tv-tv_usec / 1)) != 0) return err; return (0);
CVS commit: src/bin
Module Name:src Committed By: mbalmer Date: Sat Apr 2 08:38:56 UTC 2011 Modified Files: src/bin/cp: cp.1 src/bin/ls: ls.1 Log Message: Wording fixes from Ryo HAYASAKA, thanks. To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 src/bin/cp/cp.1 cvs rdiff -u -r1.68 -r1.69 src/bin/ls/ls.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/bin/cp/cp.1 diff -u src/bin/cp/cp.1:1.37 src/bin/cp/cp.1:1.38 --- src/bin/cp/cp.1:1.37 Sun Feb 6 12:49:32 2011 +++ src/bin/cp/cp.1 Sat Apr 2 08:38:56 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: cp.1,v 1.37 2011/02/06 12:49:32 wiz Exp $ +.\ $NetBSD: cp.1,v 1.38 2011/04/02 08:38:56 mbalmer Exp $ .\ .\ Copyright (c) 1989, 1990, 1993, 1994 .\ The Regents of the University of California. All rights reserved. @@ -32,7 +32,7 @@ .\ .\ @(#)cp.1 8.3 (Berkeley) 4/18/94 .\ -.Dd February 6, 2010 +.Dd April 2, 2011 .Dt CP 1 .Os .Sh NAME @@ -139,7 +139,7 @@ .Nm copies the directory and the entire subtree connected at that point. This option also causes symbolic links to be copied, rather than -indirected through, and for +followed, and for .Nm to create special files rather than copying them as normal files. Created directories have the same mode as the corresponding source Index: src/bin/ls/ls.1 diff -u src/bin/ls/ls.1:1.68 src/bin/ls/ls.1:1.69 --- src/bin/ls/ls.1:1.68 Tue Mar 15 08:36:01 2011 +++ src/bin/ls/ls.1 Sat Apr 2 08:38:56 2011 @@ -1,4 +1,4 @@ -.\ $NetBSD: ls.1,v 1.68 2011/03/15 08:36:01 wiz Exp $ +.\ $NetBSD: ls.1,v 1.69 2011/04/02 08:38:56 mbalmer Exp $ .\ .\ Copyright (c) 1980, 1990, 1991, 1993, 1994 .\ The Regents of the University of California. All rights reserved. @@ -32,7 +32,7 @@ .\ .\ @(#)ls.1 8.7 (Berkeley) 7/29/94 .\ -.Dd September 25, 2008 +.Dd April 2, 2011 .Dt LS 1 .Os .Sh NAME @@ -94,7 +94,7 @@ .Pq Fl l . .It Fl d Directories are listed as plain files (not searched recursively) and -symbolic links in the argument list are not indirected through. +symbolic links in the argument list are not followed. .It Fl F Display a slash .Pq Sq \/
CVS commit: src/usr.sbin/pppd/pppd
Module Name:src Committed By: mbalmer Date: Sat Apr 2 10:19:27 UTC 2011 Modified Files: src/usr.sbin/pppd/pppd: sys-bsd.c Log Message: Fix PR 42923, from Takahiro HAYASHI, thanks. To generate a diff of this commit: cvs rdiff -u -r1.62 -r1.63 src/usr.sbin/pppd/pppd/sys-bsd.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/pppd/pppd/sys-bsd.c diff -u src/usr.sbin/pppd/pppd/sys-bsd.c:1.62 src/usr.sbin/pppd/pppd/sys-bsd.c:1.63 --- src/usr.sbin/pppd/pppd/sys-bsd.c:1.62 Wed Mar 10 13:45:39 2010 +++ src/usr.sbin/pppd/pppd/sys-bsd.c Sat Apr 2 10:19:27 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: sys-bsd.c,v 1.62 2010/03/10 13:45:39 christos Exp $ */ +/* $NetBSD: sys-bsd.c,v 1.63 2011/04/02 10:19:27 mbalmer Exp $ */ /* * sys-bsd.c - System-dependent procedures for setting up @@ -79,7 +79,7 @@ #if 0 #define RCSID Id: sys-bsd.c,v 1.47 2000/04/13 12:04:23 paulus Exp #else -__RCSID($NetBSD: sys-bsd.c,v 1.62 2010/03/10 13:45:39 christos Exp $); +__RCSID($NetBSD: sys-bsd.c,v 1.63 2011/04/02 10:19:27 mbalmer Exp $); #endif #endif @@ -793,7 +793,7 @@ addreq6.ifra_prefixmask.sin6_len = sizeof(struct sockaddr_in6); memset(addreq6.ifra_prefixmask.sin6_addr, 0xff, sizeof(addreq6.ifra_prefixmask.sin6_addr) - sizeof(our_eui64)); -memset(addreq6.ifra_prefixmask.sin6_addr + +memset((char *)addreq6.ifra_prefixmask.sin6_addr + sizeof(addreq6.ifra_prefixmask.sin6_addr) - sizeof(our_eui64), 0x00, sizeof(our_eui64));
CVS commit: src/sys/arch/vax/vax
Module Name:src Committed By: martin Date: Sat Apr 2 10:21:58 UTC 2011 Modified Files: src/sys/arch/vax/vax: sbi.c Log Message: Do not increment a bool var - from Henning Petersen, PR port-vax/44816. To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.37 src/sys/arch/vax/vax/sbi.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/vax/vax/sbi.c diff -u src/sys/arch/vax/vax/sbi.c:1.36 src/sys/arch/vax/vax/sbi.c:1.37 --- src/sys/arch/vax/vax/sbi.c:1.36 Tue Dec 14 23:44:49 2010 +++ src/sys/arch/vax/vax/sbi.c Sat Apr 2 10:21:58 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: sbi.c,v 1.36 2010/12/14 23:44:49 matt Exp $ */ +/* $NetBSD: sbi.c,v 1.37 2011/04/02 10:21:58 martin Exp $ */ /* * Copyright (c) 1994 Ludd, University of Lule}, Sweden. * All rights reserved. @@ -38,7 +38,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: sbi.c,v 1.36 2010/12/14 23:44:49 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: sbi.c,v 1.37 2011/04/02 10:21:58 martin Exp $); #include sys/param.h #include sys/systm.h @@ -76,7 +76,7 @@ case NEX_CI: aprint_naive(ci at %s, name); aprint_normal(ci at %s, name); - unsupp++; + unsupp = true; break; default: aprint_naive(unknown device 0x%x at %s,
CVS commit: src/lib/libpam/modules/pam_krb5
Module Name:src Committed By: mbalmer Date: Sat Apr 2 10:22:09 UTC 2011 Modified Files: src/lib/libpam/modules/pam_krb5: pam_krb5.c Log Message: Fix misplaced parenthesis, from henning.peter...@t-online.de, thanks. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/lib/libpam/modules/pam_krb5/pam_krb5.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libpam/modules/pam_krb5/pam_krb5.c diff -u src/lib/libpam/modules/pam_krb5/pam_krb5.c:1.22 src/lib/libpam/modules/pam_krb5/pam_krb5.c:1.23 --- src/lib/libpam/modules/pam_krb5/pam_krb5.c:1.22 Sun Mar 8 19:38:03 2009 +++ src/lib/libpam/modules/pam_krb5/pam_krb5.c Sat Apr 2 10:22:09 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: pam_krb5.c,v 1.22 2009/03/08 19:38:03 christos Exp $ */ +/* $NetBSD: pam_krb5.c,v 1.23 2011/04/02 10:22:09 mbalmer Exp $ */ /*- * This pam_krb5 module contains code that is: @@ -53,7 +53,7 @@ #ifdef __FreeBSD__ __FBSDID($FreeBSD: src/lib/libpam/modules/pam_krb5/pam_krb5.c,v 1.22 2005/01/24 16:49:50 rwatson Exp $); #else -__RCSID($NetBSD: pam_krb5.c,v 1.22 2009/03/08 19:38:03 christos Exp $); +__RCSID($NetBSD: pam_krb5.c,v 1.23 2011/04/02 10:22:09 mbalmer Exp $); #endif #include sys/types.h @@ -540,7 +540,7 @@ /* Copy the creds (should be two of them) */ while ((krbret = krb5_cc_next_cred(pam_context, ccache_temp, -cursor, creds) == 0)) { +cursor, creds)) == 0) { krbret = krb5_cc_store_cred(pam_context, ccache_perm, creds); if (krbret != 0) {
CVS commit: src/libexec/ld.elf_so
Module Name:src Committed By: joerg Date: Sat Apr 2 12:30:41 UTC 2011 Modified Files: src/libexec/ld.elf_so: rtld.c Log Message: Unbreak HPPA To generate a diff of this commit: cvs rdiff -u -r1.148 -r1.149 src/libexec/ld.elf_so/rtld.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/libexec/ld.elf_so/rtld.c diff -u src/libexec/ld.elf_so/rtld.c:1.148 src/libexec/ld.elf_so/rtld.c:1.149 --- src/libexec/ld.elf_so/rtld.c:1.148 Tue Mar 29 20:56:35 2011 +++ src/libexec/ld.elf_so/rtld.c Sat Apr 2 12:30:41 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: rtld.c,v 1.148 2011/03/29 20:56:35 joerg Exp $ */ +/* $NetBSD: rtld.c,v 1.149 2011/04/02 12:30:41 joerg Exp $ */ /* * Copyright 1996 John D. Polstra. @@ -40,7 +40,7 @@ #include sys/cdefs.h #ifndef lint -__RCSID($NetBSD: rtld.c,v 1.148 2011/03/29 20:56:35 joerg Exp $); +__RCSID($NetBSD: rtld.c,v 1.149 2011/04/02 12:30:41 joerg Exp $); #endif /* not lint */ #include sys/param.h @@ -1147,6 +1147,9 @@ const Elf_Sym *def, *best_def; void *symbol_addr; unsigned long symoffset; +#ifdef __HAVE_FUNCTION_DESCRIPTORS + sigset_t mask; +#endif dbg((dladdr of %p, addr)); @@ -1405,6 +1408,24 @@ } } +void +_rtld_lock(int arg, sigset_t *mask) +{ + switch (arg) { + default: + dbg((%s: invalid argument: %d, __func__, arg)); + break; + case RTLD_LOCK_PRE_FORK: + _rtld_exclusive_enter(mask); + _rtld_mutex_may_recurse = true; + break; + case RTLD_LOCK_POST_FORK: + _rtld_mutex_may_recurse = false; + _rtld_exclusive_exit(mask); + break; + } +} + #define RTLD_EXCLUSIVE_MASK 0x8000U static volatile unsigned int _rtld_mutex; static volatile unsigned int _rtld_waiter_exclusive;
CVS commit: src/tests/libexec/ld.elf_so/helper_dso1
Module Name:src Committed By: joerg Date: Sat Apr 2 12:53:33 UTC 2011 Modified Files: src/tests/libexec/ld.elf_so/helper_dso1: h_helper_dso1.c Log Message: Don't fail on platforms without TLS To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 \ src/tests/libexec/ld.elf_so/helper_dso1/h_helper_dso1.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/libexec/ld.elf_so/helper_dso1/h_helper_dso1.c diff -u src/tests/libexec/ld.elf_so/helper_dso1/h_helper_dso1.c:1.1 src/tests/libexec/ld.elf_so/helper_dso1/h_helper_dso1.c:1.2 --- src/tests/libexec/ld.elf_so/helper_dso1/h_helper_dso1.c:1.1 Thu Mar 31 23:34:48 2011 +++ src/tests/libexec/ld.elf_so/helper_dso1/h_helper_dso1.c Sat Apr 2 12:53:32 2011 @@ -29,6 +29,11 @@ #include poll.h #include stddef.h +#include sys/tls.h + +#if !defined(__HAVE_TLS_VARIANT_I) !defined(__HAVE_TLS_VARIANT_II) +#define __thread +#endif extern int sleep_init; extern int sleep_fini;
CVS commit: src
Module Name:src Committed By: hannken Date: Sat Apr 2 14:24:53 UTC 2011 Modified Files: src/sys/fs/tmpfs: tmpfs_vfsops.c src/tests/fs/vfs: t_vfsops.c Log Message: Fix file handle operations for tmpfs by removing a now bogus test and fixing the return value of tmpfs_fhtovp() in the not-found case. When vmlocking2 was merged to head (Jan 2008 !!) the inode numbering was changed. Before inodes were numbered 2..tm_nodes_max-1 and after the merge the numbers are derived from the nodes memory address. Fixes PR #43605 (tmpfs file handles are broken) To generate a diff of this commit: cvs rdiff -u -r1.46 -r1.47 src/sys/fs/tmpfs/tmpfs_vfsops.c cvs rdiff -u -r1.9 -r1.10 src/tests/fs/vfs/t_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/tmpfs/tmpfs_vfsops.c diff -u src/sys/fs/tmpfs/tmpfs_vfsops.c:1.46 src/sys/fs/tmpfs/tmpfs_vfsops.c:1.47 --- src/sys/fs/tmpfs/tmpfs_vfsops.c:1.46 Sat Jun 26 03:38:14 2010 +++ src/sys/fs/tmpfs/tmpfs_vfsops.c Sat Apr 2 14:24:53 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: tmpfs_vfsops.c,v 1.46 2010/06/26 03:38:14 rmind Exp $ */ +/* $NetBSD: tmpfs_vfsops.c,v 1.47 2011/04/02 14:24:53 hannken 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.46 2010/06/26 03:38:14 rmind Exp $); +__KERNEL_RCSID(0, $NetBSD: tmpfs_vfsops.c,v 1.47 2011/04/02 14:24:53 hannken Exp $); #include sys/param.h #include sys/types.h @@ -278,9 +278,6 @@ memcpy(tfh, fhp, sizeof(struct tmpfs_fid)); - if (tfh.tf_id = tmp-tm_nodes_max) - return EINVAL; - found = false; mutex_enter(tmp-tm_lock); LIST_FOREACH(node, tmp-tm_nodes, tn_entries) { @@ -293,7 +290,7 @@ mutex_exit(tmp-tm_lock); /* XXXAD nothing to prevent 'node' from being removed. */ - return found ? tmpfs_alloc_vp(mp, node, vpp) : EINVAL; + return found ? tmpfs_alloc_vp(mp, node, vpp) : ESTALE; } /* - */ Index: src/tests/fs/vfs/t_vfsops.c diff -u src/tests/fs/vfs/t_vfsops.c:1.9 src/tests/fs/vfs/t_vfsops.c:1.10 --- src/tests/fs/vfs/t_vfsops.c:1.9 Fri Jan 7 12:01:11 2011 +++ src/tests/fs/vfs/t_vfsops.c Sat Apr 2 14:24:53 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: t_vfsops.c,v 1.9 2011/01/07 12:01:11 pooka Exp $ */ +/* $NetBSD: t_vfsops.c,v 1.10 2011/04/02 14:24:53 hannken Exp $ */ /*- * Copyright (c) 2010 The NetBSD Foundation, Inc. @@ -108,11 +108,6 @@ /* open file based on file handle */ fd = rump_sys_fhopen(fhp, fhsize, O_RDONLY); - if (FSTYPE_TMPFS(tc)) { - atf_tc_expect_fail(PR kern/43605); - if (fd != -1 || errno != EINVAL) - atf_tc_expect_pass(); - } if (fd == -1) { atf_tc_fail_errno(fhopen); } @@ -154,8 +149,6 @@ if (FSTYPE_MSDOS(tc) || FSTYPE_LFS(tc)) atf_tc_expect_fail(fhopen() for removed file succeeds (PR kern/43745)); - if (FSTYPE_TMPFS(tc)) - atf_tc_expect_fail(PR kern/43605); ATF_REQUIRE_ERRNO(ESTALE, rump_sys_fhopen(fhp, fhsize, O_RDONLY) == -1); atf_tc_expect_pass(); @@ -175,8 +168,6 @@ unsigned long seed; int fd; - /* XXX: this test succeeds accidentally on tmpfs, PR kern/43605 */ - srandom(seed = time(NULL)); printf(RNG seed %lu\n, seed);
CVS commit: src/libexec/ld.elf_so
Module Name:src Committed By: joerg Date: Sat Apr 2 16:49:49 UTC 2011 Modified Files: src/libexec/ld.elf_so: rtld.c Log Message: Revert pthread_atfork related change not intended for commit yet. To generate a diff of this commit: cvs rdiff -u -r1.149 -r1.150 src/libexec/ld.elf_so/rtld.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/libexec/ld.elf_so/rtld.c diff -u src/libexec/ld.elf_so/rtld.c:1.149 src/libexec/ld.elf_so/rtld.c:1.150 --- src/libexec/ld.elf_so/rtld.c:1.149 Sat Apr 2 12:30:41 2011 +++ src/libexec/ld.elf_so/rtld.c Sat Apr 2 16:49:49 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: rtld.c,v 1.149 2011/04/02 12:30:41 joerg Exp $ */ +/* $NetBSD: rtld.c,v 1.150 2011/04/02 16:49:49 joerg Exp $ */ /* * Copyright 1996 John D. Polstra. @@ -40,7 +40,7 @@ #include sys/cdefs.h #ifndef lint -__RCSID($NetBSD: rtld.c,v 1.149 2011/04/02 12:30:41 joerg Exp $); +__RCSID($NetBSD: rtld.c,v 1.150 2011/04/02 16:49:49 joerg Exp $); #endif /* not lint */ #include sys/param.h @@ -1408,24 +1408,6 @@ } } -void -_rtld_lock(int arg, sigset_t *mask) -{ - switch (arg) { - default: - dbg((%s: invalid argument: %d, __func__, arg)); - break; - case RTLD_LOCK_PRE_FORK: - _rtld_exclusive_enter(mask); - _rtld_mutex_may_recurse = true; - break; - case RTLD_LOCK_POST_FORK: - _rtld_mutex_may_recurse = false; - _rtld_exclusive_exit(mask); - break; - } -} - #define RTLD_EXCLUSIVE_MASK 0x8000U static volatile unsigned int _rtld_mutex; static volatile unsigned int _rtld_waiter_exclusive;
CVS commit: src/sys/dev/scsipi
Module Name:src Committed By: macallan Date: Sat Apr 2 20:52:10 UTC 2011 Modified Files: src/sys/dev/scsipi: scsiconf.c Log Message: Add a quirks entry for Seagate SX173404LC drives, now they will work at higher speeds than 8bit/async While there, also disable sync for ZIP drives - at least some of them will pretend to support sync and then act up. To generate a diff of this commit: cvs rdiff -u -r1.258 -r1.259 src/sys/dev/scsipi/scsiconf.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/dev/scsipi/scsiconf.c diff -u src/sys/dev/scsipi/scsiconf.c:1.258 src/sys/dev/scsipi/scsiconf.c:1.259 --- src/sys/dev/scsipi/scsiconf.c:1.258 Mon Jun 7 01:41:39 2010 +++ src/sys/dev/scsipi/scsiconf.c Sat Apr 2 20:52:10 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: scsiconf.c,v 1.258 2010/06/07 01:41:39 pgoyette Exp $ */ +/* $NetBSD: scsiconf.c,v 1.259 2011/04/02 20:52:10 macallan Exp $ */ /*- * Copyright (c) 1998, 1999, 2004 The NetBSD Foundation, Inc. @@ -48,7 +48,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: scsiconf.c,v 1.258 2010/06/07 01:41:39 pgoyette Exp $); +__KERNEL_RCSID(0, $NetBSD: scsiconf.c,v 1.259 2011/04/02 20:52:10 macallan Exp $); #include sys/param.h #include sys/systm.h @@ -604,9 +604,11 @@ FUJITSU , M2624S-512 , }, PQUIRK_CAP_SYNC}, {{T_DIRECT, T_FIXED, SEAGATE , SX336704LC , }, PQUIRK_CAP_SYNC | PQUIRK_CAP_WIDE16}, + {{T_DIRECT, T_FIXED, + SEAGATE , SX173404LC, }, PQUIRK_CAP_SYNC | PQUIRK_CAP_WIDE16}, {{T_DIRECT, T_REMOV, - IOMEGA, ZIP 100, J.03}, PQUIRK_NOLUNS}, + IOMEGA, ZIP 100, J.03}, PQUIRK_NOLUNS|PQUIRK_NOSYNC}, {{T_DIRECT, T_REMOV, INSITE, I325VM, }, PQUIRK_NOLUNS},
CVS commit: src/sys/kern
Module Name:src Committed By: rmind Date: Sat Apr 2 23:05:51 UTC 2011 Modified Files: src/sys/kern: vnode_if.src Log Message: Update UCB license (3rd clause drop). To generate a diff of this commit: cvs rdiff -u -r1.60 -r1.61 src/sys/kern/vnode_if.src 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/vnode_if.src diff -u src/sys/kern/vnode_if.src:1.60 src/sys/kern/vnode_if.src:1.61 --- src/sys/kern/vnode_if.src:1.60 Sun Jan 2 06:58:45 2011 +++ src/sys/kern/vnode_if.src Sat Apr 2 23:05:50 2011 @@ -1,4 +1,4 @@ -# $NetBSD: vnode_if.src,v 1.60 2011/01/02 06:58:45 dholland Exp $ +# $NetBSD: vnode_if.src,v 1.61 2011/04/02 23:05:50 rmind Exp $ # # Copyright (c) 1992, 1993 # The Regents of the University of California. All rights reserved. @@ -11,11 +11,7 @@ # 2. Redistributions in binary form must reproduce the above copyright #notice, this list of conditions and the following disclaimer in the #documentation and/or other materials provided with the distribution. -# 3. All advertising materials mentioning features or use of this software -#must display the following acknowledgement: -# This product includes software developed by the University of -# California, Berkeley and its contributors. -# 4. Neither the name of the University nor the names of its contributors +# 3. Neither the name of the University nor the names of its contributors #may be used to endorse or promote products derived from this software #without specific prior written permission. #
CVS commit: src/sys
Module Name:src Committed By: rmind Date: Sun Apr 3 01:19:37 UTC 2011 Modified Files: src/sys/kern: vnode_if.sh src/sys/miscfs/genfs: layer_vnops.c src/sys/miscfs/umapfs: umap_vnops.c src/sys/sys: vnode.h src/sys/ufs/lfs: lfs_segment.c Log Message: - Use offsetof() in VOPARG_OFFSETOF() instead of re-implementing it. - Remove VDESC_NOMAP_VPP and VDESC_VPP_WILLRELE. - Remove VRELEL_NOINACTIVE and VRELEL_ONHEAD. To generate a diff of this commit: cvs rdiff -u -r1.56 -r1.57 src/sys/kern/vnode_if.sh cvs rdiff -u -r1.46 -r1.47 src/sys/miscfs/genfs/layer_vnops.c cvs rdiff -u -r1.51 -r1.52 src/sys/miscfs/umapfs/umap_vnops.c cvs rdiff -u -r1.226 -r1.227 src/sys/sys/vnode.h cvs rdiff -u -r1.219 -r1.220 src/sys/ufs/lfs/lfs_segment.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/vnode_if.sh diff -u src/sys/kern/vnode_if.sh:1.56 src/sys/kern/vnode_if.sh:1.57 --- src/sys/kern/vnode_if.sh:1.56 Wed Apr 14 13:58:51 2010 +++ src/sys/kern/vnode_if.sh Sun Apr 3 01:19:37 2011 @@ -29,7 +29,7 @@ * SUCH DAMAGE. */ -SCRIPT_ID='$NetBSD: vnode_if.sh,v 1.56 2010/04/14 13:58:51 pooka Exp $' +SCRIPT_ID='$NetBSD: vnode_if.sh,v 1.57 2011/04/03 01:19:37 rmind Exp $' # Script to produce VFS front-end sugar. # @@ -368,11 +368,7 @@ } else { word = RELE; } - if (argdir[i] ~ /OUT/) { -printf( | VDESC_VPP_WILL%s, word); - } else { -printf( | VDESC_VP%s_WILL%s, vpnum, word); - }; + printf( | VDESC_VP%s_WILL%s, vpnum, word); vpnum++; } } Index: src/sys/miscfs/genfs/layer_vnops.c diff -u src/sys/miscfs/genfs/layer_vnops.c:1.46 src/sys/miscfs/genfs/layer_vnops.c:1.47 --- src/sys/miscfs/genfs/layer_vnops.c:1.46 Thu Jan 13 10:28:38 2011 +++ src/sys/miscfs/genfs/layer_vnops.c Sun Apr 3 01:19:35 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: layer_vnops.c,v 1.46 2011/01/13 10:28:38 hannken Exp $ */ +/* $NetBSD: layer_vnops.c,v 1.47 2011/04/03 01:19:35 rmind Exp $ */ /* * Copyright (c) 1999 National Aeronautics Space Administration @@ -170,7 +170,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: layer_vnops.c,v 1.46 2011/01/13 10:28:38 hannken Exp $); +__KERNEL_RCSID(0, $NetBSD: layer_vnops.c,v 1.47 2011/04/03 01:19:35 rmind Exp $); #include sys/param.h #include sys/systm.h @@ -311,17 +311,7 @@ * (Assumes that the lower layer always returns * a VREF'ed vpp unless it gets an error.) */ - if (descp-vdesc_vpp_offset != VDESC_NO_OFFSET - !(descp-vdesc_flags VDESC_NOMAP_VPP) - !error) { - /* - * XXX - even though some ops have vpp returned vp's, - * several ops actually vrele this before returning. - * We must avoid these ops. - * (This should go away when these ops are regularized.) - */ - if (descp-vdesc_flags VDESC_VPP_WILLRELE) - goto out; + if (descp-vdesc_vpp_offset != VDESC_NO_OFFSET !error) { vppp = VOPARG_OFFSETTO(struct vnode***, descp-vdesc_vpp_offset, ap); /* @@ -338,7 +328,6 @@ **vppp = NULL; } } -out: return error; } Index: src/sys/miscfs/umapfs/umap_vnops.c diff -u src/sys/miscfs/umapfs/umap_vnops.c:1.51 src/sys/miscfs/umapfs/umap_vnops.c:1.52 --- src/sys/miscfs/umapfs/umap_vnops.c:1.51 Mon Jan 10 11:11:04 2011 +++ src/sys/miscfs/umapfs/umap_vnops.c Sun Apr 3 01:19:36 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: umap_vnops.c,v 1.51 2011/01/10 11:11:04 hannken Exp $ */ +/* $NetBSD: umap_vnops.c,v 1.52 2011/04/03 01:19:36 rmind Exp $ */ /* * Copyright (c) 1992, 1993 @@ -39,7 +39,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: umap_vnops.c,v 1.51 2011/01/10 11:11:04 hannken Exp $); +__KERNEL_RCSID(0, $NetBSD: umap_vnops.c,v 1.52 2011/04/03 01:19:36 rmind Exp $); #include sys/param.h #include sys/systm.h @@ -269,17 +269,7 @@ * (Assumes that the lower layer always returns * a VREF'ed vpp unless it gets an error.) */ - if (descp-vdesc_vpp_offset != VDESC_NO_OFFSET - !(descp-vdesc_flags VDESC_NOMAP_VPP) - !error) { - /* - * XXX - even though some ops have vpp returned vp's, - * several ops actually vrele this before returning. - * We must avoid these ops. - * (This should go away when these ops are regularized.) - */ - if (descp-vdesc_flags VDESC_VPP_WILLRELE) - goto out; + if (descp-vdesc_vpp_offset != VDESC_NO_OFFSET !error) { vppp = VOPARG_OFFSETTO(struct vnode***, descp-vdesc_vpp_offset, ap); /* @@ -297,7 +287,6 @@ } } - out: /* * Free duplicate cred structure and restore old one. */ Index: src/sys/sys/vnode.h diff -u src/sys/sys/vnode.h:1.226 src/sys/sys/vnode.h:1.227 --- src/sys/sys/vnode.h:1.226 Sat Apr 2 05:07:56 2011 +++ src/sys/sys/vnode.h Sun Apr 3 01:19:36 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: vnode.h,v 1.226 2011/04/02 05:07:56 rmind Exp $ */ +/* $NetBSD: vnode.h,v 1.227 2011/04/03 01:19:36 rmind Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -433,8 +433,6
CVS commit: src/sys/kern
Module Name:src Committed By: rmind Date: Sun Apr 3 01:20:24 UTC 2011 Modified Files: src/sys/kern: vfs_mount.c Log Message: vfs_insmntque: convert check to assert. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/kern/vfs_mount.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_mount.c diff -u src/sys/kern/vfs_mount.c:1.3 src/sys/kern/vfs_mount.c:1.4 --- src/sys/kern/vfs_mount.c:1.3 Sat Apr 2 06:48:20 2011 +++ src/sys/kern/vfs_mount.c Sun Apr 3 01:20:23 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: vfs_mount.c,v 1.3 2011/04/02 06:48:20 rmind Exp $ */ +/* $NetBSD: vfs_mount.c,v 1.4 2011/04/03 01:20:23 rmind Exp $ */ /*- * Copyright (c) 1997-2011 The NetBSD Foundation, Inc. @@ -67,7 +67,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: vfs_mount.c,v 1.3 2011/04/02 06:48:20 rmind Exp $); +__KERNEL_RCSID(0, $NetBSD: vfs_mount.c,v 1.4 2011/04/03 01:20:23 rmind Exp $); #include sys/param.h #include sys/kernel.h @@ -376,13 +376,8 @@ { struct mount *omp; -#ifdef DIAGNOSTIC - if ((mp != NULL) - (mp-mnt_iflag IMNT_UNMOUNT) - vp-v_tag != VT_VFS) { - panic(insmntque into dying filesystem); - } -#endif + KASSERT(mp == NULL || (mp-mnt_iflag IMNT_UNMOUNT) == 0 || + vp-v_tag == VT_VFS); mutex_enter(mntvnode_lock); /*
CVS commit: src/sys/arch/pmax/pmax
Module Name:src Committed By: mhitch Date: Sun Apr 3 03:19:52 UTC 2011 Modified Files: src/sys/arch/pmax/pmax: dec_3maxplus.c dec_3min.c dec_maxine.c Log Message: Fix pmax timecounters for mips3-class machines. Apparently no one else has run a 5000/150 with 5.0 or later - I booted 5.0 a couple of time, but clamd caused a hard hang. Now that I've given up trying to run clamd on my 5000/150, I noticed that time ran too fast while using the mips3_cp0_counter source. The cpu_mhz computed in mc_cpuspeed is the CP0 clock speed, not the doubled CPU clock. Also add the mips3_cp0_counter timecounters for the 5000/50 (maxine) and 5000/260 (3maxplus). To generate a diff of this commit: cvs rdiff -u -r1.66 -r1.67 src/sys/arch/pmax/pmax/dec_3maxplus.c cvs rdiff -u -r1.69 -r1.70 src/sys/arch/pmax/pmax/dec_3min.c cvs rdiff -u -r1.61 -r1.62 src/sys/arch/pmax/pmax/dec_maxine.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/pmax/pmax/dec_3maxplus.c diff -u src/sys/arch/pmax/pmax/dec_3maxplus.c:1.66 src/sys/arch/pmax/pmax/dec_3maxplus.c:1.67 --- src/sys/arch/pmax/pmax/dec_3maxplus.c:1.66 Sun Feb 20 07:50:25 2011 +++ src/sys/arch/pmax/pmax/dec_3maxplus.c Sun Apr 3 03:19:52 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: dec_3maxplus.c,v 1.66 2011/02/20 07:50:25 matt Exp $ */ +/* $NetBSD: dec_3maxplus.c,v 1.67 2011/04/03 03:19:52 mhitch Exp $ */ /* * Copyright (c) 1998 Jonathan Stone. All rights reserved. @@ -70,7 +70,7 @@ #define __INTR_PRIVATE #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: dec_3maxplus.c,v 1.66 2011/02/20 07:50:25 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: dec_3maxplus.c,v 1.67 2011/04/03 03:19:52 mhitch Exp $); #include sys/param.h #include sys/systm.h @@ -433,6 +433,14 @@ static void dec_3maxplus_tc_init(void) { +#if defined(MIPS3) + static struct timecounter tc3 = { + .tc_get_timecount = (timecounter_get_t *)mips3_cp0_count_read, + .tc_counter_mask = ~0u, + .tc_name = mips3_cp0_counter, + .tc_quality = 200, + }; +#endif static struct timecounter tc = { .tc_get_timecount = dec_3maxplus_get_timecount, .tc_quality = 100, @@ -442,4 +450,12 @@ }; tc_init(tc); + +#if defined(MIPS3) + if (MIPS_HAS_CLOCK) { + tc3.tc_frequency = mips_options.mips_cpu_mhz * 100; + + tc_init(tc3); + } +#endif } Index: src/sys/arch/pmax/pmax/dec_3min.c diff -u src/sys/arch/pmax/pmax/dec_3min.c:1.69 src/sys/arch/pmax/pmax/dec_3min.c:1.70 --- src/sys/arch/pmax/pmax/dec_3min.c:1.69 Thu Mar 10 17:13:13 2011 +++ src/sys/arch/pmax/pmax/dec_3min.c Sun Apr 3 03:19:52 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: dec_3min.c,v 1.69 2011/03/10 17:13:13 tsutsui Exp $ */ +/* $NetBSD: dec_3min.c,v 1.70 2011/04/03 03:19:52 mhitch Exp $ */ /* * Copyright (c) 1998 Jonathan Stone. All rights reserved. @@ -70,7 +70,7 @@ #define __INTR_PRIVATE #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: dec_3min.c,v 1.69 2011/03/10 17:13:13 tsutsui Exp $); +__KERNEL_RCSID(0, $NetBSD: dec_3min.c,v 1.70 2011/04/03 03:19:52 mhitch Exp $); #include sys/param.h #include sys/systm.h @@ -469,9 +469,6 @@ if (MIPS_HAS_CLOCK) { tc.tc_frequency = mips_options.mips_cpu_mhz * 100; - if (mips_options.mips_cpu_flags CPU_MIPS_DOUBLE_COUNT) { - tc.tc_frequency /= 2; - } tc_init(tc); } Index: src/sys/arch/pmax/pmax/dec_maxine.c diff -u src/sys/arch/pmax/pmax/dec_maxine.c:1.61 src/sys/arch/pmax/pmax/dec_maxine.c:1.62 --- src/sys/arch/pmax/pmax/dec_maxine.c:1.61 Sun Feb 20 07:50:25 2011 +++ src/sys/arch/pmax/pmax/dec_maxine.c Sun Apr 3 03:19:52 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: dec_maxine.c,v 1.61 2011/02/20 07:50:25 matt Exp $ */ +/* $NetBSD: dec_maxine.c,v 1.62 2011/04/03 03:19:52 mhitch Exp $ */ /* * Copyright (c) 1998 Jonathan Stone. All rights reserved. @@ -70,7 +70,7 @@ #define __INTR_PRIVATE #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: dec_maxine.c,v 1.61 2011/02/20 07:50:25 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: dec_maxine.c,v 1.62 2011/04/03 03:19:52 mhitch Exp $); #include sys/param.h #include sys/systm.h @@ -380,6 +380,14 @@ static void dec_maxine_tc_init(void) { +#if defined(MIPS3) + static struct timecounter tc3 = { + .tc_get_timecount = (timecounter_get_t *)mips3_cp0_count_read, + .tc_counter_mask = ~0u, + .tc_name = mips3_cp0_counter, + .tc_quality = 200, + }; +#endif static struct timecounter tc = { .tc_get_timecount = dec_maxine_get_timecount, .tc_quality = 100, @@ -389,4 +397,12 @@ }; tc_init(tc); + +#if defined(MIPS3) + if (MIPS_HAS_CLOCK) { + tc3.tc_frequency = mips_options.mips_cpu_mhz * 100; + + tc_init(tc3); + } +#endif }
CVS commit: src/sys/kern
Module Name:src Committed By: rmind Date: Sat Apr 2 06:48:22 UTC 2011 Modified Files: src/sys/kern: vfs_mount.c Log Message: Merge vfs_shutdown1() and vfs_shutdown(). To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/kern/vfs_mount.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: rmind Date: Sat Apr 2 07:33:50 UTC 2011 Modified Files: src/sys/kern: vfs_vnode.c Log Message: KNF, slightly improve few comments. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/kern/vfs_vnode.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/libexec/httpd
Module Name:src Committed By: mbalmer Date: Sat Apr 2 07:44:15 UTC 2011 Modified Files: src/libexec/httpd: bozohttpd.8 Log Message: fix typo, bump date To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/libexec/httpd/bozohttpd.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/make
Module Name:src Committed By: mbalmer Date: Sat Apr 2 07:58:31 UTC 2011 Modified Files: src/usr.bin/make: util.c Log Message: Declare variable only once. Fixes PR 44795. To generate a diff of this commit: cvs rdiff -u -r1.50 -r1.51 src/usr.bin/make/util.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: mbalmer Date: Sat Apr 2 08:11:33 UTC 2011 Modified Files: src/sys/dev/ic: atw.c src/sys/dev/pci: if_vte.c if_wpi.c src/sys/dev/scsipi: if_se.c src/sys/kern: kern_module.c subr_autoconf.c src/sys/net: if_ppp.c src/sys/net80211: ieee80211_ioctl.c Log Message: Fix misplaced parenthesis. From henning.peter...@t-online.de, thanks. To generate a diff of this commit: cvs rdiff -u -r1.152 -r1.153 src/sys/dev/ic/atw.c cvs rdiff -u -r1.1 -r1.2 src/sys/dev/pci/if_vte.c cvs rdiff -u -r1.48 -r1.49 src/sys/dev/pci/if_wpi.c cvs rdiff -u -r1.82 -r1.83 src/sys/dev/scsipi/if_se.c cvs rdiff -u -r1.76 -r1.77 src/sys/kern/kern_module.c cvs rdiff -u -r1.213 -r1.214 src/sys/kern/subr_autoconf.c cvs rdiff -u -r1.132 -r1.133 src/sys/net/if_ppp.c cvs rdiff -u -r1.54 -r1.55 src/sys/net80211/ieee80211_ioctl.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/i2c
Module Name:src Committed By: mbalmer Date: Sat Apr 2 08:20:07 UTC 2011 Modified Files: src/sys/dev/i2c: pcf8583.c Log Message: Fix misplaced parenthesis. From henning.peter...@t-online.de, thanks. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/dev/i2c/pcf8583.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/bin
Module Name:src Committed By: mbalmer Date: Sat Apr 2 08:38:56 UTC 2011 Modified Files: src/bin/cp: cp.1 src/bin/ls: ls.1 Log Message: Wording fixes from Ryo HAYASAKA, thanks. To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 src/bin/cp/cp.1 cvs rdiff -u -r1.68 -r1.69 src/bin/ls/ls.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/pppd/pppd
Module Name:src Committed By: mbalmer Date: Sat Apr 2 10:19:27 UTC 2011 Modified Files: src/usr.sbin/pppd/pppd: sys-bsd.c Log Message: Fix PR 42923, from Takahiro HAYASHI, thanks. To generate a diff of this commit: cvs rdiff -u -r1.62 -r1.63 src/usr.sbin/pppd/pppd/sys-bsd.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/vax/vax
Module Name:src Committed By: martin Date: Sat Apr 2 10:21:58 UTC 2011 Modified Files: src/sys/arch/vax/vax: sbi.c Log Message: Do not increment a bool var - from Henning Petersen, PR port-vax/44816. To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.37 src/sys/arch/vax/vax/sbi.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libpam/modules/pam_krb5
Module Name:src Committed By: mbalmer Date: Sat Apr 2 10:22:09 UTC 2011 Modified Files: src/lib/libpam/modules/pam_krb5: pam_krb5.c Log Message: Fix misplaced parenthesis, from henning.peter...@t-online.de, thanks. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/lib/libpam/modules/pam_krb5/pam_krb5.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/libexec/ld.elf_so
Module Name:src Committed By: joerg Date: Sat Apr 2 12:30:41 UTC 2011 Modified Files: src/libexec/ld.elf_so: rtld.c Log Message: Unbreak HPPA To generate a diff of this commit: cvs rdiff -u -r1.148 -r1.149 src/libexec/ld.elf_so/rtld.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/libexec/ld.elf_so/helper_dso1
Module Name:src Committed By: joerg Date: Sat Apr 2 12:53:33 UTC 2011 Modified Files: src/tests/libexec/ld.elf_so/helper_dso1: h_helper_dso1.c Log Message: Don't fail on platforms without TLS To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 \ src/tests/libexec/ld.elf_so/helper_dso1/h_helper_dso1.c 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: hannken Date: Sat Apr 2 14:24:53 UTC 2011 Modified Files: src/sys/fs/tmpfs: tmpfs_vfsops.c src/tests/fs/vfs: t_vfsops.c Log Message: Fix file handle operations for tmpfs by removing a now bogus test and fixing the return value of tmpfs_fhtovp() in the not-found case. When vmlocking2 was merged to head (Jan 2008 !!) the inode numbering was changed. Before inodes were numbered 2..tm_nodes_max-1 and after the merge the numbers are derived from the nodes memory address. Fixes PR #43605 (tmpfs file handles are broken) To generate a diff of this commit: cvs rdiff -u -r1.46 -r1.47 src/sys/fs/tmpfs/tmpfs_vfsops.c cvs rdiff -u -r1.9 -r1.10 src/tests/fs/vfs/t_vfsops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/libexec/ld.elf_so
Module Name:src Committed By: joerg Date: Sat Apr 2 16:49:49 UTC 2011 Modified Files: src/libexec/ld.elf_so: rtld.c Log Message: Revert pthread_atfork related change not intended for commit yet. To generate a diff of this commit: cvs rdiff -u -r1.149 -r1.150 src/libexec/ld.elf_so/rtld.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/scsipi
Module Name:src Committed By: macallan Date: Sat Apr 2 20:52:10 UTC 2011 Modified Files: src/sys/dev/scsipi: scsiconf.c Log Message: Add a quirks entry for Seagate SX173404LC drives, now they will work at higher speeds than 8bit/async While there, also disable sync for ZIP drives - at least some of them will pretend to support sync and then act up. To generate a diff of this commit: cvs rdiff -u -r1.258 -r1.259 src/sys/dev/scsipi/scsiconf.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: rmind Date: Sat Apr 2 23:05:51 UTC 2011 Modified Files: src/sys/kern: vnode_if.src Log Message: Update UCB license (3rd clause drop). To generate a diff of this commit: cvs rdiff -u -r1.60 -r1.61 src/sys/kern/vnode_if.src 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: rmind Date: Sun Apr 3 01:19:37 UTC 2011 Modified Files: src/sys/kern: vnode_if.sh src/sys/miscfs/genfs: layer_vnops.c src/sys/miscfs/umapfs: umap_vnops.c src/sys/sys: vnode.h src/sys/ufs/lfs: lfs_segment.c Log Message: - Use offsetof() in VOPARG_OFFSETOF() instead of re-implementing it. - Remove VDESC_NOMAP_VPP and VDESC_VPP_WILLRELE. - Remove VRELEL_NOINACTIVE and VRELEL_ONHEAD. To generate a diff of this commit: cvs rdiff -u -r1.56 -r1.57 src/sys/kern/vnode_if.sh cvs rdiff -u -r1.46 -r1.47 src/sys/miscfs/genfs/layer_vnops.c cvs rdiff -u -r1.51 -r1.52 src/sys/miscfs/umapfs/umap_vnops.c cvs rdiff -u -r1.226 -r1.227 src/sys/sys/vnode.h cvs rdiff -u -r1.219 -r1.220 src/sys/ufs/lfs/lfs_segment.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: rmind Date: Sun Apr 3 01:20:24 UTC 2011 Modified Files: src/sys/kern: vfs_mount.c Log Message: vfs_insmntque: convert check to assert. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/kern/vfs_mount.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/pmax/pmax
Module Name:src Committed By: mhitch Date: Sun Apr 3 03:19:52 UTC 2011 Modified Files: src/sys/arch/pmax/pmax: dec_3maxplus.c dec_3min.c dec_maxine.c Log Message: Fix pmax timecounters for mips3-class machines. Apparently no one else has run a 5000/150 with 5.0 or later - I booted 5.0 a couple of time, but clamd caused a hard hang. Now that I've given up trying to run clamd on my 5000/150, I noticed that time ran too fast while using the mips3_cp0_counter source. The cpu_mhz computed in mc_cpuspeed is the CP0 clock speed, not the doubled CPU clock. Also add the mips3_cp0_counter timecounters for the 5000/50 (maxine) and 5000/260 (3maxplus). To generate a diff of this commit: cvs rdiff -u -r1.66 -r1.67 src/sys/arch/pmax/pmax/dec_3maxplus.c cvs rdiff -u -r1.69 -r1.70 src/sys/arch/pmax/pmax/dec_3min.c cvs rdiff -u -r1.61 -r1.62 src/sys/arch/pmax/pmax/dec_maxine.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.