mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-14 10:09:48 +00:00
Code Issues Releases Activity

Assert proper use of bio_caller1, bio_caller2, bio_cflags, bio_driver1,

Browse Source 
bio_driver2 and bio_pflags fields.

Reviewed by:	phk
This commit is contained in:
Pawel Jakub Dawidek 2006-03-01 19:01:58 +00:00
parent 9afd3aec66
commit 92ee312dd4
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=156170
2 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sys/geom/geom_io.c
View File

@ -282,6 +282,21 @@ g_io_request(struct bio *bp, struct g_consumer *cp)
KASSERT(bp->bio_data != NULL, ("NULL bp->data in g_io_request"));
pp = cp->provider;
KASSERT(pp != NULL, ("consumer not attached in g_io_request"));
#ifdef DIAGNOSTIC
KASSERT(bp->bio_driver1 == NULL,
("bio_driver1 used by the consumer (geom %s)", cp->geom->name));
KASSERT(bp->bio_driver2 == NULL,
("bio_driver2 used by the consumer (geom %s)", cp->geom->name));
KASSERT(bp->bio_pflags == 0,
("bio_pflags used by the consumer (geom %s)", cp->geom->name));
/*
* Remember consumer's private fields, so we can detect if they were
* modified by the provider.
*/
bp->_bio_caller1 = bp->bio_caller1;
bp->_bio_caller2 = bp->bio_caller2;
bp->_bio_cflags = bp->bio_cflags;
#endif
if (bp->bio_cmd & (BIO_READ|BIO_WRITE|BIO_DELETE)) {
KASSERT(bp->bio_offset % cp->provider->sectorsize == 0,
@ -336,6 +351,14 @@ g_io_deliver(struct bio *bp, int error)
KASSERT(bp != NULL, ("NULL bp in g_io_deliver"));
pp = bp->bio_to;
KASSERT(pp != NULL, ("NULL bio_to in g_io_deliver"));
#ifdef DIAGNOSTIC
KASSERT(bp->bio_caller1 == bp->_bio_caller1,
("bio_caller1 used by the provider %s", pp->name));
KASSERT(bp->bio_caller2 == bp->_bio_caller2,
("bio_caller2 used by the provider %s", pp->name));
KASSERT(bp->bio_cflags == bp->_bio_cflags,
("bio_cflags used by the provider %s", pp->name));
#endif
cp = bp->bio_from;
if (cp == NULL) {
bp->bio_error = error;

5
sys/sys/bio.h
View File

@ -78,6 +78,11 @@ struct bio {
bio_task_t *bio_task; /* Task_queue handler */
void *bio_task_arg; /* Argument to above */
#ifdef DIAGNOSTIC
void *_bio_caller1;
void *_bio_caller2;
uint8_t _bio_cflags;
#endif
/* XXX: these go away when bio chaining is introduced */
daddr_t bio_pblkno; /* physical block number */