diff options
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/ata/ata_raid.c | 2 | ||||
| -rw-r--r-- | sys/dev/dkwedge/dk.c | 2 | ||||
| -rw-r--r-- | sys/dev/fss.c | 4 | ||||
| -rw-r--r-- | sys/dev/isa/fd.c | 2 | ||||
| -rw-r--r-- | sys/dev/ld.c | 2 | ||||
| -rw-r--r-- | sys/dev/raidframe/rf_diskqueue.c | 2 | ||||
| -rw-r--r-- | sys/dev/vme/xd.c | 2 | ||||
| -rw-r--r-- | sys/dev/vme/xy.c | 2 |
8 files changed, 9 insertions, 9 deletions
diff --git a/sys/dev/ata/ata_raid.c b/sys/dev/ata/ata_raid.c index a1795a4fc53..645bb156a04 100644 --- a/sys/dev/ata/ata_raid.c +++ b/sys/dev/ata/ata_raid.c @@ -314,7 +314,7 @@ ata_raid_config_block_rw(struct vnode *vp, daddr_t blkno, void *tbuf, bp->b_data = tbuf; SET(bp->b_cflags, BC_BUSY); /* mark buffer busy */ #ifdef LOCKDOC_VFS - lockdoc_log_lock(P_WRITE, &(bp->b_cflags), __FILE__, __LINE__, __func__, "b_cflags", 0); + b_cflags_busy(&(bp->b_cflags)); #endif VOP_STRATEGY(vp, bp); error = biowait(bp); diff --git a/sys/dev/dkwedge/dk.c b/sys/dev/dkwedge/dk.c index 8f3affaf4cb..a5ac3e44a40 100644 --- a/sys/dev/dkwedge/dk.c +++ b/sys/dev/dkwedge/dk.c @@ -1211,7 +1211,7 @@ dkwedge_read(struct disk *pdk, struct vnode *vp, daddr_t blkno, bp->b_flags = B_READ; bp->b_cflags = BC_BUSY; #ifdef LOCKDOC_VFS - lockdoc_log_lock(P_WRITE, &(bp->b_cflags), __FILE__, __LINE__, __func__, "b_cflags", 0); + b_cflags_busy(&(bp->b_cflags)); #endif bp->b_dev = bdev; bp->b_data = tbuf; diff --git a/sys/dev/fss.c b/sys/dev/fss.c index 8d1e7c78ff7..9d86cd0d959 100644 --- a/sys/dev/fss.c +++ b/sys/dev/fss.c @@ -1048,7 +1048,7 @@ restart: mbp->b_flags = B_READ; mbp->b_cflags = BC_BUSY; #ifdef LOCKDOC_VFS - lockdoc_log_lock(P_WRITE, &(mbp->b_cflags), __FILE__, __LINE__, __func__, "b_cflags", 0); + b_cflags_busy(&(mbp->b_cflags)); #endif mbp->b_dev = sc->sc_bdev; while (todo > 0) { @@ -1297,7 +1297,7 @@ fss_bs_thread(void *arg) nbp->b_dev = sc->sc_bdev; SET(nbp->b_cflags, BC_BUSY); /* mark buffer busy */ #ifdef LOCKDOC_VFS - lockdoc_log_lock(P_WRITE, &(nbp->b_cflags), __FILE__, __LINE__, __func__, "b_cflags", 0); + b_cflags_busy(&(nbp->b_cflags)); #endif bdev_strategy(nbp); diff --git a/sys/dev/isa/fd.c b/sys/dev/isa/fd.c index 29cdc6ac2ee..3959edd4fd2 100644 --- a/sys/dev/isa/fd.c +++ b/sys/dev/isa/fd.c @@ -1613,7 +1613,7 @@ fdformat(dev_t dev, struct ne7_fd_formb *finfo, struct lwp *l) bp->b_cflags = BC_BUSY; #ifdef LOCKDOC_VFS - lockdoc_log_lock(P_WRITE, &(bp->b_cflags), __FILE__, __LINE__, __func__, "b_cflags", 0); + b_cflags_busy(&(bp->b_cflags)); #endif bp->b_flags = B_PHYS | B_FORMAT; bp->b_proc = l->l_proc; diff --git a/sys/dev/ld.c b/sys/dev/ld.c index 54296b136c0..b8e122ec1bd 100644 --- a/sys/dev/ld.c +++ b/sys/dev/ld.c @@ -691,7 +691,7 @@ ld_discard(device_t dev, off_t pos, off_t len) bp->b_flags = B_WRITE; bp->b_cflags = BC_BUSY; #ifdef LOCKDOC_VFS - lockdoc_log_lock(P_WRITE, &(bp->b_cflags), __FILE__, __LINE__, __func__, "b_cflags", 0); + b_cflags_busy(&(bp->b_cflags)); #endif error = (*sc->sc_discard)(sc, bp); diff --git a/sys/dev/raidframe/rf_diskqueue.c b/sys/dev/raidframe/rf_diskqueue.c index 1eec20486f6..369d5d3b605 100644 --- a/sys/dev/raidframe/rf_diskqueue.c +++ b/sys/dev/raidframe/rf_diskqueue.c @@ -393,7 +393,7 @@ rf_CreateDiskQueueData(RF_IoType_t typ, RF_SectorNum_t ssect, SET(p->bp->b_cflags, BC_BUSY); /* mark buffer busy */ #ifdef LOCKDOC_VFS - lockdoc_log_lock(P_WRITE, &(p->bp->b_cflags), __FILE__, __LINE__, __func__, "b_cflags", 0); + b_cflags_busy(&(p->bp->b_cflags)); #endif if (mbp) { SET(p->bp->b_flags, mbp->b_flags & rf_b_pass); diff --git a/sys/dev/vme/xd.c b/sys/dev/vme/xd.c index 14050bc53fd..53ab4ad88c5 100644 --- a/sys/dev/vme/xd.c +++ b/sys/dev/vme/xd.c @@ -346,7 +346,7 @@ xddummystrat(struct buf *bp) bp->b_oflags |= BO_DONE; bp->b_cflags &= ~BC_BUSY; #ifdef LOCKDOC_VFS - lockdoc_log_lock(V_WRITE, &(bp->b_cflags), __FILE__, __LINE__, __func__, "b_cflags", 0); + b_cflags_unbusy(&(bp->b_cflags)); #endif } diff --git a/sys/dev/vme/xy.c b/sys/dev/vme/xy.c index b5a0b2e4bb7..1d1f1205395 100644 --- a/sys/dev/vme/xy.c +++ b/sys/dev/vme/xy.c @@ -262,7 +262,7 @@ xydummystrat(struct buf *bp) bp->b_oflags |= BO_DONE; bp->b_cflags &= ~BC_BUSY; #ifdef LOCKDOC_VFS - lockdoc_log_lock(V_WRITE, &(bp->b_cflags), __FILE__, __LINE__, __func__, "b_cflags", 0); + b_cflags_unbusy(&(bp->b_cflags)); #endif } |
