From nobody Tue May 16 21:37:11 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 4QLV20269bz4BV0J; Tue, 16 May 2023 21:37:12 +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 4QLV201Ytcz4P9l; Tue, 16 May 2023 21:37:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684273032; 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=xfgznpy3s5h3ic7JUcYz2i0H2sbqkH3nURtCMh2UXcU=; b=m4EOspoKZCW4vkS3TvN7vYlENGkI7EvFqaOPkdpJdvsJmStPfy0J7EsNyVxhbrIloSO2iN HL1ef/hEhRTe2VMyNh3aXSmQ9an/ALvB1Qca7o6O7z6Ry+b4Q8f8nCRkh8nAjAegSAsYzq Tsp3Ew9Ep1Gk3jvLcoSNHC+G0cLkWleZSokj67frlP8SzZUupmaOoDLC7XuqgYzfZIx/kf qZXy6+ka9/z0hQVhVjAxfZoJDb0ymnzweq18Upfqg8BQcYDevtTyIaHbZm3DZWp8WWhCid 19HFbh8Rlgx24KJPVgYN9/+a7TswzxlmWt4OWfrofdLyufTWqH1/udQm/1w7jg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684273032; 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=xfgznpy3s5h3ic7JUcYz2i0H2sbqkH3nURtCMh2UXcU=; b=dOANAtTXL1I5BQ2d/Ebr1Gd41f9JEIJueG/UnFCVVpe9onkr82X5rdU2v6NuH66uW3GIY2 p6gD0qxpJ9UR7S0DzsK5m9Py5UqNGlds8mZ8EpYzsc22bIKGO50TWH85O2OLDGoLvzbuCJ oiSqrjqOLIhEiKrpulaNHXr9+5fxYUOBeHiASZhSUjUgCSUoQcvQpUqOqkdDgCZfYaf/gG CEpmT75UT7avg6/bESiM5dprBbzXzfT8x13kr2b/pWZkTpDQtUw3d9D/x8apaI7LBaTYtM 7e2LjIN/vGQOMfbIIYlwuBHPWFuuq0Cj8fkUk4lP+elDaY1hfZsv1/Wrml6lVw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684273032; a=rsa-sha256; cv=none; b=AG9LXf2IbDkTHpTZhFMFiqGBUXQm2hEP+aWJnAwGpHARX4LK2pMxB+Dv3ubwcWiBpzYd+y /hENb3C+0q+K6B7DbAB9DsIQsP+Az/Qi8gsoFoJsH0E4ZF1yBIbYvtUg6CNb3AA8cMYc/1 8/aWK0ndS8AKGEH6AF66Bm7aLHjDX97tuj9jqHC6qj7zCh0WsNH7ZizD5l7XyjjH7ze1YP QAFxha1CpSVcHno4LRFEga2AcwyIctIW0mLZYfMfjLzErJgy6pBDx0iUiwBMIREPm3GvfW Fm1Yb9mTKwaN00PWe4rFDH5js9uakDzV0hjfJ5hfxcbJhwbA+cqb7bjyNQheCA== 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 4QLV200dXFzdRQ; Tue, 16 May 2023 21:37:12 +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 34GLbBAf020769; Tue, 16 May 2023 21:37:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34GLbBkl020768; Tue, 16 May 2023 21:37:11 GMT (envelope-from git) Date: Tue, 16 May 2023 21:37:11 GMT Message-Id: <202305162137.34GLbBkl020768@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: 8c6a6e8c8071 - stable/13 - nfsd: Get rid of useless "pool" field in nfs_fha_new.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: 8c6a6e8c8071eb1bcd83f283d26b1aec69e9f76f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=8c6a6e8c8071eb1bcd83f283d26b1aec69e9f76f commit 8c6a6e8c8071eb1bcd83f283d26b1aec69e9f76f Author: Rick Macklem AuthorDate: 2023-02-17 15:34:40 +0000 Commit: Rick Macklem CommitDate: 2023-05-16 21:36:22 +0000 nfsd: Get rid of useless "pool" field in nfs_fha_new.c Since svcpool_create() is now called from an initialization function, the pool field of fha_params is always non-NULL, so just get rid of it and the useless check for it being NULL. (cherry picked from commit b99c419587db2ac75b929637f61ec3b845d7b5f6) --- sys/fs/nfsserver/nfs_fha_new.c | 9 --------- sys/fs/nfsserver/nfs_fha_new.h | 1 - 2 files changed, 10 deletions(-) diff --git a/sys/fs/nfsserver/nfs_fha_new.c b/sys/fs/nfsserver/nfs_fha_new.c index 59933ef01bd4..05a03bee5d1c 100644 --- a/sys/fs/nfsserver/nfs_fha_new.c +++ b/sys/fs/nfsserver/nfs_fha_new.c @@ -62,8 +62,6 @@ SYSCTL_DECL(_vfs_nfsd); extern int newnfs_nfsv3_procid[]; -NFSD_VNET_DECLARE(SVCPOOL *, nfsrvd_pool); - SYSINIT(nfs_fhanew, SI_SUB_ROOT_CONF, SI_ORDER_ANY, fhanew_init, NULL); SYSUNINIT(nfs_fhanew, SI_SUB_ROOT_CONF, SI_ORDER_ANY, fhanew_uninit, NULL); @@ -80,8 +78,6 @@ fhanew_init(void *foo) snprintf(softc->server_name, sizeof(softc->server_name), FHANEW_SERVER_NAME); - softc->pool = &NFSD_VNET(nfsrvd_pool); - /* * Initialize the sysctl context list for the fha module. */ @@ -656,11 +652,6 @@ fhenew_stats_sysctl(SYSCTL_HANDLER_ARGS) sbuf_new(&sb, NULL, 65536, SBUF_FIXEDLEN); - if (!*softc->pool) { - sbuf_printf(&sb, "NFSD not running\n"); - goto out; - } - for (i = 0; i < FHA_HASH_SIZE; i++) if (!LIST_EMPTY(&softc->fha_hash[i].list)) break; diff --git a/sys/fs/nfsserver/nfs_fha_new.h b/sys/fs/nfsserver/nfs_fha_new.h index 7d437e7a0853..08f52539450e 100644 --- a/sys/fs/nfsserver/nfs_fha_new.h +++ b/sys/fs/nfsserver/nfs_fha_new.h @@ -99,7 +99,6 @@ struct fha_params { struct sysctl_oid *sysctl_tree; struct fha_ctls ctls; char server_name[32]; - SVCPOOL **pool; }; SVCTHREAD *fhanew_assign(SVCTHREAD *this_thread, struct svc_req *req);