From owner-svn-src-projects@freebsd.org Mon Feb 17 21:02:30 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 E40CE247148 for ; Mon, 17 Feb 2020 21:02:30 +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 48LxJQ5qKhz3LTl; Mon, 17 Feb 2020 21:02:30 +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 BE38FD2DB; Mon, 17 Feb 2020 21:02:30 +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 01HL2U3O002480; Mon, 17 Feb 2020 21:02:30 GMT (envelope-from rmacklem@FreeBSD.org) Received: (from rmacklem@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 01HL2UGH002479; Mon, 17 Feb 2020 21:02:30 GMT (envelope-from rmacklem@FreeBSD.org) Message-Id: <202002172102.01HL2UGH002479@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rmacklem set sender to rmacklem@FreeBSD.org using -f From: Rick Macklem Date: Mon, 17 Feb 2020 21:02:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r358052 - projects/nfs-over-tls/sys/fs/nfs X-SVN-Group: projects X-SVN-Commit-Author: rmacklem X-SVN-Commit-Paths: projects/nfs-over-tls/sys/fs/nfs X-SVN-Commit-Revision: 358052 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: Mon, 17 Feb 2020 21:02:31 -0000 Author: rmacklem Date: Mon Feb 17 21:02:30 2020 New Revision: 358052 URL: https://svnweb.freebsd.org/changeset/base/358052 Log: Get rid of the extra argument to NFSVOPUNLOCK(). Modified: projects/nfs-over-tls/sys/fs/nfs/nfs_commonsubs.c Modified: projects/nfs-over-tls/sys/fs/nfs/nfs_commonsubs.c ============================================================================== --- projects/nfs-over-tls/sys/fs/nfs/nfs_commonsubs.c Mon Feb 17 20:58:33 2020 (r358051) +++ projects/nfs-over-tls/sys/fs/nfs/nfs_commonsubs.c Mon Feb 17 21:02:30 2020 (r358052) @@ -2599,7 +2599,7 @@ nfsv4_fillattr(struct nfsrv_descript *nd, struct mount if (error == 0) error = VOP_GETACL(vp, ACL_TYPE_NFS4, naclp, cred, p); - NFSVOPUNLOCK(vp, 0); + NFSVOPUNLOCK(vp); } else error = NFSERR_PERM; if (error != 0) { @@ -2619,7 +2619,7 @@ nfsv4_fillattr(struct nfsrv_descript *nd, struct mount if (NFSVOPLOCK(vp, LK_SHARED) == 0) { error = VOP_GETEXTATTR(vp, EXTATTR_NAMESPACE_USER, "xxx", NULL, &atsiz, cred, p); - NFSVOPUNLOCK(vp, 0); + NFSVOPUNLOCK(vp); if (error != EOPNOTSUPP) xattrsupp = true; }