From owner-svn-src-head@freebsd.org Tue Mar 12 15:02:54 2019 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B60A3153332E; Tue, 12 Mar 2019 15:02:54 +0000 (UTC) (envelope-from trasz@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 54E886B368; Tue, 12 Mar 2019 15:02:54 +0000 (UTC) (envelope-from trasz@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 472A02467D; Tue, 12 Mar 2019 15:02:54 +0000 (UTC) (envelope-from trasz@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x2CF2sh7095584; Tue, 12 Mar 2019 15:02:54 GMT (envelope-from trasz@FreeBSD.org) Received: (from trasz@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x2CF2rv1095578; Tue, 12 Mar 2019 15:02:53 GMT (envelope-from trasz@FreeBSD.org) Message-Id: <201903121502.x2CF2rv1095578@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: trasz set sender to trasz@FreeBSD.org using -f From: Edward Tomasz Napierala Date: Tue, 12 Mar 2019 15:02:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r345063 - in head/sys/fs: nfs nfsclient nfsserver X-SVN-Group: head X-SVN-Commit-Author: trasz X-SVN-Commit-Paths: in head/sys/fs: nfs nfsclient nfsserver X-SVN-Commit-Revision: 345063 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 54E886B368 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.997,0]; NEURAL_HAM_SHORT(-0.97)[-0.967,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Mar 2019 15:02:55 -0000 Author: trasz Date: Tue Mar 12 15:02:52 2019 New Revision: 345063 URL: https://svnweb.freebsd.org/changeset/base/345063 Log: Drop unused 'p' argument to nfsv4_strtouid(). MFC after: 2 weeks Sponsored by: DARPA, AFRL Modified: head/sys/fs/nfs/nfs_commonacl.c head/sys/fs/nfs/nfs_commonsubs.c head/sys/fs/nfs/nfs_var.h head/sys/fs/nfsclient/nfs_clrpcops.c head/sys/fs/nfsserver/nfs_nfsdport.c Modified: head/sys/fs/nfs/nfs_commonacl.c ============================================================================== --- head/sys/fs/nfs/nfs_commonacl.c Tue Mar 12 14:59:08 2019 (r345062) +++ head/sys/fs/nfs/nfs_commonacl.c Tue Mar 12 15:02:52 2019 (r345063) @@ -108,7 +108,7 @@ nfsrv_dissectace(struct nfsrv_descript *nd, struct acl acep->ae_id = (uid_t)gid; } else { acep->ae_tag = ACL_USER; - aceerr = nfsv4_strtouid(nd, name, len, &uid, p); + aceerr = nfsv4_strtouid(nd, name, len, &uid); if (aceerr == 0) acep->ae_id = uid; } Modified: head/sys/fs/nfs/nfs_commonsubs.c ============================================================================== --- head/sys/fs/nfs/nfs_commonsubs.c Tue Mar 12 14:59:08 2019 (r345062) +++ head/sys/fs/nfs/nfs_commonsubs.c Tue Mar 12 15:02:52 2019 (r345063) @@ -1819,12 +1819,12 @@ nfsv4_loadattr(struct nfsrv_descript *nd, vnode_t vp, } if (compare) { if (!(*retcmpp)) { - if (nfsv4_strtouid(nd, cp, j, &uid, p) || + if (nfsv4_strtouid(nd, cp, j, &uid) || nap->na_uid != uid) *retcmpp = NFSERR_NOTSAME; } } else if (nap != NULL) { - if (nfsv4_strtouid(nd, cp, j, &uid, p)) + if (nfsv4_strtouid(nd, cp, j, &uid)) nap->na_uid = nfsrv_defaultuid; else nap->na_uid = uid; @@ -3165,8 +3165,7 @@ tryagain: * a number. */ APPLESTATIC int -nfsv4_strtouid(struct nfsrv_descript *nd, u_char *str, int len, uid_t *uidp, - NFSPROC_T *p) +nfsv4_strtouid(struct nfsrv_descript *nd, u_char *str, int len, uid_t *uidp) { int i; char *cp, *endstr, *str0; Modified: head/sys/fs/nfs/nfs_var.h ============================================================================== --- head/sys/fs/nfs/nfs_var.h Tue Mar 12 14:59:08 2019 (r345062) +++ head/sys/fs/nfs/nfs_var.h Tue Mar 12 15:02:52 2019 (r345063) @@ -372,8 +372,7 @@ void nfsrv_adj(mbuf_t, int, int); void nfsrv_postopattr(struct nfsrv_descript *, int, struct nfsvattr *); int nfsd_errmap(struct nfsrv_descript *); void nfsv4_uidtostr(uid_t, u_char **, int *); -int nfsv4_strtouid(struct nfsrv_descript *, u_char *, int, uid_t *, - NFSPROC_T *); +int nfsv4_strtouid(struct nfsrv_descript *, u_char *, int, uid_t *); void nfsv4_gidtostr(gid_t, u_char **, int *, NFSPROC_T *); int nfsv4_strtogid(struct nfsrv_descript *, u_char *, int, gid_t *, NFSPROC_T *); Modified: head/sys/fs/nfsclient/nfs_clrpcops.c ============================================================================== --- head/sys/fs/nfsclient/nfs_clrpcops.c Tue Mar 12 14:59:08 2019 (r345062) +++ head/sys/fs/nfsclient/nfs_clrpcops.c Tue Mar 12 15:02:52 2019 (r345063) @@ -7029,7 +7029,7 @@ nfsrv_parseug(struct nfsrv_descript *nd, int dogrp, ui if (dogrp != 0) error = nfsv4_strtogid(nd, str, len, gidp, p); else - error = nfsv4_strtouid(nd, str, len, uidp, p); + error = nfsv4_strtouid(nd, str, len, uidp); nfsmout: if (len > NFSV4_SMALLSTR) free(str, M_TEMP); Modified: head/sys/fs/nfsserver/nfs_nfsdport.c ============================================================================== --- head/sys/fs/nfsserver/nfs_nfsdport.c Tue Mar 12 14:59:08 2019 (r345062) +++ head/sys/fs/nfsserver/nfs_nfsdport.c Tue Mar 12 15:02:52 2019 (r345063) @@ -2791,8 +2791,8 @@ nfsv4_sattr(struct nfsrv_descript *nd, vnode_t vp, str goto nfsmout; } if (!nd->nd_repstat) { - nd->nd_repstat = nfsv4_strtouid(nd, cp, j, &uid, - p); + nd->nd_repstat = nfsv4_strtouid(nd, cp, j, + &uid); if (!nd->nd_repstat) nvap->na_uid = uid; }