diff options
| -rw-r--r-- | sys/kern/kern_lock.c | 4 | ||||
| -rw-r--r-- | sys/kern/vfs_default.c | 2 | ||||
| -rw-r--r-- | sys/sys/lockmgr.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/sys/kern/kern_lock.c b/sys/kern/kern_lock.c index 61977d707d17..09e56cc08005 100644 --- a/sys/kern/kern_lock.c +++ b/sys/kern/kern_lock.c @@ -934,7 +934,7 @@ out: } int -lockmgr_lock_fast_path(struct lock *lk, u_int flags, struct lock_object *ilk, +lockmgr_lock_flags(struct lock *lk, u_int flags, struct lock_object *ilk, const char *file, int line) { struct lock_class *class; @@ -1123,7 +1123,7 @@ out: * 2. returning with an error after sleep * 3. unlocking the interlock * - * If in doubt, use lockmgr_*_fast_path. + * If in doubt, use lockmgr_lock_flags. */ int lockmgr_slock(struct lock *lk, u_int flags, const char *file, int line) diff --git a/sys/kern/vfs_default.c b/sys/kern/vfs_default.c index 73106f4de033..013fd67fde64 100644 --- a/sys/kern/vfs_default.c +++ b/sys/kern/vfs_default.c @@ -513,7 +513,7 @@ vop_stdlock(ap) struct mtx *ilk; ilk = VI_MTX(vp); - return (lockmgr_lock_fast_path(vp->v_vnlock, ap->a_flags, + return (lockmgr_lock_flags(vp->v_vnlock, ap->a_flags, &ilk->lock_object, ap->a_file, ap->a_line)); } diff --git a/sys/sys/lockmgr.h b/sys/sys/lockmgr.h index fd0004618e93..8e5e4d43255f 100644 --- a/sys/sys/lockmgr.h +++ b/sys/sys/lockmgr.h @@ -70,7 +70,7 @@ struct thread; */ int __lockmgr_args(struct lock *lk, u_int flags, struct lock_object *ilk, const char *wmesg, int prio, int timo, const char *file, int line); -int lockmgr_lock_fast_path(struct lock *lk, u_int flags, +int lockmgr_lock_flags(struct lock *lk, u_int flags, struct lock_object *ilk, const char *file, int line); int lockmgr_slock(struct lock *lk, u_int flags, const char *file, int line); int lockmgr_xlock(struct lock *lk, u_int flags, const char *file, int line); |