summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorMerlin Scholz <merlin@scholz.ruhr>2023-08-19 19:16:22 +0200
committerMerlin Scholz <merlin@scholz.ruhr>2023-08-19 19:16:22 +0200
commite7b3826cda40b7e543318c19b9093dcceb8b4237 (patch)
treebf61ebee0cfbd1f3e2f4f62e00ef7ff655f1aa5d /sys/dev
parent365daf5cefc0591283d5625e2e15b7e532568c33 (diff)
Add logging for buf->b_cflags BC_BUSY changeslockdoc-10.99.5-vfs-0.3
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/ata/ata_raid.c4
-rw-r--r--sys/dev/dkwedge/dk.c3
-rw-r--r--sys/dev/fss.c7
-rw-r--r--sys/dev/isa/fd.c3
-rw-r--r--sys/dev/ld.c3
-rw-r--r--sys/dev/raidframe/rf_diskqueue.c3
-rw-r--r--sys/dev/vme/xd.c3
-rw-r--r--sys/dev/vme/xy.c3
8 files changed, 27 insertions, 2 deletions
diff --git a/sys/dev/ata/ata_raid.c b/sys/dev/ata/ata_raid.c
index d63f55e151e..a1795a4fc53 100644
--- a/sys/dev/ata/ata_raid.c
+++ b/sys/dev/ata/ata_raid.c
@@ -313,7 +313,9 @@ ata_raid_config_block_rw(struct vnode *vp, daddr_t blkno, void *tbuf,
bp->b_proc = curproc;
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);
+#endif
VOP_STRATEGY(vp, bp);
error = biowait(bp);
diff --git a/sys/dev/dkwedge/dk.c b/sys/dev/dkwedge/dk.c
index c201cdf815f..8f3affaf4cb 100644
--- a/sys/dev/dkwedge/dk.c
+++ b/sys/dev/dkwedge/dk.c
@@ -1210,6 +1210,9 @@ dkwedge_read(struct disk *pdk, struct vnode *vp, daddr_t blkno,
bp = getiobuf(bdvp, true);
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);
+#endif
bp->b_dev = bdev;
bp->b_data = tbuf;
bp->b_bufsize = bp->b_bcount = len;
diff --git a/sys/dev/fss.c b/sys/dev/fss.c
index 2db93f5b996..8d1e7c78ff7 100644
--- a/sys/dev/fss.c
+++ b/sys/dev/fss.c
@@ -1047,6 +1047,9 @@ restart:
mbp->b_resid = mbp->b_bcount = todo;
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);
+#endif
mbp->b_dev = sc->sc_bdev;
while (todo > 0) {
len = todo;
@@ -1293,7 +1296,9 @@ fss_bs_thread(void *arg)
nbp->b_lblkno = 0;
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);
+#endif
bdev_strategy(nbp);
error = biowait(nbp);
diff --git a/sys/dev/isa/fd.c b/sys/dev/isa/fd.c
index e1d28801a8d..29cdc6ac2ee 100644
--- a/sys/dev/isa/fd.c
+++ b/sys/dev/isa/fd.c
@@ -1612,6 +1612,9 @@ fdformat(dev_t dev, struct ne7_fd_formb *finfo, struct lwp *l)
return ENOBUFS;
bp->b_cflags = BC_BUSY;
+#ifdef LOCKDOC_VFS
+ lockdoc_log_lock(P_WRITE, &(bp->b_cflags), __FILE__, __LINE__, __func__, "b_cflags", 0);
+#endif
bp->b_flags = B_PHYS | B_FORMAT;
bp->b_proc = l->l_proc;
bp->b_dev = dev;
diff --git a/sys/dev/ld.c b/sys/dev/ld.c
index 562698e1b30..54296b136c0 100644
--- a/sys/dev/ld.c
+++ b/sys/dev/ld.c
@@ -690,6 +690,9 @@ ld_discard(device_t dev, off_t pos, off_t len)
bp->b_bcount = 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);
+#endif
error = (*sc->sc_discard)(sc, bp);
if (error == 0)
diff --git a/sys/dev/raidframe/rf_diskqueue.c b/sys/dev/raidframe/rf_diskqueue.c
index 2f8f56b47a1..1eec20486f6 100644
--- a/sys/dev/raidframe/rf_diskqueue.c
+++ b/sys/dev/raidframe/rf_diskqueue.c
@@ -392,6 +392,9 @@ rf_CreateDiskQueueData(RF_IoType_t typ, RF_SectorNum_t ssect,
buf_init(p->bp);
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);
+#endif
if (mbp) {
SET(p->bp->b_flags, mbp->b_flags & rf_b_pass);
p->bp->b_proc = mbp->b_proc;
diff --git a/sys/dev/vme/xd.c b/sys/dev/vme/xd.c
index f6ebaba47f6..14050bc53fd 100644
--- a/sys/dev/vme/xd.c
+++ b/sys/dev/vme/xd.c
@@ -345,6 +345,9 @@ xddummystrat(struct buf *bp)
memcpy(bp->b_data, xd_labeldata, XDFM_BPS);
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);
+#endif
}
int
diff --git a/sys/dev/vme/xy.c b/sys/dev/vme/xy.c
index eabb99f56f6..b5a0b2e4bb7 100644
--- a/sys/dev/vme/xy.c
+++ b/sys/dev/vme/xy.c
@@ -261,6 +261,9 @@ xydummystrat(struct buf *bp)
memcpy(bp->b_data, xy_labeldata, XYFM_BPS);
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);
+#endif
}
int