From nobody Wed May 17 23:13:53 2023 X-Original-To: dev-commits-src-branches@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 4QM8755pz5z4Bj0S; Wed, 17 May 2023 23:13:53 +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 4QM8755HHtz3PNC; Wed, 17 May 2023 23:13:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684365233; 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=5AadAp5ySWuXCdQOTGQ9uWHWKrEMXA+zfIGbVZynsdo=; b=p1pNFhhoNtKwiPby2whY/Zr1Gsl50D8aOR2pwrgKtlYequrLrGcStrLUCbxPNSTnuzy7+a bkU1OsK004dTzCBVvWSp++oOnXBknusOWtJrl+GavkHMLCyLhoOHaSi7xxHitHhvIZADQv 46UsnM7KYG5xfq3UDaa0MY/29GW/aqalbetfwzRcMfUwUXoMPOWZc8Zym972WjKWNZYJzL dfr+rDnCd2XPsrL0CrgQiLiO5Vl1CczWgzELdKnnK8K7Xaa43N/dGOBO2lqp7gJ0PnjgV3 gYkWShJwNcvCDbLcp3EysgMbWHpn5OJ/sHxogktLlmY73hKo9gCUveNhDFESMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684365233; 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=5AadAp5ySWuXCdQOTGQ9uWHWKrEMXA+zfIGbVZynsdo=; b=T6qiMNtyXghfwTL0iaFh3gHeQkn3mb9PE0TuqlhJwVUBTeYR/GQVx80jMd+fNu43W0r3me ieSJlmZrmv8uvD8jSWkf+4aspjcMUT6s6b5u9hVFvDqxY0hb3gdH7dCsboVI2BvIDEk/hu X2QprBHLMJrEzmweLjnCofYgNcfLKu9X0NACQpLmzqwjwVCphNNnHsWBEgilP7O5lIna2u 4xwvWDRAsBtJ+VS6A1hAin8mVSZ27z0qUrSsbjlT3JgdbFXhO1yXZsgku+i207QVXm8mgt enTZ6Nj0hQ6tpmQkGaImSxu22bOgaHOzUbaaAQBqYU9woWdAJ7WTv7GflMaCuQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684365233; a=rsa-sha256; cv=none; b=t+W+1rkuhwL76MvsxaPDQ49j42IekPtzdrY/90XvfU3Z+3fx8Cw5YNMK6w0URybJXSx+Vt uItlFFTKBeTkv+2jq+DZdGjro8lasxcKy4Z1OzyimNkT7gTj16wgZBuim3VvL0GewK64N3 xvJrkWZyV8oYg07nZNMzI8NQ3wc9jWFzXtP7iaGXIHW1V4/9uKiNhGI6N/74jOmpiyaBm6 ldfsToJNFHddJUAjGuSfoxZgLdBfjh16SEGpR5DB935R5S0sbUUPC1zS3DEuqHt6ng3YBz Yb9QqkGItQsUbzPgMEbq+BVNQvd5qTQChqjT4AlpMF2C7pTtuLPqC92r/a2q3A== 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 4QM87543qhzNDG; Wed, 17 May 2023 23:13:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34HNDr99056545; Wed, 17 May 2023 23:13:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34HNDrFg056544; Wed, 17 May 2023 23:13:53 GMT (envelope-from git) Date: Wed, 17 May 2023 23:13:53 GMT Message-Id: <202305172313.34HNDrFg056544@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: 3f1e7e07459f - stable/13 - nfscommon: Revert use of nfsstatsv1_p in nfs_commonkrpc.c List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: 3f1e7e07459f54ecd0cdbe586570f00a88c55d0f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=3f1e7e07459f54ecd0cdbe586570f00a88c55d0f commit 3f1e7e07459f54ecd0cdbe586570f00a88c55d0f Author: Rick Macklem AuthorDate: 2023-02-17 01:44:19 +0000 Commit: Rick Macklem CommitDate: 2023-05-17 23:12:49 +0000 nfscommon: Revert use of nfsstatsv1_p in nfs_commonkrpc.c Commit 9d329bbc9aea converted a lot of accesses to nfsstatsv1 to use nfsstatsv1_p instead. However, the accesses in nfs_commonkrpc.c are for client side and should not be converted. This patch puts them back in the correct pre-commit 9d329bbc9aea form. (cherry picked from commit a63b5d488badce9298e4272da2d5344e9f83a13d) --- sys/fs/nfs/nfs_commonkrpc.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/sys/fs/nfs/nfs_commonkrpc.c b/sys/fs/nfs/nfs_commonkrpc.c index 0d2cb9ec279a..9badd8be47d4 100644 --- a/sys/fs/nfs/nfs_commonkrpc.c +++ b/sys/fs/nfs/nfs_commonkrpc.c @@ -92,6 +92,7 @@ NFSSTATESPINLOCK; NFSREQSPINLOCK; NFSDLOCKMUTEX; NFSCLSTATEMUTEX; +extern struct nfsstatsv1 nfsstatsv1; extern struct nfsreqhead nfsd_reqq; extern int nfscl_ticks; extern void (*ncl_call_invalcaches)(struct vnode *); @@ -99,8 +100,6 @@ extern int nfs_numnfscbd; extern int nfscl_debuglevel; extern int nfsrv_lease; -NFSD_VNET_DECLARE(struct nfsstatsv1 *, nfsstatsv1_p); - SVCPOOL *nfscbd_pool; int nfs_bufpackets = 4; static int nfsrv_gsscallbackson = 0; @@ -783,7 +782,7 @@ newnfs_request(struct nfsrv_descript *nd, struct nfsmount *nmp, procnum = NFSV4PROC_COMPOUND; if (nmp != NULL) { - NFSINCRGLOBAL(NFSD_VNET(nfsstatsv1_p)->rpcrequests); + NFSINCRGLOBAL(nfsstatsv1.rpcrequests); /* Map the procnum to the old NFSv2 one, as required. */ if ((nd->nd_flag & ND_NFSV2) != 0) { @@ -918,13 +917,13 @@ tryagain: if (stat == RPC_SUCCESS) { error = 0; } else if (stat == RPC_TIMEDOUT) { - NFSINCRGLOBAL(NFSD_VNET(nfsstatsv1_p)->rpctimeouts); + NFSINCRGLOBAL(nfsstatsv1.rpctimeouts); error = ETIMEDOUT; } else if (stat == RPC_VERSMISMATCH) { - NFSINCRGLOBAL(NFSD_VNET(nfsstatsv1_p)->rpcinvalid); + NFSINCRGLOBAL(nfsstatsv1.rpcinvalid); error = EOPNOTSUPP; } else if (stat == RPC_PROGVERSMISMATCH) { - NFSINCRGLOBAL(NFSD_VNET(nfsstatsv1_p)->rpcinvalid); + NFSINCRGLOBAL(nfsstatsv1.rpcinvalid); error = EPROTONOSUPPORT; } else if (stat == RPC_CANTSEND || stat == RPC_CANTRECV || stat == RPC_SYSTEMERROR || stat == RPC_INTR) { @@ -958,11 +957,11 @@ tryagain: if (stat == RPC_INTR) error = EINTR; else { - NFSINCRGLOBAL(NFSD_VNET(nfsstatsv1_p)->rpcinvalid); + NFSINCRGLOBAL(nfsstatsv1.rpcinvalid); error = ENXIO; } } else { - NFSINCRGLOBAL(NFSD_VNET(nfsstatsv1_p)->rpcinvalid); + NFSINCRGLOBAL(nfsstatsv1.rpcinvalid); error = EACCES; } if (error) {