Date: Wed, 21 May 2003 12:26:27 -0700 (PDT) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 31578 for review Message-ID: <200305211926.h4LJQRhc049452@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=31578 Change 31578 by peter@peter_daintree on 2003/05/21 12:26:25 IFC @31577 Affected files ... .. //depot/projects/hammer/share/man/man9/Makefile#11 integrate .. //depot/projects/hammer/sys/geom/geom_disk.c#12 integrate .. //depot/projects/hammer/sys/kern/kern_switch.c#9 integrate Differences ... ==== //depot/projects/hammer/share/man/man9/Makefile#11 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/man/man9/Makefile,v 1.190 2003/05/16 19:22:27 hmp Exp $ +# $FreeBSD: src/share/man/man9/Makefile,v 1.191 2003/05/21 17:37:22 ru Exp $ MAN= BUF_LOCK.9 BUF_LOCKFREE.9 BUF_LOCKINIT.9 BUF_REFCNT.9 \ BUF_TIMELOCK.9 BUF_UNLOCK.9 BUS_PRINT_CHILD.9 BUS_READ_IVAR.9 \ @@ -127,6 +127,18 @@ MLINKS+=byteorder.9 le16toh.9 MLINKS+=byteorder.9 le32toh.9 MLINKS+=byteorder.9 le64toh.9 +MLINKS+=byteorder.9 be16enc.9 +MLINKS+=byteorder.9 be16dec.9 +MLINKS+=byteorder.9 be32enc.9 +MLINKS+=byteorder.9 be32dec.9 +MLINKS+=byteorder.9 be64enc.9 +MLINKS+=byteorder.9 be64dec.9 +MLINKS+=byteorder.9 le16enc.9 +MLINKS+=byteorder.9 le16dec.9 +MLINKS+=byteorder.9 le32enc.9 +MLINKS+=byteorder.9 le32dec.9 +MLINKS+=byteorder.9 le64enc.9 +MLINKS+=byteorder.9 le64dec.9 MLINKS+=condvar.9 cv_init.9 MLINKS+=condvar.9 cv_destroy.9 MLINKS+=condvar.9 cv_wait.9 ==== //depot/projects/hammer/sys/geom/geom_disk.c#12 (text+ko) ==== @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/geom/geom_disk.c,v 1.70 2003/05/12 20:15:28 phk Exp $ + * $FreeBSD: src/sys/geom/geom_disk.c,v 1.71 2003/05/21 18:52:29 phk Exp $ */ #include "opt_geom.h" @@ -104,6 +104,8 @@ w += pp->acw; e += pp->ace; dp = pp->geom->softc; + if (dp == NULL) + return (ENXIO); error = 0; if ((pp->acr + pp->acw + pp->ace) == 0 && (r + w + e) > 0) { if (dp->d_open != NULL) { @@ -193,6 +195,8 @@ off_t off; dp = bp->bio_to->geom->softc; + if (dp == NULL) + g_io_deliver(bp, ENXIO); error = EJUSTRETURN; switch(bp->bio_cmd) { case BIO_DELETE: ==== //depot/projects/hammer/sys/kern/kern_switch.c#9 (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/kern/kern_switch.c,v 1.57 2003/04/02 23:53:29 peter Exp $ + * $FreeBSD: src/sys/kern/kern_switch.c,v 1.58 2003/05/21 18:53:25 julian Exp $ */ /*** @@ -162,12 +162,15 @@ ke->ke_flags |= KEF_DIDRUN; /* - * Only allow non system threads to run in panic - * if they are the one we are tracing. (I think.. [JRE]) + * If we are in panic, only allow system threads, + * plus the one we are running in, to be run. */ if (panicstr && ((td->td_proc->p_flag & P_SYSTEM) == 0 && - (td->td_flags & TDF_INPANIC) == 0)) + (td->td_flags & TDF_INPANIC) == 0)) { + /* note that it is no longer on the run queue */ + TD_SET_CAN_RUN(td); goto retry; + } TD_SET_RUNNING(td); return (td);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200305211926.h4LJQRhc049452>