From owner-svn-src-projects@freebsd.org Mon Jun 22 06:28:46 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 1AC03341699 for ; Mon, 22 Jun 2020 06:28:46 +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) 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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49qzy56xySz4DKk; Mon, 22 Jun 2020 06:28:45 +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 E590B9ED8; Mon, 22 Jun 2020 06:28:45 +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 05M6SjuJ079585; Mon, 22 Jun 2020 06:28:45 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05M6SjVA079584; Mon, 22 Jun 2020 06:28:45 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <202006220628.05M6SjVA079584@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Mon, 22 Jun 2020 06:28:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r362483 - in projects/nfs-over-tls/sys: fs/nfsclient opencrypto X-SVN-Group: projects X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: in projects/nfs-over-tls/sys: fs/nfsclient opencrypto X-SVN-Commit-Revision: 362483 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.33 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: Mon, 22 Jun 2020 06:28:46 -0000 Author: rmacklem Date: Mon Jun 22 06:28:45 2020 New Revision: 362483 URL: https://svnweb.freebsd.org/changeset/base/362483 Log: Revert kernel update, since opencrypto has incompatible changes. Modified: projects/nfs-over-tls/sys/fs/nfsclient/nfs_clrpcops.c projects/nfs-over-tls/sys/opencrypto/cryptodev.h Modified: projects/nfs-over-tls/sys/fs/nfsclient/nfs_clrpcops.c ============================================================================== --- projects/nfs-over-tls/sys/fs/nfsclient/nfs_clrpcops.c Mon Jun 22 05:35:27 2020 (r362482) +++ projects/nfs-over-tls/sys/fs/nfsclient/nfs_clrpcops.c Mon Jun 22 06:28:45 2020 (r362483) @@ -8494,7 +8494,7 @@ nfsrpc_setextattr(vnode_t vp, const char *name, struct int error; struct nfsrv_descript nfsd; struct nfsrv_descript *nd = &nfsd; - struct nfsmount *nmp = VFSTONFS(vp->v_mount); + struct nfsmount *nmp = VFSTONFS(vnode_mount(vp)); nfsattrbit_t attrbits; bool use_ext; Modified: projects/nfs-over-tls/sys/opencrypto/cryptodev.h ============================================================================== --- projects/nfs-over-tls/sys/opencrypto/cryptodev.h Mon Jun 22 05:35:27 2020 (r362482) +++ projects/nfs-over-tls/sys/opencrypto/cryptodev.h Mon Jun 22 06:28:45 2020 (r362483) @@ -446,7 +446,6 @@ struct cryptop { struct task crp_task; crypto_session_t crp_session; /* Session */ - int crp_ilen; /* Input data total length */ int crp_olen; /* Result total length */ int crp_etype; /*