From nobody Tue May 14 06:59:24 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 4VdnK8535Dz5KYWP; Tue, 14 May 2024 06:59:24 +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 4VdnK84927z4pnQ; Tue, 14 May 2024 06:59:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715669964; 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=IlT8csYNzra8WFOGztHMw0PoIMVZU2g7TdRJSuQmtnc=; b=jN1XdM7OkxxxDk96Snj9MNRWBMcXkEyVjfdCLKhp1qVvd/FedA9qBUaZ4zTNzNVjVwaqjf LuRnQTXGZMojpTIDrX/KqLbGscSYhFBYo3TwAbRfwtARrJoyMKewQlw0uJAHoONByfZd/i DlcqweNBXQ2R49OtY744caPip3uNb3Uzk+ofOOJ7eS9WJBAVOozKMZ78+2YrUrOfNSk0EA SOL/tBzfuQDXaZOhUw61a0JHa8ZaJPmsBPwTq3SoPr8UGSmEpFM79LhMU0sTG4VpXS4kAc be3omKKodhFmpnY4/jR+8nDOOB4oz1aDzjc+4ngSax07aGxWXzxmojBAmUAnEg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715669964; a=rsa-sha256; cv=none; b=gE0J85fKUL7OJJ40wy7pTorUJjjKli/P5GlK18aGL/L9xiguIMGmSwy8whQ5EJruoU0Olb sXYTqe+zer2FSuo6aZXT+bmqbEHFowWGpnoTqWy2RPDl+WafsWapIblr5VpZb21Lm0bwFm uKlYsoXhwfIe7v6XsObLHxGsVluY8pL2yNGmSku/mCzGPJyjxYYzXcfAWIuJpgkDaKoLIP +5gWx9rGgmmaqWwEhd2XlP+w38sZVE6PK6GGI+wLynLmc0nSBNB5Kyp/wrT8fkdj6ooWT2 CiT98EmjH6yyvU1ADQc0QuifmnfIzpOvwhEnxHc/4ezCX2gaE6npDSLoppWoKw== 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=1715669964; 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=IlT8csYNzra8WFOGztHMw0PoIMVZU2g7TdRJSuQmtnc=; b=FMJGuJNzmDaLn3zFBXPF5ME8zxIPNxbCnIfg02d8ljgXFTa/e1HGGfJn411PI+MJRFNdQq GDqCUJM5bEw6p4KStB7MUdiotoRApsdb0T+FHqja81Q0u6RrmlFNcuU7Ddoiw6ksQ8Ddaf cLO8UeAfxVKy0VkqttqL7hXI1ZrNTmEqFWxD0K1PlpWzehsf8uN24c1USUTZXRGd9Q20us Q3nPECQJqh+Gh0UD/AZ63+2RzuU/Vm9YHo9jZAZm/bXES+6siKq/tNUhev2wDQOdPgwgu7 +m/Es1FJAfyXWIc3jcZtnFOa7HPe7ItP2kyMVtvFBr6w4sUGZMLzuBw/jcHSKA== 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 4VdnK83lpMzM5K; Tue, 14 May 2024 06:59:24 +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 44E6xOvk005033; Tue, 14 May 2024 06:59:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44E6xOx2005030; Tue, 14 May 2024 06:59:24 GMT (envelope-from git) Date: Tue, 14 May 2024 06:59:24 GMT Message-Id: <202405140659.44E6xOx2005030@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 7f97e3f47149 - stable/13 - Add man page for nfslockd. 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 7f97e3f47149ee44b06e3877f1bab1834c6a9307 Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=7f97e3f47149ee44b06e3877f1bab1834c6a9307 commit 7f97e3f47149ee44b06e3877f1bab1834c6a9307 Author: Dag-Erling Smørgrav AuthorDate: 2024-05-10 09:23:13 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-05-14 06:59:12 +0000 Add man page for nfslockd. PR: 130238 MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D45139 (cherry picked from commit 44e72c6e2e6bcfa2cba89afb92fa05f6ac4d5660) --- share/man/man4/Makefile | 1 + share/man/man4/nfslockd.4 | 45 ++++++++++++++++++++++++++++++++++++++++++ usr.sbin/rpc.lockd/lockd.c | 3 ++- usr.sbin/rpc.lockd/rpc.lockd.8 | 5 +++-- 4 files changed, 51 insertions(+), 3 deletions(-) diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 83bec8e9f66a..1ea3431c859a 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -343,6 +343,7 @@ MAN= aac.4 \ netlink.4 \ netmap.4 \ ${_nfe.4} \ + nfslockd.4 \ ${_nfsmb.4} \ ng_async.4 \ ngatmbase.4 \ diff --git a/share/man/man4/nfslockd.4 b/share/man/man4/nfslockd.4 new file mode 100644 index 000000000000..770d9b8736b0 --- /dev/null +++ b/share/man/man4/nfslockd.4 @@ -0,0 +1,45 @@ +.\"- +.\" Copyright (c) 2024 Dag-Erling Smørgrav +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.Dd May 8, 2024 +.Dt NFSLOCKD 4 +.Os +.Sh NAME +.Nm nfslockd +.Nd NFS advisory locking +.Sh SYNOPSIS +To compile this driver into the kernel, place the following lines in +your kernel configuration file: +.Bd -ragged -offset indent +.Cd "options NFSLOCKD" +.Ed +.Pp +Alternatively, to load the driver as a module at boot time, place the +following line in +.Xr loader.conf 5 : +.Bd -literal -offset indent +nfslockd_load="YES" +.Ed +.Sh DESCRIPTION +The +.Nm +driver provides kernel support for NFSv3 advisory locking. +It works in tandem with +.Xr rpc.lockd 8 , +which will normally load it on startup if it is not already loaded or +compiled-in. +.Sh SEE ALSO +.Xr rpc.lockd 8 +.Sh HISTORY +The +.Nm +driver first appeared in +.Fx 6.4 . +.Sh AUTHORS +.An -nosplit +The +.Nm +driver was written by +.An Doug Rabson Aq Mt dfr@FreeBSD.org . diff --git a/usr.sbin/rpc.lockd/lockd.c b/usr.sbin/rpc.lockd/lockd.c index 35953f32692e..15448b651749 100644 --- a/usr.sbin/rpc.lockd/lockd.c +++ b/usr.sbin/rpc.lockd/lockd.c @@ -188,7 +188,8 @@ main(int argc, char **argv) kernel_lockd_client = FALSE; if (modfind("nfslockd") < 0) { if (kldload("nfslockd") < 0) { - fprintf(stderr, "Can't find or load kernel support for rpc.lockd - using non-kernel implementation\n"); + fprintf(stderr, "Unable to load nfslockd(4), " + "using userland implementation\n"); } else { kernel_lockd = TRUE; } diff --git a/usr.sbin/rpc.lockd/rpc.lockd.8 b/usr.sbin/rpc.lockd/rpc.lockd.8 index 89f55087901d..89592a1cceaf 100644 --- a/usr.sbin/rpc.lockd/rpc.lockd.8 +++ b/usr.sbin/rpc.lockd/rpc.lockd.8 @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd November 21, 2019 +.Dd May 8, 2024 .Dt RPC.LOCKD 8 .Os .Sh NAME @@ -44,7 +44,7 @@ The .Nm utility provides monitored and unmonitored file and record locking services -in an NFS environment. +in an NFSv3 environment. To monitor the status of hosts requesting locks, the locking daemon typically operates in conjunction with @@ -137,6 +137,7 @@ RPC protocol specification for the network lock manager protocol. .El .Sh SEE ALSO .Xr syslog 3 , +.Xr nfslockd 4 , .Xr rc.conf 5 , .Xr rpc.statd 8 .Sh STANDARDS