Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/nathanw_sa]: src/sys Catch up to -current.
details: https://anonhg.NetBSD.org/src/rev/a0c12f3bec0a
branches: nathanw_sa
changeset: 504795:a0c12f3bec0a
user: nathanw <nathanw%NetBSD.org@localhost>
date: Thu Jun 21 17:58:41 2001 +0000
description:
Catch up to -current.
diffstat:
sys/adosfs/advfsops.c | 4 +-
sys/adosfs/advnops.c | 22 +++++++++-----------
sys/altq/altq_afmap.c | 4 +-
sys/altq/altq_blue.c | 4 +-
sys/altq/altq_cbq.c | 6 ++--
sys/altq/altq_cbq.h | 4 +-
sys/altq/altq_cdnr.c | 4 +-
sys/altq/altq_fifoq.c | 6 ++--
sys/altq/altq_hfsc.c | 8 +++---
sys/altq/altq_priq.c | 6 ++--
sys/altq/altq_red.c | 10 ++++----
sys/altq/altq_rio.c | 6 ++--
sys/altq/altq_rmclass.c | 12 +++++-----
sys/altq/altq_rmclass_debug.h | 4 +-
sys/altq/altq_subr.c | 14 ++++++------
sys/altq/altq_wfq.c | 6 ++--
sys/altq/altqconf.h | 6 ++--
sys/arch/Makefile | 21 +++++++++++++++++--
sys/arch/README | 44 +++++++++++++++++++++++++++++++++++++++++++
19 files changed, 124 insertions(+), 67 deletions(-)
diffs (truncated from 629 to 300 lines):
diff -r 9af27fae5af1 -r a0c12f3bec0a sys/adosfs/advfsops.c
--- a/sys/adosfs/advfsops.c Thu Jun 21 16:30:06 2001 +0000
+++ b/sys/adosfs/advfsops.c Thu Jun 21 17:58:41 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: advfsops.c,v 1.44.2.1 2001/04/09 01:50:12 nathanw Exp $ */
+/* $NetBSD: advfsops.c,v 1.44.2.2 2001/06/21 17:58:41 nathanw Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -31,7 +31,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
#endif
diff -r 9af27fae5af1 -r a0c12f3bec0a sys/adosfs/advnops.c
--- a/sys/adosfs/advnops.c Thu Jun 21 16:30:06 2001 +0000
+++ b/sys/adosfs/advnops.c Thu Jun 21 17:58:41 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: advnops.c,v 1.57 2001/02/27 04:37:44 chs Exp $ */
+/* $NetBSD: advnops.c,v 1.57.2.1 2001/06/21 18:12:47 nathanw Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -31,7 +31,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#if defined(_KERNEL) && !defined(_LKM)
+#if defined(_KERNEL_OPT)
#include "opt_quota.h"
#endif
@@ -89,7 +89,7 @@
#define adosfs_mkdir genfs_eopnotsupp
#define adosfs_mknod genfs_eopnotsupp
#define adosfs_revoke genfs_revoke
-#define adosfs_mmap genfs_eopnotsupp
+#define adosfs_mmap genfs_mmap
#define adosfs_remove genfs_eopnotsupp
#define adosfs_rename genfs_eopnotsupp
#define adosfs_rmdir genfs_eopnotsupp
@@ -269,7 +269,7 @@
* taken from ufs_read()
*/
- if (vp->v_type == VREG) {
+ if (vp->v_type == VREG && IS_FFS(amp)) {
error = 0;
while (uio->uio_resid > 0) {
void *win;
@@ -291,10 +291,6 @@
}
do {
- /*
- * we are only supporting ADosFFS currently
- * (which have data blocks without headers)
- */
size = amp->dbsize;
lbn = uio->uio_offset / size;
on = uio->uio_offset % size;
@@ -328,14 +324,13 @@
printf("adosfs: bad primary type blk %ld\n",
bp->b_blkno / (amp->bsize / DEV_BSIZE));
#endif
- error=EINVAL;
- }
- else if ( adoscksum(bp, ap->nwords)) {
+ error = EINVAL;
+ } else if (adoscksum(bp, ap->nwords)) {
#ifdef DIAGNOSTIC
printf("adosfs: blk %ld failed cksum.\n",
bp->b_blkno / (amp->bsize / DEV_BSIZE));
#endif
- error=EINVAL;
+ error = EINVAL;
}
}
@@ -487,6 +482,9 @@
ap = VTOA(sp->a_vp);
bn = sp->a_bn / (ap->amp->bsize / DEV_BSIZE);
bnp = sp->a_bnp;
+ if (sp->a_runp) {
+ *sp->a_runp = 0;
+ }
error = 0;
if (sp->a_vpp != NULL)
diff -r 9af27fae5af1 -r a0c12f3bec0a sys/altq/altq_afmap.c
--- a/sys/altq/altq_afmap.c Thu Jun 21 16:30:06 2001 +0000
+++ b/sys/altq/altq_afmap.c Thu Jun 21 17:58:41 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: altq_afmap.c,v 1.2 2000/12/14 08:49:49 thorpej Exp $ */
+/* $NetBSD: altq_afmap.c,v 1.2.4.1 2001/06/21 18:12:48 nathanw Exp $ */
/* $KAME: altq_afmap.c,v 1.7 2000/12/14 08:12:45 thorpej Exp $ */
/*
@@ -298,7 +298,7 @@
}
#endif
-/* should be called in splimp() */
+/* should be called in splnet() */
struct afm *
afm_match(ifp, flow)
struct ifnet *ifp;
diff -r 9af27fae5af1 -r a0c12f3bec0a sys/altq/altq_blue.c
--- a/sys/altq/altq_blue.c Thu Jun 21 16:30:06 2001 +0000
+++ b/sys/altq/altq_blue.c Thu Jun 21 17:58:41 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: altq_blue.c,v 1.2 2000/12/14 08:49:49 thorpej Exp $ */
+/* $NetBSD: altq_blue.c,v 1.2.4.1 2001/06/21 18:12:48 nathanw Exp $ */
/* $KAME: altq_blue.c,v 1.7 2000/12/14 08:12:45 thorpej Exp $ */
/*
@@ -615,7 +615,7 @@
/*
* dequeue routine:
- * must be called in splimp.
+ * must be called in splnet.
*
* returns: mbuf dequeued.
* NULL when no packet is available in the queue.
diff -r 9af27fae5af1 -r a0c12f3bec0a sys/altq/altq_cbq.c
--- a/sys/altq/altq_cbq.c Thu Jun 21 16:30:06 2001 +0000
+++ b/sys/altq/altq_cbq.c Thu Jun 21 17:58:41 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: altq_cbq.c,v 1.2 2000/12/14 08:49:49 thorpej Exp $ */
+/* $NetBSD: altq_cbq.c,v 1.2.4.1 2001/06/21 18:12:48 nathanw Exp $ */
/* $KAME: altq_cbq.c,v 1.9 2000/12/14 08:12:45 thorpej Exp $ */
/*
@@ -703,7 +703,7 @@
* layer (e.g. ether_output). cbq_enqueue queues the given packet
* to the cbq, then invokes the driver's start routine.
*
- * Assumptions: called in splimp
+ * Assumptions: called in splnet
* Returns: 0 if the queueing is successful.
* ENOBUFS if a packet dropping occured as a result of
* the queueing.
@@ -760,7 +760,7 @@
/*
* void
* cbqrestart(queue_t *) - Restart sending of data.
- * called from rmc_restart in splimp via timeout after waking up
+ * called from rmc_restart in splnet via timeout after waking up
* a suspended class.
* Returns: NONE
*/
diff -r 9af27fae5af1 -r a0c12f3bec0a sys/altq/altq_cbq.h
--- a/sys/altq/altq_cbq.h Thu Jun 21 16:30:06 2001 +0000
+++ b/sys/altq/altq_cbq.h Thu Jun 21 17:58:41 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: altq_cbq.h,v 1.2 2000/12/14 08:49:49 thorpej Exp $ */
+/* $NetBSD: altq_cbq.h,v 1.2.4.1 2001/06/21 18:12:48 nathanw Exp $ */
/* $KAME: altq_cbq.h,v 1.5 2000/12/02 13:44:40 kjc Exp $ */
/*
@@ -190,7 +190,7 @@
#define DISABLE 0x00
#define ENABLE 0x01
-#define CBQ_WATCHDOG (HZ / 20)
+#define CBQ_WATCHDOG (hz / 20)
#define CBQ_TIMEOUT 10
#define CBQ_LS_TIMEOUT (20 * hz / 1000)
diff -r 9af27fae5af1 -r a0c12f3bec0a sys/altq/altq_cdnr.c
--- a/sys/altq/altq_cdnr.c Thu Jun 21 16:30:06 2001 +0000
+++ b/sys/altq/altq_cdnr.c Thu Jun 21 17:58:41 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: altq_cdnr.c,v 1.2 2000/12/14 08:49:50 thorpej Exp $ */
+/* $NetBSD: altq_cdnr.c,v 1.2.4.1 2001/06/21 18:12:48 nathanw Exp $ */
/* $KAME: altq_cdnr.c,v 1.8 2000/12/14 08:12:45 thorpej Exp $ */
/*
@@ -1262,7 +1262,7 @@
break;
}
- s = splimp();
+ s = splnet();
switch (cmd) {
case CDNR_IF_ATTACH:
diff -r 9af27fae5af1 -r a0c12f3bec0a sys/altq/altq_fifoq.c
--- a/sys/altq/altq_fifoq.c Thu Jun 21 16:30:06 2001 +0000
+++ b/sys/altq/altq_fifoq.c Thu Jun 21 17:58:41 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: altq_fifoq.c,v 1.2 2000/12/14 08:49:50 thorpej Exp $ */
+/* $NetBSD: altq_fifoq.c,v 1.2.4.1 2001/06/21 18:12:48 nathanw Exp $ */
/* $KAME: altq_fifoq.c,v 1.7 2000/12/14 08:12:45 thorpej Exp $ */
/*
@@ -297,7 +297,7 @@
/*
* dequeue routine:
- * must be called in splimp.
+ * must be called in splnet.
*
* returns: mbuf dequeued.
* NULL when no packet is available in the queue.
@@ -386,7 +386,7 @@
/*
* fifoq_purge
- * should be called in splimp or after disabling the fifoq.
+ * should be called in splnet or after disabling the fifoq.
*/
static void fifoq_purge(q)
fifoq_state_t *q;
diff -r 9af27fae5af1 -r a0c12f3bec0a sys/altq/altq_hfsc.c
--- a/sys/altq/altq_hfsc.c Thu Jun 21 16:30:06 2001 +0000
+++ b/sys/altq/altq_hfsc.c Thu Jun 21 17:58:41 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: altq_hfsc.c,v 1.2 2000/12/14 08:49:50 thorpej Exp $ */
+/* $NetBSD: altq_hfsc.c,v 1.2.4.1 2001/06/21 18:12:48 nathanw Exp $ */
/* $KAME: altq_hfsc.c,v 1.8 2000/12/14 08:12:46 thorpej Exp $ */
/*
@@ -378,7 +378,7 @@
cl->cl_hif = hif;
cl->cl_parent = parent;
- s = splimp();
+ s = splnet();
hif->hif_classes++;
if (flags & HFCF_DEFAULTCLASS)
hif->hif_defaultclass = cl;
@@ -430,7 +430,7 @@
if (is_a_parent_class(cl))
return (EBUSY);
- s = splimp();
+ s = splnet();
/* delete filters referencing to this class */
acc_discard_filters(&cl->cl_hif->hif_classifier, cl, 0);
@@ -486,7 +486,7 @@
struct internal_sc *tmp;
int s;
- s = splimp();
+ s = splnet();
if (!qempty(cl->cl_q))
hfsc_purgeq(cl);
diff -r 9af27fae5af1 -r a0c12f3bec0a sys/altq/altq_priq.c
--- a/sys/altq/altq_priq.c Thu Jun 21 16:30:06 2001 +0000
+++ b/sys/altq/altq_priq.c Thu Jun 21 17:58:41 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: altq_priq.c,v 1.2 2000/12/14 08:49:50 thorpej Exp $ */
+/* $NetBSD: altq_priq.c,v 1.2.4.1 2001/06/21 18:12:49 nathanw Exp $ */
/* $KAME: altq_priq.c,v 1.1 2000/10/18 09:15:23 kjc Exp $ */
/*
* Copyright (C) 2000
@@ -215,7 +215,7 @@
if ((cl = pif->pif_classes[pri]) != NULL) {
/* modify the class instead of creating a new one */
- s = splimp();
+ s = splnet();
if (!qempty(cl->cl_q))
priq_purgeq(cl);
splx(s);
@@ -315,7 +315,7 @@
struct priq_if *pif;
int s, pri;
- s = splimp();
+ s = splnet();
/* delete filters referencing to this class */
acc_discard_filters(&cl->cl_pif->pif_classifier, cl, 0);
diff -r 9af27fae5af1 -r a0c12f3bec0a sys/altq/altq_red.c
--- a/sys/altq/altq_red.c Thu Jun 21 16:30:06 2001 +0000
+++ b/sys/altq/altq_red.c Thu Jun 21 17:58:41 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: altq_red.c,v 1.2 2000/12/14 08:49:51 thorpej Exp $ */
+/* $NetBSD: altq_red.c,v 1.2.4.1 2001/06/21 18:12:49 nathanw Exp $ */
/* $KAME: altq_red.c,v 1.8 2000/12/14 08:12:46 thorpej Exp $ */
/*
@@ -431,7 +431,7 @@
break;
}
- s = splimp();
+ s = splnet();
red_purgeq(rqp);
limit = fc->red_limit;
if (limit < fc->red_thmax)
Home |
Main Index |
Thread Index |
Old Index