diff options
| author | Mateusz Guzik <mjg@FreeBSD.org> | 2020-02-15 21:48:48 +0000 |
|---|---|---|
| committer | Mateusz Guzik <mjg@FreeBSD.org> | 2020-02-15 21:48:48 +0000 |
| commit | 4d51e175f959ec7716168622568dbc8419ead167 (patch) | |
| tree | 8de52a18df19f87ed421d5e09366ce098cac5820 /sys/ufs | |
| parent | 485e2f3f554e4ca6d04816f3b8aba07b33382be8 (diff) | |
| download | src-test-4d51e175f959ec7716168622568dbc8419ead167.tar.gz src-test-4d51e175f959ec7716168622568dbc8419ead167.zip | |
Notes
Diffstat (limited to 'sys/ufs')
| -rw-r--r-- | sys/ufs/ffs/ffs_vnops.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sys/ufs/ffs/ffs_vnops.c b/sys/ufs/ffs/ffs_vnops.c index 48121feb1996a..6201bee861719 100644 --- a/sys/ufs/ffs/ffs_vnops.c +++ b/sys/ufs/ffs/ffs_vnops.c @@ -444,9 +444,8 @@ ffs_lock(ap) VNPASS(vp->v_holdcnt != 0, vp); #endif lkp = vp->v_vnlock; - result = _lockmgr_args(lkp, flags, VI_MTX(vp), - LK_WMESG_DEFAULT, LK_PRIO_DEFAULT, LK_TIMO_DEFAULT, - ap->a_file, ap->a_line); + result = lockmgr_lock_flags(lkp, flags, + &VI_MTX(vp)->lock_object, ap->a_file, ap->a_line); if (lkp == vp->v_vnlock || result != 0) break; /* @@ -457,9 +456,7 @@ ffs_lock(ap) * right lock. Release it, and try to get the * new lock. */ - (void) _lockmgr_args(lkp, LK_RELEASE, NULL, - LK_WMESG_DEFAULT, LK_PRIO_DEFAULT, LK_TIMO_DEFAULT, - ap->a_file, ap->a_line); + lockmgr_unlock(lkp); if ((flags & (LK_INTERLOCK | LK_NOWAIT)) == (LK_INTERLOCK | LK_NOWAIT)) return (EBUSY); |