From owner-svn-src-projects@freebsd.org Wed Apr 15 22:27:25 2020 Return-Path: Delivered-To: svn-src-projects@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5A5982C3DDC for ; Wed, 15 Apr 2020 22:27:25 +0000 (UTC) (envelope-from rmacklem@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 492cRd1nn1z4W2h; Wed, 15 Apr 2020 22:27:25 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 343F02634D; Wed, 15 Apr 2020 22:27:25 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 03FMRPtI071460; Wed, 15 Apr 2020 22:27:25 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 03FMRPQf071459; Wed, 15 Apr 2020 22:27:25 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <202004152227.03FMRPQf071459@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Wed, 15 Apr 2020 22:27:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r359996 - projects/nfs-over-tls/sys/fs/nfsserver X-SVN-Group: projects X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: projects/nfs-over-tls/sys/fs/nfsserver X-SVN-Commit-Revision: 359996 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Apr 2020 22:27:25 -0000 Author: rmacklem Date: Wed Apr 15 22:27:24 2020 New Revision: 359996 URL: https://svnweb.freebsd.org/changeset/base/359996 Log: Bring nfs_fha_new.h in line with the one in head. Modified: projects/nfs-over-tls/sys/fs/nfsserver/nfs_fha_new.h Modified: projects/nfs-over-tls/sys/fs/nfsserver/nfs_fha_new.h ============================================================================== --- projects/nfs-over-tls/sys/fs/nfsserver/nfs_fha_new.h Wed Apr 15 21:27:52 2020 (r359995) +++ projects/nfs-over-tls/sys/fs/nfsserver/nfs_fha_new.h Wed Apr 15 22:27:24 2020 (r359996) @@ -33,6 +33,8 @@ #ifdef _KERNEL +#define FHANEW_SERVER_NAME "nfsd" + /* Sysctl defaults. */ #define FHA_DEF_ENABLE 1 #define FHA_DEF_READ 1 @@ -99,8 +101,6 @@ struct fha_params { char server_name[32]; SVCPOOL **pool; }; - -#define FHANEW_SERVER_NAME "nfsd" SVCTHREAD *fhanew_assign(SVCTHREAD *this_thread, struct svc_req *req); void fhanew_nd_complete(SVCTHREAD *, struct svc_req *);