From nobody Thu Jul 06 01:55:23 2023 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 4QxKNq2rZCz4lsX6; Thu, 6 Jul 2023 01:55:23 +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 4QxKNq2LDHz3J9h; Thu, 6 Jul 2023 01:55:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688608523; 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=ooguPCCGV0QqJPaYvu2RIFI6wXnH9pXZbYgIskkWsgI=; b=DKsx/tNktA5TjYEXKwt7yw0Pypn3VQ1DqVnWj8lhHJHJScAYq1jUU0RTYOEPCKO0Fj+LSV K0VJPbgP17KEkxn51ZXXjUFnzY0F2So2EC0Oo8gR42UCoLzZjMLU9jTMny7yg2AekQNB7b 1WhaJ5B7OvEY2QNakrCdCoEVcCjHMolvHgtDXFhqRQYYXFUOSQDTIe31kAeQ+HXOL7+xHN mqkF+fEu+XBeSHawOR7m3mnt0wlqcE9e1lHr9holj8JrIl8M/GE8eMOJcMV/tdRpCQlzYz n+7pVtB0id3rUuITy2NdrVEydNRKAKU80eQgKdfY+Zr5qSNDsLBYQTlcPLrpuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688608523; 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=ooguPCCGV0QqJPaYvu2RIFI6wXnH9pXZbYgIskkWsgI=; b=mI2O4pFkuDUXU/dT/3n4TGw3BxcNsYJ3FR37huzlFlsR7+L8gAhDBPzD6IlDmUbllMH8X1 8J3ZTeBQC5C1fDIiFc81j+eqqpS643GI9UbHwBUbcChEBrxdRkGPP9hSQVQFhDUJeW6Qzh TbYPtVPpr3T1MJWDd767CuMP/aLQIj1jrAYsnxa3HIrQ5a5stsjDNMorzwHaUQ0RKWUP3N 019x4ISodPuCYR2begEzPpA3fHAzlF0M5eSItSx9Z1/ztfTFqWYL3Outt/Of22nTiWerrc T4xYqrYcUHJrmDUR0ubdauU9m0jpiYaoi7YWz/Jcg38i/H5PYVVL1a9IH9H1Yw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688608523; a=rsa-sha256; cv=none; b=iqloaage2jx6FE5OciKdWSMILYXUxWaJSqb5mZuFr5q7d/tanQJuFdgw9F3SP8ecLEr92i 4twGe8Uk78sXAkWkUle/j5NyFpYgipowMuVpyYJH8icqidBlsKhn6mJL1zY+IPMMzZ0rRj SDl5cpCJpV1DkLCiowJGdVWF9pJiGixJdH7AhYwZsFeKE6derY5CyzigRrL6vblCTj6KTz zGzpYGnX5b1J8OfsAI8xfa6KVTCydeA0kCw+kiLtZ+Wbdw9GAa6yyV4Ymen86/GhLflD8O MpxgpFHmQ6RkeI2xJf/Kl+xInLCli3OJpAwg0KgcLy4xcVkLs9rhEGylSFub3A== 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 4QxKNq1B7tzdfN; Thu, 6 Jul 2023 01:55:23 +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 3661tN9W041605; Thu, 6 Jul 2023 01:55:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3661tN9G041604; Thu, 6 Jul 2023 01:55:23 GMT (envelope-from git) Date: Thu, 6 Jul 2023 01:55:23 GMT Message-Id: <202307060155.3661tN9G041604@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: cb1b77808a1e - stable/13 - nfscl: Fix support for doing Null RPCs 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: cb1b77808a1edf8ca803568439e8ef8a092192fb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=cb1b77808a1edf8ca803568439e8ef8a092192fb commit cb1b77808a1edf8ca803568439e8ef8a092192fb Author: Rick Macklem AuthorDate: 2023-04-07 19:57:26 +0000 Commit: Rick Macklem CommitDate: 2023-07-06 01:53:47 +0000 nfscl: Fix support for doing Null RPCs Although the NFS client does not currently perform Null RPCs, this fix is needed if/when it might do so. Found during testing of experimental code that uses Null RPCs to maintain/monitor TCP connections for "nconnect" mounts. (cherry picked from commit 4adb28c0abfa3b8d076c7249f61a093c6eb9dac2) --- sys/fs/nfs/nfs_commonsubs.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/fs/nfs/nfs_commonsubs.c b/sys/fs/nfs/nfs_commonsubs.c index af9f66f03488..a738f8cc6fb1 100644 --- a/sys/fs/nfs/nfs_commonsubs.c +++ b/sys/fs/nfs/nfs_commonsubs.c @@ -375,6 +375,10 @@ nfscl_reqstart(struct nfsrv_descript *nd, int procnum, struct nfsmount *nmp, nd->nd_mreq = nd->nd_mb = mb; nd->nd_bpos = mtod(mb, char *); + /* For NFSPROC_NULL, there are no arguments. */ + if (procnum == NFSPROC_NULL) + goto out; + /* * And fill the first file handle into the request. */ @@ -469,6 +473,7 @@ nfscl_reqstart(struct nfsrv_descript *nd, int procnum, struct nfsmount *nmp, } else { (void)nfsm_fhtom(NULL, nd, nfhp, fhlen, 0); } +out: if (procnum < NFSV42_NPROCS) NFSINCRGLOBAL(nfsstatsv1.rpccnt[procnum]); }