diff options
| author | jeff <jeff@FreeBSD.org> | 2003-02-25 03:37:48 +0000 |
|---|---|---|
| committer | jeff <jeff@FreeBSD.org> | 2003-02-25 03:37:48 +0000 |
| commit | 9e4c9a6ce908881b1e6f83cbb906a9fce08dd3ab (patch) | |
| tree | df5eb5e550ba49b92f45eadaca861cb18128ad5d /sys/kern/vfs_cluster.c | |
| parent | 541937cf7373ff6a61c871266ea041503bb02233 (diff) | |
| download | FreeBSD-src-9e4c9a6ce908881b1e6f83cbb906a9fce08dd3ab.zip FreeBSD-src-9e4c9a6ce908881b1e6f83cbb906a9fce08dd3ab.tar.gz | |
- Add an interlock argument to BUF_LOCK and BUF_TIMELOCK.
- Remove the buftimelock mutex and acquire the buf's interlock to protect
these fields instead.
- Hold the vnode interlock while locking bufs on the clean/dirty queues.
This reduces some cases from one BUF_LOCK with a LK_NOWAIT and another
BUF_LOCK with a LK_TIMEFAIL to a single lock.
Reviewed by: arch, mckusick
Diffstat (limited to 'sys/kern/vfs_cluster.c')
| -rw-r--r-- | sys/kern/vfs_cluster.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sys/kern/vfs_cluster.c b/sys/kern/vfs_cluster.c index 90c8852..96e541c 100644 --- a/sys/kern/vfs_cluster.c +++ b/sys/kern/vfs_cluster.c @@ -403,7 +403,8 @@ cluster_rbuild(vp, filesize, lbn, blkno, size, run, fbp) */ if ((tbp = incore(vp, lbn + i)) != NULL && (tbp->b_flags & B_INVAL) == 0) { - if (BUF_LOCK(tbp, LK_EXCLUSIVE | LK_NOWAIT)) + if (BUF_LOCK(tbp, + LK_EXCLUSIVE | LK_NOWAIT, NULL)) break; BUF_UNLOCK(tbp); @@ -794,7 +795,7 @@ cluster_wbuild(vp, size, start_lbn, len) */ if (((tbp = incore(vp, start_lbn)) == NULL) || ((tbp->b_flags & (B_LOCKED | B_INVAL | B_DELWRI)) != B_DELWRI) || - BUF_LOCK(tbp, LK_EXCLUSIVE | LK_NOWAIT)) { + BUF_LOCK(tbp, LK_EXCLUSIVE | LK_NOWAIT, NULL)) { ++start_lbn; --len; splx(s); @@ -884,7 +885,8 @@ cluster_wbuild(vp, size, start_lbn, len) (bp->b_flags & (B_VMIO | B_NEEDCOMMIT))) || (tbp->b_flags & B_LOCKED) || tbp->b_wcred != bp->b_wcred || - BUF_LOCK(tbp, LK_EXCLUSIVE | LK_NOWAIT)) { + BUF_LOCK(tbp, LK_EXCLUSIVE | LK_NOWAIT, + NULL)) { splx(s); break; } |
