diff options
| author | attilio <attilio@FreeBSD.org> | 2008-02-15 21:04:36 +0000 |
|---|---|---|
| committer | attilio <attilio@FreeBSD.org> | 2008-02-15 21:04:36 +0000 |
| commit | 265cb5fb912b23e01eeb795e8c6772ab3d4fe2cf (patch) | |
| tree | 17822f7f9f16c77dddbe6d6695c199b1b46a5764 /sys/ufs/ffs | |
| parent | 827638d44991222de82fda30ffc919f784b520e7 (diff) | |
| download | FreeBSD-src-265cb5fb912b23e01eeb795e8c6772ab3d4fe2cf.zip FreeBSD-src-265cb5fb912b23e01eeb795e8c6772ab3d4fe2cf.tar.gz | |
- Introduce lockmgr_args() in the lockmgr space. This function performs
the same operation of lockmgr() but accepting a custom wmesg, prio and
timo for the particular lock instance, overriding default values
lkp->lk_wmesg, lkp->lk_prio and lkp->lk_timo.
- Use lockmgr_args() in order to implement BUF_TIMELOCK()
- Cleanup BUF_LOCK()
- Remove LK_INTERNAL as it is nomore used in the lockmgr namespace
Tested by: Andrea Barberio <insomniac at slackware dot it>
Diffstat (limited to 'sys/ufs/ffs')
| -rw-r--r-- | sys/ufs/ffs/ffs_vnops.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sys/ufs/ffs/ffs_vnops.c b/sys/ufs/ffs/ffs_vnops.c index a42f5b9..5ecf053 100644 --- a/sys/ufs/ffs/ffs_vnops.c +++ b/sys/ufs/ffs/ffs_vnops.c @@ -370,8 +370,9 @@ ffs_lock(ap) flags |= LK_INTERLOCK; } lkp = vp->v_vnlock; - result = _lockmgr(lkp, flags, VI_MTX(vp), ap->a_file, - ap->a_line); + result = _lockmgr_args(lkp, flags, VI_MTX(vp), + LK_WMESG_DEFAULT, LK_PRIO_DEFAULT, LK_TIMO_DEFAULT, + ap->a_file, ap->a_line); if (lkp == vp->v_vnlock || result != 0) break; /* @@ -382,7 +383,8 @@ ffs_lock(ap) * right lock. Release it, and try to get the * new lock. */ - (void) _lockmgr(lkp, LK_RELEASE, VI_MTX(vp), + (void) _lockmgr_args(lkp, LK_RELEASE, VI_MTX(vp), + LK_WMESG_DEFAULT, LK_PRIO_DEFAULT, LK_TIMO_DEFAULT, ap->a_file, ap->a_line); if ((flags & LK_TYPE_MASK) == LK_UPGRADE) flags = (flags & ~LK_TYPE_MASK) | LK_EXCLUSIVE; |
