From nobody Sat Jun 18 20:44:38 2022 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 4B34885EE48; Sat, 18 Jun 2022 20:44:39 +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 4LQSZZ6vQwz569h; Sat, 18 Jun 2022 20:44:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655585079; 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=EWDpYqRNaYtkdtsVvhfF6WdFdQEMRd7qq7e2RFcqYzQ=; b=exq2RntLFihrgpzRsnDCYRVOpc832k0Fx5zK0GmGMMNndwmHn2Eh3GQbtu10ByH6uNB4wr G48+eLjoJJP4d49plK8P6HKK/jVkQurP32fjYfifRo372/zyaLDSWvOoz+pJWerB9Ux9J7 F4KSkoocfcymOWDwLryrFY+16j8y1sgHgVtyz+9Zc2z1+Gh5VLadQOLHZjIW3Pn6UjgZPF Yw11cSNrjS82FV2xmzeVyVKZHiOpaqCnhzcsON16AkFF7CR5k8YvoioXMu/xByNjYGMJdl kccJJotB7fCvOQSvT7DPiwDxabJyVwH4gNinNk5wq0scecpyOylRf3TJE2jBDA== 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 84E871B561; Sat, 18 Jun 2022 20:44:38 +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 25IKictk060010; Sat, 18 Jun 2022 20:44:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25IKicjB060009; Sat, 18 Jun 2022 20:44:38 GMT (envelope-from git) Date: Sat, 18 Jun 2022 20:44:38 GMT Message-Id: <202206182044.25IKicjB060009@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: 6d25ea6d9641 - main - nfscl: Clean up the code by removing #if(n)def APPLE 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: 6d25ea6d964165fd9a1859a645dedc35ce2606cc Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655585079; 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=EWDpYqRNaYtkdtsVvhfF6WdFdQEMRd7qq7e2RFcqYzQ=; b=IQXvRYPVHwJMUSBRDuk8NEaGnM1FsVetdTvPBRw1yLGwvFaSiiGoR77/5TMlolyUv769gq ffA7N106U9QNiz+Z5cU+CV9I7MkDqFwOimTAGTVZ4eTU/quxGv0F1+6vHDEC4328QEW66m ee8CVS8ida2RzNPlLOeLzGgiHjuN2Pmfk/SyZxhEyOU5l39COIOgjFCqHTzRKsEJMn1KNc 7aKI8qQNlAUR/3jqNMTJUgiCqCoqqNNm+ojZXiCcQrHEupjbtgEAFTiDXyX88yA1qgvPIy bloXK5XQ2YeuqFUzgeZYDB/bRJpnZr8DQKlGzQLtGKRC7+dNqpveqUWzNm08ew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655585079; a=rsa-sha256; cv=none; b=bLI9nFhmaCkhsdILmdJxg2eps6I/BI+SCbbKJ0sQ8OMCu6Mu7XPgH4HcP5+TjZ26Nz7dqZ 86a/06iBWnhW2Wvyq8Xr1MOZt/UwH6PBv4iy9iSTkErVV1hsKlHO66A2N5E5zbUXfamPhk 0vDlOnmG+GSwPbTqxlahs1NPz4IqNzoLuz5tnKd6bEghQd9jQq0VvCGJ6Zyo/GcaueaM6D tBUVog6jcSFI6C1qWA9A7unQSsLCh9RAP/HshciExVmxRL64rafcNSdkvPhJ7ei/eAZ0KA 39gp2DlC1UW3NRRI8An4XvKBoiiT6ZIStxYJamIQ4x73/iZtZRz/hrwtBFstGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=6d25ea6d964165fd9a1859a645dedc35ce2606cc commit 6d25ea6d964165fd9a1859a645dedc35ce2606cc Author: Rick Macklem AuthorDate: 2022-06-18 20:43:02 +0000 Commit: Rick Macklem CommitDate: 2022-06-18 20:43:02 +0000 nfscl: Clean up the code by removing #if(n)def APPLE The definition of "APPLE" was used by the Mac OSX port. For FreeBSD, this definition is never used, so remove the references to it to clean up the code. This commit should not result in a semantics change. --- sys/fs/nfs/nfs_commonsubs.c | 4 ---- sys/fs/nfs/nfsm_subs.h | 2 -- sys/fs/nfsclient/nfs_clrpcops.c | 6 ------ 3 files changed, 12 deletions(-) diff --git a/sys/fs/nfs/nfs_commonsubs.c b/sys/fs/nfs/nfs_commonsubs.c index e11dba4d2d5e..fd04843f2f03 100644 --- a/sys/fs/nfs/nfs_commonsubs.c +++ b/sys/fs/nfs/nfs_commonsubs.c @@ -625,7 +625,6 @@ nfscl_fillsattr(struct nfsrv_descript *nd, struct vattr *vap, } } -#ifndef APPLE /* * copies mbuf chain to the uio scatter/gather list */ @@ -706,7 +705,6 @@ out: NFSEXITCODE2(error, nd); return (error); } -#endif /* !APPLE */ /* * Help break down an mbuf chain by setting the first siz bytes contiguous @@ -2531,7 +2529,6 @@ nfsv4_fillattr(struct nfsrv_descript *nd, struct mount *mp, vnode_t vp, aclp = naclp; } nfsvno_getfs(&fsinf, isdgram); -#ifndef APPLE /* * Get the VFS_STATFS(), since some attributes need them. */ @@ -2558,7 +2555,6 @@ nfsv4_fillattr(struct nfsrv_descript *nd, struct mount *mp, vnode_t vp, if (fs->f_ffree < 0) fs->f_ffree = 0; } -#endif /* * And the NFSv4 ACL... diff --git a/sys/fs/nfs/nfsm_subs.h b/sys/fs/nfs/nfsm_subs.h index 671bd23ae313..37cbb76bfc44 100644 --- a/sys/fs/nfs/nfsm_subs.h +++ b/sys/fs/nfs/nfsm_subs.h @@ -43,7 +43,6 @@ * other purpose will be dangerous. (they make weird assumptions) */ -#ifndef APPLE /* * First define what the actual subs. return */ @@ -142,7 +141,6 @@ nfsm_dissect_nonblock(struct nfsrv_descript *nd, int siz) goto nfsmout; \ } \ } while (0) -#endif /* !APPLE */ #define NFSM_STRSIZ(s, m) \ do { \ diff --git a/sys/fs/nfsclient/nfs_clrpcops.c b/sys/fs/nfsclient/nfs_clrpcops.c index 3e66bf93e4fc..bf4cbe88af95 100644 --- a/sys/fs/nfsclient/nfs_clrpcops.c +++ b/sys/fs/nfsclient/nfs_clrpcops.c @@ -425,9 +425,6 @@ else printf(" fhl=0\n"); NFS4NODENAME(np->n_v4), np->n_v4->n4_namelen, &dp, cred, p); if (dp != NULL) { -#ifdef APPLE - OSBitAndAtomic((int32_t)~NDELEGMOD, (UInt32 *)&np->n_flag); -#else NFSLOCKNODE(np); np->n_flag &= ~NDELEGMOD; /* @@ -439,7 +436,6 @@ else printf(" fhl=0\n"); */ NFSINVALATTRCACHE(np); NFSUNLOCKNODE(np); -#endif (void) nfscl_deleg(nmp->nm_mountp, op->nfso_own->nfsow_clp, nfhp->nfh_fh, nfhp->nfh_len, cred, p, &dp); @@ -3645,7 +3641,6 @@ nfsmout: return (error); } -#ifndef APPLE /* * NFS V3 readdir plus RPC. Used in place of nfsrpc_readdir(). * (Also used for NFS V4 when mount flag set.) @@ -4181,7 +4176,6 @@ nfsmout: m_freem(nd->nd_mrep); return (error); } -#endif /* !APPLE */ /* * Nfs commit rpc