From owner-svn-src-head@freebsd.org Fri Feb 14 11:20:26 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id BA68C24757A; Fri, 14 Feb 2020 11:20:26 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48JrXB4ZFrz4QGD; Fri, 14 Feb 2020 11:20:26 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 97EDF22BBA; Fri, 14 Feb 2020 11:20:26 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 01EBKQOn029164; Fri, 14 Feb 2020 11:20:26 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 01EBKQOY029163; Fri, 14 Feb 2020 11:20:26 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202002141120.01EBKQOY029163@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Fri, 14 Feb 2020 11:20:26 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r357906 - in head/sys: kern sys X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: in head/sys: kern sys X-SVN-Commit-Revision: 357906 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Feb 2020 11:20:26 -0000 Author: mjg Date: Fri Feb 14 11:20:25 2020 New Revision: 357906 URL: https://svnweb.freebsd.org/changeset/base/357906 Log: lockmgr: retire the unused lockmgr_unlock_fast_path routine Modified: head/sys/kern/kern_lock.c head/sys/sys/lockmgr.h Modified: head/sys/kern/kern_lock.c ============================================================================== --- head/sys/kern/kern_lock.c Fri Feb 14 09:36:35 2020 (r357905) +++ head/sys/kern/kern_lock.c Fri Feb 14 11:20:25 2020 (r357906) @@ -1114,46 +1114,6 @@ out: return (0); } -int -lockmgr_unlock_fast_path(struct lock *lk, u_int flags, struct lock_object *ilk) -{ - struct lock_class *class; - uintptr_t x, tid; - const char *file; - int line; - - if (KERNEL_PANICKED()) - return (0); - - file = __FILE__; - line = __LINE__; - - _lockmgr_assert(lk, KA_LOCKED, file, line); - x = lk->lk_lock; - if (__predict_true(x & LK_SHARE) != 0) { - lockmgr_note_shared_release(lk, file, line); - if (lockmgr_sunlock_try(lk, &x)) { - LOCKSTAT_PROFILE_RELEASE_RWLOCK(lockmgr__release, lk, LOCKSTAT_READER); - } else { - return (lockmgr_sunlock_hard(lk, x, flags, ilk, file, line)); - } - } else { - tid = (uintptr_t)curthread; - lockmgr_note_exclusive_release(lk, file, line); - if (!lockmgr_recursed(lk) && - atomic_cmpset_rel_ptr(&lk->lk_lock, tid, LK_UNLOCKED)) { - LOCKSTAT_PROFILE_RELEASE_RWLOCK(lockmgr__release, lk, LOCKSTAT_WRITER); - } else { - return (lockmgr_xunlock_hard(lk, x, flags, ilk, file, line)); - } - } - if (__predict_false(flags & LK_INTERLOCK)) { - class = LOCK_CLASS(ilk); - class->lc_unlock(ilk); - } - return (0); -} - /* * Lightweight entry points for common operations. * Modified: head/sys/sys/lockmgr.h ============================================================================== --- head/sys/sys/lockmgr.h Fri Feb 14 09:36:35 2020 (r357905) +++ head/sys/sys/lockmgr.h Fri Feb 14 11:20:25 2020 (r357906) @@ -72,8 +72,6 @@ int __lockmgr_args(struct lock *lk, u_int flags, stru const char *wmesg, int prio, int timo, const char *file, int line); int lockmgr_lock_fast_path(struct lock *lk, u_int flags, struct lock_object *ilk, const char *file, int line); -int lockmgr_unlock_fast_path(struct lock *lk, u_int flags, - struct lock_object *ilk); 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); int lockmgr_unlock(struct lock *lk);