From nobody Mon May 20 16:50:56 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Vjk8w3PtJz5LdBZ; Mon, 20 May 2024 16:50:56 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Vjk8w2wZQz41Ms; Mon, 20 May 2024 16:50:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716223856; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cX5yT7l9bQcMoZh0pjh6XLEGfQAD5+KFU5GmUkxqZmk=; b=KoEANUEbuwtNmfc8sf3rw8eHRL70+MVFBkda0bXcxZLm3ZSnt1pfHdH8OsCYK0r3/GvaWM jTCjkC8ptrv3S7h/FbTPZSGUyEjulrUdv55UQQvqGUA6fjCYlBXn9U3OAIaae9SnlH+PpL PAX+S1J5Bs17raMmeTPrzoPdFl9pvQL0v/Daf5oQwRSGu5EApuRsQEBhnzpkd2IB9REQ1s umGmabDuKLn+arDpoOeHPHE2Si97EaJbfJERU4wVWk4ggNDOZrcJalAnsBSNAyPSjUMbgJ Iod3J6cTl8zakYXpvAKkPnDSvOzSttycIUkZb2D/0zRNkTv+QtwWOySAQjtmEg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716223856; a=rsa-sha256; cv=none; b=mhteqpbZ7TIvef4dqo4NFlY5Gg6fV0bV1Hn/QbTsHsfzCP/J6tjYT4JyWTMzJHvZg6dj2B uVXe2KOQaSdpMKiUbMb4gw28h0F1Wl2x3WvGB+O80+9HG5f0Z8jiPhEDxTtv7oKVhGXPRY rgzXYJreTM+uUgkjNz6wFw0i6vdiLQf5nko89t4cqfRpmOxMhQSqR8ZkGc5koVn3HyZ5Wu C87lsJDTTJVTMCTl5eT3MQ0ELuv678uZ4THcCv1qeEXttSil8f4brd8eDUhbzOZD7WSXvL 3iqeJkQSEPclBsKJn9u8LC2aAHshFpWFGsCpgIPtb+UkOU5wx9pueyO06TnLow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716223856; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cX5yT7l9bQcMoZh0pjh6XLEGfQAD5+KFU5GmUkxqZmk=; b=JPHnTNqi6uGXoW279nfusw3KuP2BW7SKPQq5F7jPn9pCgCF5LF+DccSqS3VaIEdfrXjY94 wm++podKWeRl8obNRsAPi5Ue9LSCML2BbEEo5b41rZUWLOJlJB+/eW9Tsz9rANPn1dapF4 exDVS0gU1DqMCV01PtB88eqXCdoHtWJu5CA5yHeKcnVcXLcYt1UwNxwpTmeTykByS1Ynd7 t24MM1EJL9+1jAQTWsM3B/94zakGhIeGDsFVT1v/w9u4oIieOOg1d6gkCkJWT+y6HEAn5p Je+5SoepwFPD3vYjzloJZFcPK0MLkn/v8fWitNz0wzyaiBYnhbErQCW8LG5myQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Vjk8w2WtYzm1b; Mon, 20 May 2024 16:50:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44KGouFY079285; Mon, 20 May 2024 16:50:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44KGouqJ079282; Mon, 20 May 2024 16:50:56 GMT (envelope-from git) Date: Mon, 20 May 2024 16:50:56 GMT Message-Id: <202405201650.44KGouqJ079282@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ryan Libby Subject: git: da590a3e18cb - main - lock.9: LK_TIMELOCK is a lockmgr flag, not lockinit List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rlibby X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: da590a3e18cb883ba0444b78deeca5a2ed0b042f Auto-Submitted: auto-generated The branch main has been updated by rlibby: URL: https://cgit.FreeBSD.org/src/commit/?id=da590a3e18cb883ba0444b78deeca5a2ed0b042f commit da590a3e18cb883ba0444b78deeca5a2ed0b042f Author: Ryan Libby AuthorDate: 2024-05-20 16:48:32 +0000 Commit: Ryan Libby CommitDate: 2024-05-20 16:48:32 +0000 lock.9: LK_TIMELOCK is a lockmgr flag, not lockinit Reviewed by: imp, markj Sponsored by: Dell EMC Isilon Differential Revision: https://reviews.freebsd.org/D45246 --- share/man/man9/lock.9 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/share/man/man9/lock.9 b/share/man/man9/lock.9 index 110fdd68fda0..96f617a72123 100644 --- a/share/man/man9/lock.9 +++ b/share/man/man9/lock.9 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH .\" DAMAGE. .\" -.Dd November 17, 2017 +.Dd May 18, 2024 .Dt LOCK 9 .Os .Sh NAME @@ -108,10 +108,6 @@ should log messages about duplicate locks being acquired. Disable .Xr ktr 4 logging for this lock. -.It Dv LK_TIMELOCK -Use -.Fa timo -during a sleep; otherwise, 0 is used. .El .El .Pp @@ -182,6 +178,10 @@ Fail if operation has slept. .It Dv LK_NOWAIT Do not allow the call to sleep. This can be used to test the lock. +.It Dv LK_TIMELOCK +Use +.Fa timo +during a sleep; otherwise, 0 is used. .It Dv LK_NOWITNESS Skip the .Xr witness 4