Author: mjg
Date: Sat Feb 15 21:48:48 2020
New Revision: 357981
URL: https://svnweb.freebsd.org/changeset/base/357981
Log:
ufs: use faster lockgmr entry points in ffs_lock
Modified:
head/sys/ufs/ffs/ffs_vnops.c
Modified: head/sys/ufs/ffs/ffs_vnops.c
==============================================================================
--- head/sys/ufs/ffs/ffs_vnops.c Sat Feb 15 21:21:13 2020
(r357980)
+++ head/sys/ufs/ffs/ffs_vnops.c Sat Feb 15 21:48:48 2020
(r357981)
@@ -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);
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
