From nobody Fri Feb 17 15:35:53 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 4PJG9k0thHz3qYDs; Fri, 17 Feb 2023 15:35:54 +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 4PJG9k0Dffz3KWc; Fri, 17 Feb 2023 15:35:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676648154; 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=z3TJguVmP5h6h8gdiXfr14fNX+we/W2HsiUUdc8bqVg=; b=vvfvpCumAGll81fYyNr/4Qxe2hk9xFwAk6PUfzp3R6Y4oc2aWKnWRUnQoVorLb3wdJOY6I qKcXfzR8FKeGrFBB5pM3xEZfjMGPaAGs8ZY9jCMealhpY5+ZIPf3duTXiCQyJ8Ax/q6vGM FR3/mXKym1rEZM68RpMz8d/S98VQiZOUU3+OHKSwAiPCb9rQ4NkhHg+B6clfQbp1TUJMuq /fA4SzLd0Kt3eT58opbUX0qokYSb2i/TCEs/xLx2E25AMfsY2n3VCdJmJM3Cx5GoQMiwE2 9Eq+qz1/Eqe/RltJgFvJJPghiVWe6ZGheHeE5YNUBJxGPtMohYrojGuwI0OlDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676648154; 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=z3TJguVmP5h6h8gdiXfr14fNX+we/W2HsiUUdc8bqVg=; b=OMUQJJzN+iHV0nWVYPbDoMC4FdmeeeuwFw2xBapcBEctAAlF3/+RYVPawH1BjONyuuz7e2 byXz7sK7PtMtLBf/zzucG+gNfmmw3mbwBe8NOjceJVh1+OlZB+Onn6jK01N+vyk9PU0Oz3 gmVpyBK29IWVp8EddDZ8cbLxtpKsrR5yuLM2q+5LrVt5NRc8j1P87V8J9tBUeKEjM0RLl6 p1iV5x1nRqMbXoWexjlbxqa1Y7pgWIdQeM33wxCsA4sqkgDewT5vjsSimEsAtQqHNifpxC NgYSlm3bppFViy9tiPVLzZS/1JA3/5iMLS1zOIAr5yap0HB2SyxaA054frRy+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676648154; a=rsa-sha256; cv=none; b=ZTqATpZcVM8I++gqY1BO0UJ7W0BVteVIDY32gFa1OOrG74HHtjGZFeUBXPd6mv21AoGhWa 7o9Iipm3BXJIn6Gxeh9qexvsIgn8tvEFORufFl2ew+n5Hm4Avw+pyFI1bf53XE0kROjjfX 854DWf6Z46Cre0igtiNmoeNrRWHd3UMMZExUBqAlRlJZecz8i94BkrF18br5Y1UMJHDUkB dSQZNZY44GTIAUmjWNxdYZbhVH/sxJXfi5zbVMU8BoPMPk1QcTB4A7ord2FKJ5I9KrF+zo SnID4tVO4Bsbr797GPuOstlCX2ci1OAdSlpcJdwUmwQAQU81tApiuu8eU+FM1Q== 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 4PJG9j6MHCznbb; Fri, 17 Feb 2023 15:35: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 31HFZrrn026272; Fri, 17 Feb 2023 15:35:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31HFZr7n026271; Fri, 17 Feb 2023 15:35:53 GMT (envelope-from git) Date: Fri, 17 Feb 2023 15:35:53 GMT Message-Id: <202302171535.31HFZr7n026271@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: b99c419587db - main - nfsd: Get rid of useless "pool" field in nfs_fha_new.c 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/main X-Git-Reftype: branch X-Git-Commit: b99c419587db2ac75b929637f61ec3b845d7b5f6 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=b99c419587db2ac75b929637f61ec3b845d7b5f6 commit b99c419587db2ac75b929637f61ec3b845d7b5f6 Author: Rick Macklem AuthorDate: 2023-02-17 15:34:40 +0000 Commit: Rick Macklem CommitDate: 2023-02-17 15:34:40 +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. MFC after: 3 months --- 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);