d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix a buglet which jordan made me provoke :-)

Browse Source
This commit is contained in:
Poul-Henning Kamp 1999-09-21 12:05:38 +00:00
parent 8b3642e112
commit 33edfabe57
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/dev/md/md.c
View File

@ -32,6 +32,10 @@
#include <isa/isareg.h> #include <isa/isareg.h>
#include <isa/isavar.h> #include <isa/isavar.h>
#ifndef MDNSECT
#define MDNSECT (10000 * 2)
#endif
MALLOC_DEFINE(M_MD, "MD disk", "Memory Disk"); MALLOC_DEFINE(M_MD, "MD disk", "Memory Disk");
MALLOC_DEFINE(M_MDSECT, "MD sectors", "Memory Disk Sectors"); MALLOC_DEFINE(M_MDSECT, "MD sectors", "Memory Disk Sectors");
@ -168,18 +172,20 @@ mdstrategy(struct buf *bp)
if (secno < sc->nsecp) { if (secno < sc->nsecp) {
secpp = &sc->secp[secno]; secpp = &sc->secp[secno];
if ((u_int)secpp > 255) { if ((u_int)*secpp > 255) {
secp = *secpp; secp = *secpp;
secval = 0; secval = 0;
} else { } else {
secp = 0; secp = 0;
secval = (u_int) secpp; secval = (u_int) *secpp;
} }
} else { } else {
secpp = 0; secpp = 0;
secp = 0; secp = 0;
secval = 0; secval = 0;
} }
if (md_debug > 2)
printf("%x %p %p %d\n", bp->b_flags, secpp, secp, secval);
if (bp->b_flags & B_FREEBUF) { if (bp->b_flags & B_FREEBUF) {
if (secpp) { if (secpp) {
@ -234,10 +240,8 @@ mdstrategy(struct buf *bp)
} }
bp->b_resid = 0; bp->b_resid = 0;
devstat_end_transaction_buf(&sc->stats, bp);
biodone(bp); biodone(bp);
devstat_end_transaction(&sc->stats, bp->b_bcount,
DEVSTAT_TAG_NONE, dop);
s = splbio(); s = splbio();
} }
sc->busy = 0; sc->busy = 0;
@ -263,7 +267,7 @@ mdcreate(void)
&md_cdevsw, &mddisk_cdevsw); &md_cdevsw, &mddisk_cdevsw);
sc->dev->si_drv1 = sc; sc->dev->si_drv1 = sc;
sc->nsect = 10000 * 2; /* for now */ sc->nsect = MDNSECT; /* for now */
MALLOC(sc->secp, u_char **, sizeof(u_char *), M_MD, M_WAITOK); MALLOC(sc->secp, u_char **, sizeof(u_char *), M_MD, M_WAITOK);
bzero(sc->secp, sizeof(u_char *)); bzero(sc->secp, sizeof(u_char *));
sc->nsecp = 1; sc->nsecp = 1;