Index: vfs_subr.c =================================================================== --- vfs_subr.c (wersja 180776) +++ vfs_subr.c (kopia robocza) @@ -1144,7 +1144,7 @@ { CTR2(KTR_VFS, "vinvalbuf vp %p flags %d", vp, flags); - ASSERT_VOP_LOCKED(vp, "vinvalbuf"); + ASSERT_VOP_ELOCKED(vp, "vinvalbuf"); return (bufobj_invalbuf(&vp->v_bufobj, flags, td, slpflag, slptimeo)); } @@ -1241,7 +1241,7 @@ */ trunclbn = (length + blksize - 1) / blksize; - ASSERT_VOP_LOCKED(vp, "vtruncbuf"); + ASSERT_VOP_ELOCKED(vp, "vtruncbuf"); restart: bo = &vp->v_bufobj; BO_LOCK(bo); @@ -2282,7 +2282,7 @@ vinactive(struct vnode *vp, struct thread *td) { - ASSERT_VOP_LOCKED(vp, "vinactive"); + ASSERT_VOP_ELOCKED(vp, "vinactive"); ASSERT_VI_LOCKED(vp, "vinactive"); VNASSERT((vp->v_iflag & VI_DOINGINACT) == 0, vp, ("vinactive: recursed on VI_DOINGINACT")); @@ -2439,7 +2439,7 @@ { int recycled; - ASSERT_VOP_LOCKED(vp, "vrecycle"); + ASSERT_VOP_ELOCKED(vp, "vrecycle"); recycled = 0; VI_LOCK(vp); if (vp->v_usecount == 0) { @@ -2474,7 +2474,7 @@ struct mount *mp; CTR1(KTR_VFS, "vgonel: vp %p", vp); - ASSERT_VOP_LOCKED(vp, "vgonel"); + ASSERT_VOP_ELOCKED(vp, "vgonel"); ASSERT_VI_LOCKED(vp, "vgonel"); VNASSERT(vp->v_holdcnt, vp, ("vgonel: vp %p has no reference.", vp)); @@ -3695,7 +3695,7 @@ /* Check the target. */ if (a->a_tvp) - ASSERT_VOP_LOCKED(a->a_tvp, "vop_rename: tvp not locked"); + ASSERT_VOP_ELOCKED(a->a_tvp, "vop_rename: tvp not exclusively locked"); ASSERT_VOP_LOCKED(a->a_tdvp, "vop_rename: tdvp not locked"); #endif if (a->a_tdvp != a->a_fdvp)