PERFORCE change 38808 for review
Marcel Moolenaar
marcel at FreeBSD.org
Mon Sep 29 15:47:57 PDT 2003
http://perforce.freebsd.org/chv.cgi?CH=38808
Change 38808 by marcel at marcel_nfs on 2003/09/29 15:47:32
IFC @38801
Affected files ...
.. //depot/projects/uart/conf/majors#4 integrate
.. //depot/projects/uart/ddb/db_elf.c#2 integrate
.. //depot/projects/uart/dev/aac/aac.c#8 integrate
.. //depot/projects/uart/dev/acpica/Osd/OsdSchedule.c#2 integrate
.. //depot/projects/uart/dev/mii/brgphy.c#7 integrate
.. //depot/projects/uart/dev/nmdm/nmdm.c#3 integrate
.. //depot/projects/uart/dev/ofw/ofw_console.c#4 integrate
.. //depot/projects/uart/dev/raidframe/rf_decluster.c#3 integrate
.. //depot/projects/uart/dev/raidframe/rf_freebsdkintf.c#4 integrate
.. //depot/projects/uart/dev/sio/sio.c#10 integrate
.. //depot/projects/uart/dev/uart/uart_cpu_sparc64.c#18 integrate
.. //depot/projects/uart/dev/uart/uart_tty.c#18 integrate
.. //depot/projects/uart/dev/usb/ugen.c#6 integrate
.. //depot/projects/uart/dev/usb/uhid.c#6 integrate
.. //depot/projects/uart/dev/usb/ulpt.c#4 integrate
.. //depot/projects/uart/dev/usb/ums.c#5 integrate
.. //depot/projects/uart/dev/usb/uscanner.c#7 integrate
.. //depot/projects/uart/dev/vinum/vinumconfig.c#4 integrate
.. //depot/projects/uart/dev/vinum/vinumrevive.c#3 integrate
.. //depot/projects/uart/dev/vinum/vinumvar.h#2 integrate
.. //depot/projects/uart/fs/procfs/procfs_map.c#3 integrate
.. //depot/projects/uart/geom/geom_disk.c#4 integrate
.. //depot/projects/uart/ia64/include/varargs.h#2 integrate
.. //depot/projects/uart/kern/kern_conf.c#3 integrate
.. //depot/projects/uart/kern/kern_mac.c#5 integrate
.. //depot/projects/uart/net/if.c#3 integrate
.. //depot/projects/uart/netgraph/bluetooth/drivers/ubt/ng_ubt.c#3 integrate
.. //depot/projects/uart/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#2 integrate
.. //depot/projects/uart/pci/if_xl.c#9 integrate
.. //depot/projects/uart/sparc64/sparc64/pmap.c#10 integrate
.. //depot/projects/uart/sys/conf.h#3 integrate
.. //depot/projects/uart/sys/cons.h#3 integrate
.. //depot/projects/uart/sys/param.h#11 integrate
.. //depot/projects/uart/vm/vm_page.c#7 integrate
Differences ...
==== //depot/projects/uart/conf/majors#4 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/majors,v 1.177 2003/08/27 07:35:12 simokawa Exp $
+# $FreeBSD: src/sys/conf/majors,v 1.179 2003/09/29 14:15:57 scottl Exp $
#
# This list is semi-obsoleted by DEVFS, but for now it still contains
# the current allocation of device major numbers.
@@ -148,7 +148,6 @@
146 *twe 3ware Escalade ATA RAID (controller)
148 *agp AGP <dfr>
149 *tap Ethernet tunneling device <myevmenkin at att.com>
-150 *aac Adaptec FSA RAID (controller)
152 *acpi ACPI bios support (Takanori Watanabe takawata at shidahara1.planet.sci.kobe-u.ac.jp)
153 *ti Tigon Gigabit Ethernet driver (ken at FreeBSD.ORG)
154 *asr Adaptec SCSI RAID <msmith at freebsd.org>
@@ -169,8 +168,6 @@
173 *devctl Devd control device <imp>
174 pciwd Berkshire Watchdog PCI <marcel at progressix.com>
175 ips IBM/Adaptec ServeRAID (control device)
-178 raidctl RAIDframe (control device)
-179 raid RAIDframe (disk device)
180 nvidia NVIDIA (nvidiaN/nvidiactl) <mdodd>
181 casm HP/Compaq ProLiant Advanced Server Management <peter>
183 *smapi SMAPI BIOS interface <mdodd>
==== //depot/projects/uart/ddb/db_elf.c#2 (text+ko) ====
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/ddb/db_elf.c,v 1.16 2003/06/10 22:09:23 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/ddb/db_elf.c,v 1.17 2003/09/28 06:02:33 bde Exp $");
#include "opt_ddb.h"
@@ -266,6 +266,11 @@
for (symp = symtab_start; symp < symtab_end; symp++) {
if (symp->st_name == 0)
continue;
+ if (ELF_ST_TYPE(symp->st_info) != STT_OBJECT &&
+ ELF_ST_TYPE(symp->st_info) != STT_FUNC &&
+ ELF_ST_TYPE(symp->st_info) != STT_NOTYPE)
+ continue;
+
if (off >= symp->st_value) {
if ((off - symp->st_value) < diff) {
diff = off - symp->st_value;
==== //depot/projects/uart/dev/aac/aac.c#8 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/aac/aac.c,v 1.78 2003/09/16 16:07:15 scottl Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/aac/aac.c,v 1.79 2003/09/29 14:10:04 scottl Exp $");
/*
* Driver for the Adaptec 'FSA' family of PCI/SCSI RAID adapters.
@@ -180,15 +180,12 @@
static int aac_return_aif(struct aac_softc *sc, caddr_t uptr);
static int aac_query_disk(struct aac_softc *sc, caddr_t uptr);
-#define AAC_CDEV_MAJOR 150
-
static struct cdevsw aac_cdevsw = {
.d_open = aac_open,
.d_close = aac_close,
.d_ioctl = aac_ioctl,
.d_poll = aac_poll,
.d_name = "aac",
- .d_maj = AAC_CDEV_MAJOR,
};
MALLOC_DEFINE(M_AACBUF, "aacbuf", "Buffers for the AAC driver");
==== //depot/projects/uart/dev/acpica/Osd/OsdSchedule.c#2 (text+ko) ====
@@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/acpica/Osd/OsdSchedule.c,v 1.23 2002/10/31 17:58:39 iwasaki Exp $
+ * $FreeBSD: src/sys/dev/acpica/Osd/OsdSchedule.c,v 1.24 2003/09/29 07:29:26 njl Exp $
*/
/*
@@ -262,7 +262,15 @@
{
ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
- DELAY(Microseconds);
+ /*
+ * Maximum length for stall is 100 us. If longer, assume caller
+ * really meant "sleep".
+ */
+ if (Microseconds <= 100)
+ DELAY(Microseconds);
+ else
+ AcpiOsSleep(Microseconds / 1000, Microseconds % 1000);
+
return_VOID;
}
==== //depot/projects/uart/dev/mii/brgphy.c#7 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/mii/brgphy.c,v 1.26 2003/08/24 17:54:10 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/mii/brgphy.c,v 1.27 2003/09/28 04:16:16 ps Exp $");
/*
* Driver for the Broadcom BCR5400 1000baseTX PHY. Speed is always
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/mii/brgphy.c,v 1.26 2003/08/24 17:54:10 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/mii/brgphy.c,v 1.27 2003/09/28 04:16:16 ps Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -622,7 +622,7 @@
/* Enable Ethernet at WireSpeed. */
PHY_WRITE(sc, BRGPHY_MII_AUXCTL, 0x7007);
val = PHY_READ(sc, BRGPHY_MII_AUXCTL);
- PHY_WRITE(sc, BRGPHY_MII_AUXCTL, val | (1 << 15) || (1 << 4));
+ PHY_WRITE(sc, BRGPHY_MII_AUXCTL, val | (1 << 15) | (1 << 4));
/* Enable Link LED on Dell boxes */
if (bge_sc->bge_no_3_led) {
==== //depot/projects/uart/dev/nmdm/nmdm.c#3 (text+ko) ====
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/nmdm/nmdm.c,v 1.15 2003/08/24 17:54:13 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/nmdm/nmdm.c,v 1.16 2003/09/28 20:48:12 phk Exp $");
/*
* Pseudo-nulmodem driver
@@ -604,8 +604,8 @@
nextdev2 = makedev(CDEV_MAJOR, (i+i) + 1);
ptr1 = nextdev1->si_drv1;
if (ptr1) {
- revoke_and_destroy_dev(nextdev1);
- revoke_and_destroy_dev(nextdev2);
+ destroy_dev(nextdev1);
+ destroy_dev(nextdev2);
free(ptr1, M_NLMDM);
} else {
freedev(nextdev1);
==== //depot/projects/uart/dev/ofw/ofw_console.c#4 (text+ko) ====
@@ -24,10 +24,10 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ofw/ofw_console.c,v 1.15 2003/09/26 19:35:49 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ofw/ofw_console.c,v 1.17 2003/09/28 06:51:47 jake Exp $");
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ofw/ofw_console.c,v 1.15 2003/09/26 19:35:49 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ofw/ofw_console.c,v 1.17 2003/09/28 06:51:47 jake Exp $");
#include "opt_ddb.h"
#include "opt_comconsole.h"
@@ -94,7 +94,8 @@
char output[32];
dev_t dev;
- if (ofw_consdev.cn_pri != CN_DEAD) {
+ if (ofw_consdev.cn_pri != CN_DEAD &&
+ ofw_consdev.cn_name[0] != '\0') {
if ((options = OF_finddevice("/options")) == -1 ||
OF_getprop(options, "output-device", output,
sizeof(output)) == -1)
@@ -276,7 +277,7 @@
return;
}
- cp->cn_pri = CN_INTERNAL;
+ cp->cn_pri = CN_LOW;
}
static void
==== //depot/projects/uart/dev/raidframe/rf_decluster.c#3 (text+ko) ====
@@ -1,7 +1,7 @@
/* $NetBSD: rf_decluster.c,v 1.6 2001/01/26 04:40:03 oster Exp $ */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/raidframe/rf_decluster.c,v 1.2 2003/08/24 17:54:18 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/raidframe/rf_decluster.c,v 1.4 2003/09/29 14:23:59 scottl Exp $");
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -66,7 +66,7 @@
extern int rf_copyback_in_progress; /* debug only */
/* found in rf_kintf.c */
-int rf_GetSpareTableFromDaemon(RF_SparetWait_t * req);
+extern int rf_GetSpareTableFromDaemon(RF_SparetWait_t * req);
#if (RF_INCLUDE_PARITY_DECLUSTERING > 0) || (RF_INCLUDE_PARITY_DECLUSTERING_PQ > 0)
==== //depot/projects/uart/dev/raidframe/rf_freebsdkintf.c#4 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/raidframe/rf_freebsdkintf.c,v 1.20 2003/07/27 17:04:54 phk Exp $
+ * $FreeBSD: src/sys/dev/raidframe/rf_freebsdkintf.c,v 1.21 2003/09/29 14:14:35 scottl Exp $
*/
/* $NetBSD: rf_netbsdkintf.c,v 1.105 2001/04/05 02:48:51 oster Exp $ */
@@ -219,7 +219,6 @@
.d_close = raidctlclose,
.d_ioctl = raidctlioctl,
.d_name = "raidctl",
- .d_maj = 201,
};
/*
==== //depot/projects/uart/dev/sio/sio.c#10 (text+ko) ====
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/sio/sio.c,v 1.413 2003/09/27 11:13:59 bde Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/sio/sio.c,v 1.414 2003/09/28 13:12:26 bde Exp $");
#include "opt_comconsole.h"
#include "opt_compat.h"
@@ -2302,8 +2302,6 @@
if (sio_getreg(com, com_dlbh) != dlbh)
sio_setreg(com, com_dlbh, dlbh);
- if (!(tp->t_state & TS_TTSTOP))
- com->state |= CS_TTGO;
efr_flowbits = 0;
if (cflag & CRTS_IFLOW) {
@@ -2348,13 +2346,6 @@
/* XXX shouldn't call functions while intrs are disabled. */
disc_optim(tp, t, com);
- /*
- * Recover from fiddling with CS_TTGO. We used to call siointr1()
- * unconditionally, but that defeated the careful discarding of
- * stale input in sioopen().
- */
- if (com->state >= (CS_BUSY | CS_TTGO))
- siointr1(com);
mtx_unlock_spin(&sio_lock);
splx(s);
==== //depot/projects/uart/dev/uart/uart_cpu_sparc64.c#18 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/uart/uart_cpu_sparc64.c,v 1.5 2003/09/26 05:14:56 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_cpu_sparc64.c,v 1.6 2003/09/28 07:06:34 jake Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -142,7 +142,10 @@
di->bas.bsh = sparc64_fake_bustag(space, addr, di->bas.bst);
/* Get the line settings. */
- di->baudrate = 9600;
+ if (devtype == UART_DEV_KEYBOARD)
+ di->baudrate = 1200;
+ else
+ di->baudrate = 9600;
di->databits = 8;
di->stopbits = 1;
di->parity = UART_PARITY_NONE;
==== //depot/projects/uart/dev/uart/uart_tty.c#18 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/uart/uart_tty.c,v 1.3 2003/09/26 18:10:30 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_tty.c,v 1.4 2003/09/28 18:20:42 marcel Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -74,7 +74,6 @@
.d_ioctl = uart_tty_ioctl,
.d_poll = ttypoll,
.d_name = uart_driver_name,
- .d_maj = MAJOR_AUTO,
.d_flags = D_TTY,
.d_kqfilter = ttykqfilter,
};
==== //depot/projects/uart/dev/usb/ugen.c#6 (text+ko) ====
@@ -7,7 +7,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/ugen.c,v 1.76 2003/08/25 22:01:05 joe Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/ugen.c,v 1.77 2003/09/28 20:48:12 phk Exp $");
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -273,7 +273,6 @@
{
int endptno;
dev_t dev;
- struct vnode *vp;
/* destroy all devices for the other (existing) endpoints as well */
for (endptno = 1; endptno < USB_MAX_ENDPOINTS; endptno++) {
@@ -289,9 +288,6 @@
*/
dev = makedev(UGEN_CDEV_MAJOR,
UGENMINOR(USBDEVUNIT(sc->sc_dev), endptno));
- vp = SLIST_FIRST(&dev->si_hlist);
- if (vp)
- VOP_REVOKE(vp, REVOKEALL);
destroy_dev(dev);
}
@@ -860,7 +856,6 @@
int maj, mn;
#elif defined(__FreeBSD__)
dev_t dev;
- struct vnode *vp;
#endif
#if defined(__NetBSD__) || defined(__OpenBSD__)
@@ -901,9 +896,6 @@
#elif defined(__FreeBSD__)
/* destroy the device for the control endpoint */
dev = makedev(UGEN_CDEV_MAJOR, UGENMINOR(USBDEVUNIT(sc->sc_dev), 0));
- vp = SLIST_FIRST(&dev->si_hlist);
- if (vp)
- VOP_REVOKE(vp, REVOKEALL);
destroy_dev(dev);
ugen_destroy_devnodes(sc);
#endif
==== //depot/projects/uart/dev/usb/uhid.c#6 (text+ko) ====
@@ -5,7 +5,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/uhid.c,v 1.62 2003/08/25 22:01:06 joe Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/uhid.c,v 1.63 2003/09/28 20:48:13 phk Exp $");
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -304,8 +304,6 @@
int s;
#if defined(__NetBSD__) || defined(__OpenBSD__)
int maj, mn;
-#elif defined(__FreeBSD__)
- struct vnode *vp;
#endif
#if defined(__NetBSD__) || defined(__OpenBSD__)
@@ -339,10 +337,6 @@
mn = self->dv_unit;
vdevgone(maj, mn, mn, VCHR);
#elif defined(__FreeBSD__)
- vp = SLIST_FIRST(&sc->dev->si_hlist);
- if (vp)
- VOP_REVOKE(vp, REVOKEALL);
-
destroy_dev(sc->dev);
#endif
==== //depot/projects/uart/dev/usb/ulpt.c#4 (text+ko) ====
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/ulpt.c,v 1.58 2003/08/25 22:01:06 joe Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/ulpt.c,v 1.59 2003/09/28 20:48:13 phk Exp $");
/*
* Printer Class spec: http://www.usb.org/developers/data/devclass/usbprint109.PDF
@@ -58,7 +58,6 @@
#endif
#include <sys/uio.h>
#include <sys/conf.h>
-#include <sys/vnode.h>
#include <sys/syslog.h>
#include <sys/sysctl.h>
@@ -376,8 +375,6 @@
int s;
#if defined(__NetBSD__) || defined(__OpenBSD__)
int maj, mn;
-#elif defined(__FreeBSD__)
- struct vnode *vp;
#endif
#if defined(__NetBSD__) || defined(__OpenBSD__)
@@ -414,13 +411,6 @@
mn = self->dv_unit;
vdevgone(maj, mn, mn, VCHR);
#elif defined(__FreeBSD__)
- vp = SLIST_FIRST(&sc->dev->si_hlist);
- if (vp)
- VOP_REVOKE(vp, REVOKEALL);
- vp = SLIST_FIRST(&sc->dev_noprime->si_hlist);
- if (vp)
- VOP_REVOKE(vp, REVOKEALL);
-
destroy_dev(sc->dev);
destroy_dev(sc->dev_noprime);
#endif
==== //depot/projects/uart/dev/usb/ums.c#5 (text+ko) ====
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/ums.c,v 1.61 2003/08/25 22:10:52 joe Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/ums.c,v 1.62 2003/09/28 20:48:13 phk Exp $");
/*
* HID spec: http://www.usb.org/developers/data/devclass/hid1_1.pdf
@@ -367,7 +367,6 @@
ums_detach(device_t self)
{
struct ums_softc *sc = device_get_softc(self);
- struct vnode *vp;
if (sc->sc_enabled)
ums_disable(sc);
@@ -377,10 +376,6 @@
free(sc->sc_loc_btn, M_USB);
free(sc->sc_ibuf, M_USB);
- vp = SLIST_FIRST(&sc->dev->si_hlist);
- if (vp)
- VOP_REVOKE(vp, REVOKEALL);
-
/* someone waiting for data */
/*
* XXX If we wakeup the process here, the device will be gone by
==== //depot/projects/uart/dev/usb/uscanner.c#7 (text+ko) ====
@@ -5,7 +5,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/uscanner.c,v 1.44 2003/08/25 22:01:06 joe Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/uscanner.c,v 1.45 2003/09/28 20:48:13 phk Exp $");
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -620,7 +620,6 @@
int maj, mn;
#elif defined(__FreeBSD__)
dev_t dev;
- struct vnode *vp;
#endif
#if defined(__NetBSD__) || defined(__OpenBSD__)
@@ -657,9 +656,6 @@
#elif defined(__FreeBSD__)
/* destroy the device for the control endpoint */
dev = makedev(USCANNER_CDEV_MAJOR, USBDEVUNIT(sc->sc_dev));
- vp = SLIST_FIRST(&dev->si_hlist);
- if (vp)
- VOP_REVOKE(vp, REVOKEALL);
destroy_dev(dev);
#endif
==== //depot/projects/uart/dev/vinum/vinumconfig.c#4 (text+ko) ====
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/vinum/vinumconfig.c,v 1.61 2003/08/24 17:55:56 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/vinum/vinumconfig.c,v 1.62 2003/09/29 08:50:03 grog Exp $");
#define STATIC static
@@ -254,12 +254,14 @@
} else /* first subdisk */
sd->plexoffset = 0; /* start at the beginning */
}
- if (plex->subdisks == MAXSD) /* we already have our maximum */
+ if (plex->subdisks == MAXSD) { /* we already have our maximum */
+ if (sd->state == sd_unallocated) /* haven't finished allocating the sd, */
+ free_sd(sdno); /* free it to return drive space */
throw_rude_remark(ENOSPC, /* crap out */
"Can't add %s to %s: plex full",
sd->name,
plex->name);
-
+ }
plex->subdisks++; /* another entry */
if (plex->subdisks >= plex->subdisks_allocated) /* need more space */
EXPAND(plex->sdnos, int, plex->subdisks_allocated, INITIAL_SUBDISKS_IN_PLEX);
@@ -737,7 +739,13 @@
sd->sectors);
if (sd->plexno >= 0)
PLEX[sd->plexno].subdisks--; /* one less subdisk */
- destroy_dev(sd->dev);
+ /*
+ * If we come here as the result of a
+ * configuration error, we may not yet have
+ * created a device entry for the subdisk.
+ */
+ if (sd->dev)
+ destroy_dev(sd->dev);
bzero(sd, sizeof(struct sd)); /* and clear it out */
sd->state = sd_unallocated;
vinum_conf.subdisks_used--; /* one less sd */
@@ -1199,11 +1207,6 @@
if (DRIVE[sd->driveno].state != drive_up)
sd->state = sd_crashed;
- /*
- * This is tacky. If something goes wrong
- * with the checks, we may end up losing drive
- * space. FIXME.
- */
if (autosize != 0) /* need to find a size, */
give_sd_to_drive(sdno); /* do it before the plex */
@@ -1226,8 +1229,11 @@
strlcpy(sd->name, /* take it from there */
PLEX[sd->plexno].name,
sizeof(sd->name));
- else /* no way */
+ else { /* no way */
+ if (sd->state == sd_unallocated) /* haven't finished allocating the sd, */
+ free_sd(sdno); /* free it to return drive space */
throw_rude_remark(EINVAL, "Unnamed sd is not associated with a plex");
+ }
sprintf(sdsuffix, ".s%d", sdindex); /* form the suffix */
strlcat(sd->name, sdsuffix, sizeof(sd->name)); /* and add it to the name */
}
==== //depot/projects/uart/dev/vinum/vinumrevive.c#3 (text+ko) ====
@@ -37,12 +37,12 @@
* otherwise) arising in any way out of the use of this software, even if
* advised of the possibility of such damage.
*
- * $Id: vinumrevive.c,v 1.18 2003/04/28 02:54:43 grog Exp $
+ * $Id: vinumrevive.c,v 1.19 2003/05/08 04:34:47 grog Exp grog $
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/vinum/vinumrevive.c,v 1.43 2003/08/24 17:55:57 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/vinum/vinumrevive.c,v 1.44 2003/09/29 03:16:20 grog Exp $");
#include <dev/vinum/vinumhdr.h>
#include <dev/vinum/request.h>
@@ -161,9 +161,9 @@
* First, read the data from the volume. We
* don't care which plex, that's bre's job.
*/
- bp->b_dev = VINUM_VOL(plex->volno); /* create the device number */
+ bp->b_dev = VOL[plex->volno].dev; /* create the device number */
else /* it's an unattached plex */
- bp->b_dev = VINUM_PLEX(sd->plexno); /* create the device number */
+ bp->b_dev = PLEX[sd->plexno].dev; /* create the device number */
bp->b_iocmd = BIO_READ; /* either way, read it */
bp->b_flags = 0;
@@ -178,7 +178,7 @@
} else
/* Now write to the subdisk */
{
- bp->b_dev = VINUM_SD(sdno); /* create the device number */
+ bp->b_dev = SD[sdno].dev; /* create the device number */
bp->b_flags &= ~B_DONE; /* no longer done */
bp->b_ioflags = 0;
bp->b_iocmd = BIO_WRITE;
@@ -212,7 +212,7 @@
rq->bp->b_iocmd == BIO_READ ? "Read" : "Write",
major(rq->bp->b_dev),
minor(rq->bp->b_dev),
- (intmax_t)rq->bp->b_blkno,
+ (intmax_t) rq->bp->b_blkno,
rq->bp->b_bcount);
#endif
launch_requests(sd->waitlist, 1); /* do them now */
@@ -309,7 +309,7 @@
reply->error = EIO;
sprintf(reply->msg,
"Parity incorrect at offset 0x%jx\n",
- (intmax_t)errorloc);
+ (intmax_t) errorloc);
}
if (reply->error == EAGAIN) { /* still OK, */
plex->checkblock = pstripe + (pbp->b_bcount >> DEV_BSHIFT); /* moved this much further down */
@@ -413,9 +413,9 @@
if (sdno == psd)
parity_buf = (int *) bpp[sdno]->b_data;
if (sdno == newpsd) /* the new one? */
- bpp[sdno]->b_dev = VINUM_SD(plex->sdnos[psd]); /* write back to the parity SD */
+ bpp[sdno]->b_dev = SD[plex->sdnos[psd]].dev; /* write back to the parity SD */
else
- bpp[sdno]->b_dev = VINUM_SD(plex->sdnos[sdno]); /* device number */
+ bpp[sdno]->b_dev = SD[plex->sdnos[sdno]].dev; /* device number */
bpp[sdno]->b_iocmd = BIO_READ; /* either way, read it */
bpp[sdno]->b_flags = 0;
bpp[sdno]->b_bcount = mysize;
@@ -557,7 +557,7 @@
bp->b_resid = bp->b_bcount;
bp->b_blkno = sd->initialized; /* write it to here */
bzero(bp->b_data, bp->b_bcount);
- bp->b_dev = VINUM_SD(sdno); /* create the device number */
+ bp->b_dev = SD[sdno].dev; /* create the device number */
bp->b_iocmd = BIO_WRITE;
sdio(bp); /* perform the I/O */
bufwait(bp);
@@ -578,7 +578,7 @@
bp->b_bcount = size;
bp->b_resid = bp->b_bcount;
bp->b_blkno = sd->initialized; /* read from here */
- bp->b_dev = VINUM_SD(sdno); /* create the device number */
+ bp->b_dev = SD[sdno].dev; /* create the device number */
bp->b_iocmd = BIO_READ; /* read it back */
splx(s);
sdio(bp);
==== //depot/projects/uart/dev/vinum/vinumvar.h#2 (text+ko) ====
@@ -37,8 +37,8 @@
* otherwise) arising in any way out of the use of this software, even if
* advised of the possibility of such damage.
*
- * $Id: vinumvar.h,v 1.33 2003/05/23 01:09:23 grog Exp $
- * $FreeBSD: src/sys/dev/vinum/vinumvar.h,v 1.44 2003/05/23 01:15:55 grog Exp $
+ * $Id: vinumvar.h,v 1.33 2003/05/23 01:09:23 grog Exp grog $
+ * $FreeBSD: src/sys/dev/vinum/vinumvar.h,v 1.46 2003/09/29 08:19:06 grog Exp $
*/
#include <sys/time.h>
==== //depot/projects/uart/fs/procfs/procfs_map.c#3 (text+ko) ====
@@ -36,15 +36,18 @@
*
* @(#)procfs_status.c 8.3 (Berkeley) 2/17/94
*
- * $FreeBSD: src/sys/fs/procfs/procfs_map.c,v 1.32 2003/08/14 15:26:44 rwatson Exp $
+ * $FreeBSD: src/sys/fs/procfs/procfs_map.c,v 1.33 2003/09/29 20:53:19 rwatson Exp $
*/
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/lock.h>
+#include <sys/filedesc.h>
+#include <sys/malloc.h>
#include <sys/mutex.h>
#include <sys/proc.h>
#include <sys/uio.h>
+#include <sys/vnode.h>
#include <fs/pseudofs/pseudofs.h>
#include <fs/procfs/procfs.h>
@@ -77,6 +80,7 @@
pmap_t pmap = vmspace_pmap(p->p_vmspace);
vm_map_entry_t entry;
char mebuffer[MEBUFFERSIZE];
+ char *fullpath, *freepath;
GIANT_REQUIRED;
@@ -124,6 +128,8 @@
for (lobj = tobj = obj; tobj; tobj = tobj->backing_object)
lobj = tobj;
+ freepath = NULL;
+ fullpath = "-";
if (lobj) {
switch(lobj->type) {
default:
@@ -132,6 +138,11 @@
break;
case OBJT_VNODE:
type = "vnode";
+ vn_fullpath(td,
+ (struct vnode *)lobj->handle,
+ &fullpath,
+ &freepath);
+ printf("string: %s\n", fullpath);
break;
case OBJT_SWAP:
type = "swap";
@@ -156,7 +167,7 @@
* start, end, resident, private resident, cow, access, type.
*/
snprintf(mebuffer, sizeof mebuffer,
- "0x%lx 0x%lx %d %d %p %s%s%s %d %d 0x%x %s %s %s\n",
+ "0x%lx 0x%lx %d %d %p %s%s%s %d %d 0x%x %s %s %s %s\n",
(u_long)entry->start, (u_long)entry->end,
resident, privateresident, obj,
(entry->protection & VM_PROT_READ)?"r":"-",
@@ -165,7 +176,10 @@
ref_count, shadow_count, flags,
(entry->eflags & MAP_ENTRY_COW)?"COW":"NCOW",
(entry->eflags & MAP_ENTRY_NEEDS_COPY)?"NC":"NNC",
- type);
+ type, fullpath);
+
+ if (freepath != NULL)
+ free(freepath, M_TEMP);
len = strlen(mebuffer);
if (len > uio->uio_resid) {
==== //depot/projects/uart/geom/geom_disk.c#4 (text+ko) ====
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/geom/geom_disk.c,v 1.78 2003/09/23 07:53:59 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/geom/geom_disk.c,v 1.79 2003/09/29 07:44:23 phk Exp $");
#include "opt_geom.h"
@@ -159,6 +159,10 @@
gp = bp->bio_to->geom;
g_trace(G_T_TOPOLOGY, "g_disk_kernedump(%s, %jd, %jd)",
gp->name, (intmax_t)gkd->offset, (intmax_t)gkd->length);
+ if (dp->d_dump == NULL) {
+ g_io_deliver(bp, ENODEV);
+ return;
+ }
di.dumper = dp->d_dump;
di.priv = dp;
di.blocksize = dp->d_sectorsize;
==== //depot/projects/uart/ia64/include/varargs.h#2 (text+ko) ====
@@ -37,25 +37,12 @@
* SUCH DAMAGE.
*
* @(#)varargs.h 8.2 (Berkeley) 3/22/94
- * $FreeBSD: src/sys/ia64/include/varargs.h,v 1.4 2002/10/06 22:02:06 mike Exp $
+ * $FreeBSD: src/sys/ia64/include/varargs.h,v 1.5 2003/09/28 05:34:07 marcel Exp $
*/
#ifndef _MACHINE_VARARGS_H_
#define _MACHINE_VARARGS_H_
-#include <sys/_types.h>
-
-#ifndef _VA_LIST_DECLARED
-#define _VA_LIST_DECLARED
-typedef __va_list va_list;
-#endif
-
-typedef int __builtin_va_alist_t __attribute__((__mode__(__word__)));
-
-#define va_alist __builtin_va_alist
-#define va_dcl __builtin_va_alist_t __builtin_va_alist; ...
-#define va_start(ap) __builtin_varargs_start(ap)
-#define va_arg(ap, type) __builtin_va_arg((ap), type)
-#define va_end(ap) __builtin_va_end(ap)
+#error "<varargs.h> is obsolete on ia64. Use <stdarg.h> instead."
#endif /* !_MACHINE_VARARGS_H_ */
==== //depot/projects/uart/kern/kern_conf.c#3 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_conf.c,v 1.137 2003/09/27 21:50:00 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_conf.c,v 1.138 2003/09/28 20:50:36 phk Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -452,19 +452,6 @@
}
void
-revoke_and_destroy_dev(dev_t dev)
-{
- struct vnode *vp;
-
- GIANT_REQUIRED;
-
- vp = SLIST_FIRST(&dev->si_hlist);
- if (vp != NULL)
- VOP_REVOKE(vp, REVOKEALL);
- destroy_dev(dev);
-}
-
-void
destroy_dev(dev_t dev)
{
==== //depot/projects/uart/kern/kern_mac.c#5 (text+ko) ====
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_mac.c,v 1.98 2003/08/26 17:29:02 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_mac.c,v 1.99 2003/09/29 18:35:17 rwatson Exp $");
#include "opt_mac.h"
#include "opt_devfs.h"
@@ -1176,7 +1176,8 @@
mac_check_structmac_consistent(struct mac *mac)
{
- if (mac->m_buflen > MAC_MAX_LABEL_BUF_LEN)
+ if (mac->m_buflen < 0 ||
+ mac->m_buflen > MAC_MAX_LABEL_BUF_LEN)
return (EINVAL);
return (0);
==== //depot/projects/uart/net/if.c#3 (text+ko) ====
@@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)if.c 8.5 (Berkeley) 1/9/95
- * $FreeBSD: src/sys/net/if.c,v 1.164 2003/07/19 16:47:16 ume Exp $
+ * $FreeBSD: src/sys/net/if.c,v 1.165 2003/09/28 20:48:12 phk Exp $
*/
#include "opt_compat.h"
@@ -470,7 +470,7 @@
* Clean up all addresses.
*/
ifaddr_byindex(ifp->if_index) = NULL;
- revoke_and_destroy_dev(ifdev_byindex(ifp->if_index));
+ destroy_dev(ifdev_byindex(ifp->if_index));
ifdev_byindex(ifp->if_index) = NULL;
while (if_index > 0 && ifaddr_byindex(if_index) == NULL)
==== //depot/projects/uart/netgraph/bluetooth/drivers/ubt/ng_ubt.c#3 (text+ko) ====
@@ -26,7 +26,7 @@
* SUCH DAMAGE.
*
* $Id: ng_ubt.c,v 1.14 2003/04/14 23:00:50 max Exp $
- * $FreeBSD: src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c,v 1.7 2003/07/16 03:43:14 jmg Exp $
+ * $FreeBSD: src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c,v 1.8 2003/09/28 20:48:13 phk Exp $
*/
#include <sys/param.h>
@@ -40,7 +40,7 @@
#include <sys/malloc.h>
#include <sys/kernel.h>
#include <sys/poll.h>
-#include <sys/vnode.h>
+#include <sys/uio.h>
#include <machine/bus.h>
#include <dev/usb/usb.h>
@@ -2704,7 +2704,6 @@
Static void
ubt_destroy_device_nodes(ubt_softc_p sc)
{
- struct vnode *vp = NULL;
/*
* Wait for processes to go away. This should be safe as we will not
@@ -2721,28 +2720,16 @@
/* Destroy device nodes */
if (sc->sc_bulk_dev != NODEV) {
- vp = SLIST_FIRST(&sc->sc_bulk_dev->si_hlist);
- if (vp != NULL)
- VOP_REVOKE(vp, REVOKEALL);
-
destroy_dev(sc->sc_bulk_dev);
sc->sc_bulk_dev = NODEV;
}
if (sc->sc_intr_dev != NODEV) {
- vp = SLIST_FIRST(&sc->sc_intr_dev->si_hlist);
- if (vp != NULL)
- VOP_REVOKE(vp, REVOKEALL);
-
destroy_dev(sc->sc_intr_dev);
sc->sc_intr_dev = NODEV;
}
if (sc->sc_ctrl_dev != NODEV) {
- vp = SLIST_FIRST(&sc->sc_ctrl_dev->si_hlist);
- if (vp != NULL)
- VOP_REVOKE(vp, REVOKEALL);
-
destroy_dev(sc->sc_ctrl_dev);
sc->sc_ctrl_dev = NODEV;
}
==== //depot/projects/uart/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#2 (text+ko) ====
@@ -26,7 +26,7 @@
* SUCH DAMAGE.
*
* $Id: ubtbcmfw.c,v 1.1 2003/04/27 00:20:15 max Exp $
- * $FreeBSD: src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c,v 1.1 2003/05/10 21:44:40 julian Exp $
+ * $FreeBSD: src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c,v 1.2 2003/09/28 20:48:13 phk Exp $
*/
#include <sys/param.h>
@@ -39,7 +39,7 @@
#include <sys/poll.h>
#include <sys/proc.h>
#include <sys/sysctl.h>
-#include <sys/vnode.h>
+#include <sys/uio.h>
#include <dev/usb/usb.h>
#include <dev/usb/usbdi.h>
@@ -220,8 +220,6 @@
{
USB_DETACH_START(ubtbcmfw, sc);
- struct vnode *vp = NULL;
-
sc->sc_dying = 1;
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list