36c36
< * $Id: vfs_cluster.c,v 1.82 1999/06/16 15:54:30 dg Exp $
---
> * $Id: vfs_cluster.c,v 1.83 1999/06/17 01:25:25 julian Exp $
142c142
< for(i=1;i<maxra;i++) {
---
> for (i = 1; i < maxra; i++) {
157c157
< ((tbp->b_flags & B_BUSY) == 0) &&
---
> BUF_REFCNT(tbp) == 0 &&
254a255
> BUF_KERNPROC(bp);
287a289
> BUF_KERNPROC(rbp);
349c351
< bp->b_flags = B_ASYNC | B_READ | B_CALL | B_BUSY | B_CLUSTER | B_VMIO;
---
> bp->b_flags = B_ASYNC | B_READ | B_CALL | B_CLUSTER | B_VMIO;
373c375
< if (tbp->b_flags & B_BUSY)
---
> if (BUF_LOCK(tbp, LK_EXCLUSIVE | LK_NOWAIT))
374a377
> BUF_UNLOCK(tbp);
641c644,645
< ((tbp->b_flags & (B_INVAL|B_BUSY|B_DELWRI)) != B_DELWRI)) {
---
> ((tbp->b_flags & (B_INVAL | B_DELWRI)) != B_DELWRI) ||
> BUF_LOCK(tbp, LK_EXCLUSIVE | LK_NOWAIT)) {
648d651
< tbp->b_flags |= B_BUSY;
690c693
< bp->b_flags |= B_CALL | B_BUSY | B_CLUSTER |
---
> bp->b_flags |= B_CALL | B_CLUSTER |
715,717c718,719
< if ((tbp->b_flags &
< (B_VMIO | B_CLUSTEROK | B_INVAL | B_BUSY |
< B_DELWRI | B_NEEDCOMMIT))
---
> if ((tbp->b_flags & (B_VMIO | B_CLUSTEROK |
> B_INVAL | B_DELWRI | B_NEEDCOMMIT))
719c721,723
< (bp->b_flags & (B_VMIO | B_NEEDCOMMIT)))) {
---
> (bp->b_flags & (B_VMIO | B_NEEDCOMMIT))) ||
> tbp->b_wcred != bp->b_wcred ||
> BUF_LOCK(tbp, LK_EXCLUSIVE | LK_NOWAIT)) {
724,728d727
< if (tbp->b_wcred != bp->b_wcred) {
< splx(s);
< break;
< }
<
738a738
> BUF_UNLOCK(tbp);
748d747
< tbp->b_flags |= B_BUSY;