[illumos-gate merge]

commit 146341134a2d1d0e3b8b8bab1cf2750d28a3cb14
    9853 loader.efi: pointer targets in passing argument 2 of 'efi_print_global' differ in signedness
commit b31ca8080c8c8d3586fefd04058d800e36a99e56
    9890 loader.efi: add poweroff command
commit 54fce4e949f3a6a305a415328f3b07e3bfd2c702
    9917 cleanup stale function set_rdattr_params() in nfs4_srv.c
commit e8921a52c53ee69f7b65f054d9b2e886139daa59
    9894 Deliver python3 modules
    9904 Split python modules out into separate packages
    5571 Provide 64-bit python modules
commit e24b44e5c3120c9b5c8e9b7440bc10c8b7413bfb
    9879 more should have better screen size detection

	Conflicts:
	usr/src/tools/env/illumos.sh

1 files changed, 0 insertions, 75 deletions

diff --git a/usr/src/uts/common/fs/nfs/nfs4_srv.c b/usr/src/uts/common/fs/nfs/nfs4_srv.c
index 814ac758d4..30c45a71cd 100644
--- a/usr/src/uts/common/fs/nfs/nfs4_srv.c
+++ b/usr/src/uts/common/fs/nfs/nfs4_srv.c
@@ -3649,81 +3649,6 @@ out:
 }
 
 /*
- * set_rdattr_params sets up the variables used to manage what information
- * to get for each directory entry.
- */
-static nfsstat4
-set_rdattr_params(struct nfs4_svgetit_arg *sargp,
-    bitmap4 attrs, bool_t *need_to_lookup)
-{
-	uint_t	va_mask;
-	nfsstat4 status;
-	bitmap4 objbits;
-
-	status = bitmap4_to_attrmask(attrs, sargp);
-	if (status != NFS4_OK) {
-		/*
-		 * could not even figure attr mask
-		 */
-		return (status);
-	}
-	va_mask = sargp->vap->va_mask;
-
-	/*
-	 * dirent's d_ino is always correct value for mounted_on_fileid.
-	 * mntdfid_set is set once here, but mounted_on_fileid is
-	 * set in main dirent processing loop for each dirent.
-	 * The mntdfid_set is a simple optimization that lets the
-	 * server attr code avoid work when caller is readdir.
-	 */
-	sargp->mntdfid_set = TRUE;
-
-	/*
-	 * Lookup entry only if client asked for any of the following:
-	 * a) vattr attrs
-	 * b) vfs attrs
-	 * c) attrs w/per-object scope requested (change, filehandle, etc)
-	 *    other than mounted_on_fileid (which we can take from dirent)
-	 */
-	objbits = attrs ? attrs & NFS4_VP_ATTR_MASK : 0;
-
-	if (va_mask || sargp->sbp || (objbits & ~FATTR4_MOUNTED_ON_FILEID_MASK))
-		*need_to_lookup = TRUE;
-	else
-		*need_to_lookup = FALSE;
-
-	if (sargp->sbp == NULL)
-		return (NFS4_OK);
-
-	/*
-	 * If filesystem attrs are requested, get them now from the
-	 * directory vp, as most entries will have same filesystem. The only
-	 * exception are mounted over entries but we handle
-	 * those as we go (XXX mounted over detection not yet implemented).
-	 */
-	sargp->vap->va_mask = 0;	/* to avoid VOP_GETATTR */
-	status = bitmap4_get_sysattrs(sargp);
-	sargp->vap->va_mask = va_mask;
-
-	if ((status != NFS4_OK) && sargp->rdattr_error_req) {
-		/*
-		 * Failed to get filesystem attributes.
-		 * Return a rdattr_error for each entry, but don't fail.
-		 * However, don't get any obj-dependent attrs.
-		 */
-		sargp->rdattr_error = status;	/* for rdattr_error */
-		*need_to_lookup = FALSE;
-		/*
-		 * At least get fileid for regular readdir output
-		 */
-		sargp->vap->va_mask &= AT_NODEID;
-		status = NFS4_OK;
-	}
-
-	return (status);
-}
-
-/*
  * readlink: args: CURRENT_FH.
  *	res: status. If success - CURRENT_FH unchanged, return linktext.
  */