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

Correctly deal with non-DEVBSIZE drives.

Browse Source 
Allow BIO_DELETE through too.

This fixes swap-backed md(4) devices.

Sponsored by:   DARPA & NAI Labs.
This commit is contained in:
phk 2002-10-07 07:15:37 +00:00
parent f684519668
commit 2490bca6ea
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/geom/geom_disk.c
View File

@ -142,14 +142,20 @@ g_disk_start(struct bio *bp)
dp = bp->bio_to->geom->softc;
dev = dp->d_dev;
error = 0;
error = EJUSTRETURN;
switch(bp->bio_cmd) {
case BIO_DELETE:
if (!(devsw(dev)->d_flags & D_CANFREE)) {
error = 0;
break;
}
/* fall-through */
case BIO_READ:
case BIO_WRITE:
bp2 = g_clone_bio(bp);
bp2->bio_done = g_disk_done;
bp2->bio_blkno = bp2->bio_offset >> DEV_BSHIFT;
bp2->bio_pblkno = bp2->bio_blkno;
bp2->bio_pblkno = bp2->bio_offset / dp->d_sectorsize;
bp2->bio_bcount = bp2->bio_length;
bp2->bio_dev = dev;
mtx_lock(&Giant);
@ -192,9 +198,8 @@ g_disk_start(struct bio *bp)
error = EOPNOTSUPP;
break;
}
if (error) {
if (error != EJUSTRETURN)
g_io_deliver(bp, error);
}
return;
}