Mercurial > unleashed > wips

changeset 20532:226fa61c53df

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
treewide: remove dirent64/dirent32 these structs were already of identical size and alignment to 'struct dirent', on both 32-bit and 64-bit. this just reduces the amount of names in use.
author Lauri Tirkkonen <lotheac@iki.fi>
date Tue, 16 Apr 2019 23:40:03 +0300
parents f45c18363886
children 790162609906
files contrib/ncurses/progs/progs.priv.h include/dirent.h include/rpcsvc/autofs_prot.x include/sys/dirent.h include/sys/fs/sdev_impl.h include/sys/pathname.h kernel/fs/autofs/auto_vnops.c kernel/fs/autofs/auto_xdr.c kernel/fs/bootfs/bootfs_vnops.c kernel/fs/ctfs/ctfs_all.c kernel/fs/ctfs/ctfs_tdir.c kernel/fs/dev/sdev_profile.c kernel/fs/dev/sdev_subr.c kernel/fs/devfs/devfs_subr.c kernel/fs/devfs/devfs_vnops.c kernel/fs/fdfs/fdops.c kernel/fs/gfs.c kernel/fs/hsfs/hsfs_vnops.c kernel/fs/lookup.c kernel/fs/nfs/nfs3_srv.c kernel/fs/nfs/nfs3_vnops.c kernel/fs/nfs/nfs3_xdr.c kernel/fs/nfs/nfs4_srv.c kernel/fs/nfs/nfs4_srv_readdir.c kernel/fs/nfs/nfs4_state.c kernel/fs/nfs/nfs4_vnops.c kernel/fs/nfs/nfs4_xdr.c kernel/fs/nfs/nfs_cmd.c kernel/fs/nfs/nfs_log_xdr.c kernel/fs/nfs/nfs_srv.c kernel/fs/nfs/nfs_subr.c kernel/fs/nfs/nfs_xdr.c kernel/fs/objfs/objfs_root.c kernel/fs/pcfs/pc_vnops.c kernel/fs/proc/prvnops.c kernel/fs/tmpfs/tmp_vnops.c kernel/fs/udfs/udf_vnops.c kernel/fs/ufs/ufs_vnops.c kernel/fs/zfs/zfs_ctldir.c kernel/fs/zfs/zfs_vnops.c kernel/syscall/getdents.c usr/src/cmd/ctstat/ctstat.c usr/src/cmd/diff/diff.c usr/src/cmd/fs.d/autofs/autod_readdir.c usr/src/cmd/fs.d/autofs/autod_xdr.c usr/src/cmd/zlook/zlook.c usr/src/lib/libvolmgt/common/volmgt_on_private.c usr/src/lib/libzfs/common/libzfs_import.c usr/src/lib/libzfs/common/libzfs_mount.c usr/src/lib/scsi/libses/common/ses_plugin.c usr/src/lib/scsi/libsmp/common/smp_plugin.c usr/src/uts/common/fs/smbclnt/smbfs/smbfs_vnops.c usr/src/uts/common/fs/smbsrv/smb_mangle_name.c usr/src/uts/common/fs/smbsrv/smb_node.c usr/src/uts/common/fs/smbsrv/smb_odir.c usr/src/uts/common/fs/smbsrv/smb_vops.c usr/src/uts/common/nfs/nfs.h usr/src/uts/common/nfs/nfs4_kprot.h usr/src/uts/common/nfs/nfs_cmd.h usr/src/uts/common/smbsrv/smb_ktypes.h
diffstat 60 files changed, 288 insertions(+), 321 deletions(-) [+]
line wrap: on
line diff
--- a/contrib/ncurses/progs/progs.priv.h	Tue Apr 16 23:02:47 2019 +0300
+++ b/contrib/ncurses/progs/progs.priv.h	Tue Apr 16 23:40:03 2019 +0300
@@ -72,7 +72,7 @@
 # define NAMLEN(dirent) strlen((dirent)->d_name)
 # if defined(_FILE_OFFSET_BITS) && defined(HAVE_STRUCT_DIRENT64)
 #  if !defined(_LP64) && (_FILE_OFFSET_BITS == 64)
-#   define	DIRENT	struct dirent64
+#   define	DIRENT	struct dirent
 #  else
 #   define	DIRENT	struct dirent
 #  endif
--- a/include/dirent.h	Tue Apr 16 23:02:47 2019 +0300
+++ b/include/dirent.h	Tue Apr 16 23:40:03 2019 +0300
@@ -104,9 +104,9 @@
  * FIXME source compat: these are aliases to non-64 ones in libc (though the
  * arg types are differently named).
  */
-struct dirent64 *readdir64(DIR *);
-int readdir64_r(DIR *_RESTRICT_KYWD, struct dirent64 *_RESTRICT_KYWD,
-    struct dirent64 **_RESTRICT_KYWD);
+struct dirent *readdir64(DIR *);
+int readdir64_r(DIR *_RESTRICT_KYWD, struct dirent *_RESTRICT_KYWD,
+    struct dirent **_RESTRICT_KYWD);
 
 #ifdef	__cplusplus
 }
--- a/include/rpcsvc/autofs_prot.x	Tue Apr 16 23:02:47 2019 +0300
+++ b/include/rpcsvc/autofs_prot.x	Tue Apr 16 23:40:03 2019 +0300
@@ -239,7 +239,7 @@
 	u_int	rddir_offset;		/* last offset in list */
 	u_int	rddir_size;		/* size in bytes of entries */
 	bool_t	rddir_eof;		/* TRUE if last entry in result */
-	struct dirent64 *rddir_entries;	/* variable number of entries */
+	struct dirent *rddir_entries;	/* variable number of entries */
 };
 
 /*
--- a/include/sys/dirent.h	Tue Apr 16 23:02:47 2019 +0300
+++ b/include/sys/dirent.h	Tue Apr 16 23:40:03 2019 +0300
@@ -48,43 +48,12 @@
 	char		d_name[1];	/* name of file */
 } dirent_t;
 
-#if defined(_SYSCALL32)
-
-/* kernel's view of user ILP32 dirent */
-
-typedef	struct dirent32 {
-	ino_t		d_ino;		/* "inode number" of entry */
-	off_t		d_off;		/* offset of disk directory entry */
-	uint16_t	d_reclen;	/* length of this record */
-	char		d_name[1];	/* name of file */
-} dirent32_t;
-
-#endif	/* _SYSCALL32 */
-
-#ifdef	_LARGEFILE64_SOURCE
-
-/*
- * transitional large file interface version AND kernel internal version
- */
-typedef struct dirent64 {
-	ino64_t		d_ino;		/* "inode number" of entry */
-	off64_t		d_off;		/* offset of disk directory entry */
-	unsigned short	d_reclen;	/* length of this record */
-	char		d_name[1];	/* name of file */
-} dirent64_t;
-
-#endif	/* _LARGEFILE64_SOURCE */
-
 #if !defined(__XOPEN_OR_POSIX) || defined(__EXTENSIONS__)
 #if defined(_KERNEL)
-#define	DIRENT64_RECLEN(namelen)	\
-	((offsetof(dirent64_t, d_name[0]) + 1 + (namelen) + 7) & ~ 7)
-#define	DIRENT64_NAMELEN(reclen)	\
-	((reclen) - (offsetof(dirent64_t, d_name[0])))
-#define	DIRENT32_RECLEN(namelen)	\
-	((offsetof(dirent32_t, d_name[0]) + 1 + (namelen) + 3) & ~ 3)
-#define	DIRENT32_NAMELEN(reclen)	\
-	((reclen) - (offsetof(dirent32_t, d_name[0])))
+#define	DIRENT_RECLEN(namelen)	\
+	((offsetof(dirent_t, d_name[0]) + 1 + (namelen) + 7) & ~ 7)
+#define	DIRENT_NAMELEN(reclen)	\
+	((reclen) - (offsetof(dirent_t, d_name[0])))
 #endif
 
 /*
@@ -97,8 +66,6 @@
 
 extern int getdents(int, struct dirent *, size_t);
 
-/* N.B.: transitional large file interface version deliberately not provided */
-
 #endif /* !defined(_KERNEL) */
 #endif /* !defined(__XOPEN_OR_POSIX) || defined(__EXTENSIONS__) */
 
--- a/include/sys/fs/sdev_impl.h	Tue Apr 16 23:02:47 2019 +0300
+++ b/include/sys/fs/sdev_impl.h	Tue Apr 16 23:40:03 2019 +0300
@@ -477,7 +477,7 @@
 extern int sdev_cleandir(struct sdev_node *, char *, uint_t);
 extern int sdev_rnmnode(struct sdev_node *, struct sdev_node *,
     struct sdev_node *, struct sdev_node **, char *, struct cred *);
-extern size_t add_dir_entry(dirent64_t *, char *, size_t, ino_t, offset_t);
+extern size_t add_dir_entry(dirent_t *, char *, size_t, ino_t, offset_t);
 extern struct vattr *sdev_getdefault_attr(enum vtype type);
 extern int sdev_to_vp(struct sdev_node *, struct vnode **);
 extern ino_t sdev_mkino(struct sdev_node *);
--- a/include/sys/pathname.h	Tue Apr 16 23:02:47 2019 +0300
+++ b/include/sys/pathname.h	Tue Apr 16 23:40:03 2019 +0300
@@ -101,7 +101,7 @@
 extern int vnodetopath(vnode_t *, vnode_t *, char *, size_t, cred_t *);
 extern int dogetcwd(char *, size_t);
 extern int dirfindvp(vnode_t *, vnode_t *, vnode_t *, cred_t *, char *,
-		size_t, dirent64_t **);
+		size_t, dirent_t **);
 
 #ifdef	__cplusplus
 }
--- a/kernel/fs/autofs/auto_vnops.c	Tue Apr 16 23:02:47 2019 +0300
+++ b/kernel/fs/autofs/auto_vnops.c	Tue Apr 16 23:40:03 2019 +0300
@@ -931,7 +931,7 @@
 #ifdef nextdp
 #undef nextdp
 #endif
-#define	nextdp(dp)	((struct dirent64 *)((char *)(dp) + (dp)->d_reclen))
+#define	nextdp(dp)	((struct dirent *)((char *)(dp) + (dp)->d_reclen))
 
 /* ARGSUSED */
 static int
@@ -947,7 +947,7 @@
 	autofs_rddirres rd;
 	fnnode_t *fnp = vntofn(vp);
 	fnnode_t *cfnp, *nfnp;
-	dirent64_t *dp;
+	dirent_t *dp;
 	ulong_t offset;
 	ulong_t outcount = 0, count = 0;
 	size_t namelen;
@@ -1029,8 +1029,8 @@
 			goto done;
 		}
 		if (rd.rd_rddir.rddir_size) {
-			dirent64_t *odp = dp;   /* next in output buffer */
-			dirent64_t *cdp = dp;   /* current examined entry */
+			dirent_t *odp = dp;   /* next in output buffer */
+			dirent_t *cdp = dp;   /* current examined entry */
 
 			/*
 			 * Check for duplicates here
@@ -1065,7 +1065,7 @@
 					}
 				}
 				count += this_reclen;
-				cdp = (struct dirent64 *)
+				cdp = (struct dirent *)
 				    ((char *)cdp + this_reclen);
 			} while (count < rd.rd_rddir.rddir_size);
 
@@ -1101,7 +1101,7 @@
 		/*
 		 * first time: so fudge the . and ..
 		 */
-		this_reclen = DIRENT64_RECLEN(1);
+		this_reclen = DIRENT_RECLEN(1);
 		if (alloc_count < this_reclen) {
 			error = EINVAL;
 			goto done;
@@ -1113,11 +1113,11 @@
 		/* use strncpy(9f) to zero out uninitialized bytes */
 
 		(void) strncpy(dp->d_name, ".",
-		    DIRENT64_NAMELEN(this_reclen));
+		    DIRENT_NAMELEN(this_reclen));
 		outcount += dp->d_reclen;
 		dp = nextdp(dp);
 
-		this_reclen = DIRENT64_RECLEN(2);
+		this_reclen = DIRENT_RECLEN(2);
 		if (alloc_count < outcount + this_reclen) {
 			error = EINVAL;
 			goto done;
@@ -1129,7 +1129,7 @@
 		/* use strncpy(9f) to zero out uninitialized bytes */
 
 		(void) strncpy(dp->d_name, "..",
-		    DIRENT64_NAMELEN(this_reclen));
+		    DIRENT_NAMELEN(this_reclen));
 		outcount += dp->d_reclen;
 		dp = nextdp(dp);
 	}
@@ -1149,7 +1149,7 @@
 			 * transient state (not being looked-up)
 			 */
 			namelen = strlen(cfnp->fn_name);
-			reclen = (int)DIRENT64_RECLEN(namelen);
+			reclen = (int)DIRENT_RECLEN(namelen);
 			if (outcount + reclen > alloc_count) {
 				reached_max = 1;
 				break;
@@ -1172,7 +1172,7 @@
 			/* use strncpy(9f) to zero out uninitialized bytes */
 
 			(void) strncpy(dp->d_name, cfnp->fn_name,
-			    DIRENT64_NAMELEN(reclen));
+			    DIRENT_NAMELEN(reclen));
 			outcount += dp->d_reclen;
 			dp = nextdp(dp);
 		}
--- a/kernel/fs/autofs/auto_xdr.c	Tue Apr 16 23:02:47 2019 +0300
+++ b/kernel/fs/autofs/auto_xdr.c	Tue Apr 16 23:40:03 2019 +0300
@@ -389,7 +389,7 @@
 #ifdef nextdp
 #undef nextdp
 #endif
-#define	nextdp(dp)	((struct dirent64 *)((char *)(dp) + (dp)->d_reclen))
+#define	nextdp(dp)	((struct dirent *)((char *)(dp) + (dp)->d_reclen))
 
 /*
  * ENCODE ONLY
@@ -397,7 +397,7 @@
 bool_t
 xdr_autofs_putrddirres(XDR *xdrs, struct autofsrddir *rddir, uint_t reqsize)
 {
-	struct dirent64 *dp;
+	struct dirent *dp;
 	char *name;
 	int size;
 	uint_t namlen;
@@ -450,7 +450,7 @@
 bool_t
 xdr_autofs_getrddirres(XDR *xdrs, struct autofsrddir *rddir)
 {
-	struct dirent64 *dp;
+	struct dirent *dp;
 	uint_t namlen;
 	int size;
 	bool_t valid;
@@ -469,7 +469,7 @@
 		if (!xdr_u_int(xdrs, &fileid) ||
 		    !xdr_u_int(xdrs, &namlen))
 			return (FALSE);
-		if (DIRENT64_RECLEN(namlen) > size) {
+		if (DIRENT_RECLEN(namlen) > size) {
 			rddir->rddir_eof = FALSE;
 			goto bufovflw;
 		}
@@ -477,9 +477,9 @@
 		    !xdr_u_int(xdrs, &offset))
 			return (FALSE);
 		dp->d_ino = fileid;
-		dp->d_reclen = (ushort_t)DIRENT64_RECLEN(namlen);
+		dp->d_reclen = (ushort_t)DIRENT_RECLEN(namlen);
 		bzero(&dp->d_name[namlen],
-		    DIRENT64_NAMELEN(dp->d_reclen) - namlen);
+		    DIRENT_NAMELEN(dp->d_reclen) - namlen);
 		dp->d_off = offset;
 		size -= dp->d_reclen;
 		/* LINTED pointer alignment */
--- a/kernel/fs/bootfs/bootfs_vnops.c	Tue Apr 16 23:02:47 2019 +0300
+++ b/kernel/fs/bootfs/bootfs_vnops.c	Tue Apr 16 23:40:03 2019 +0300
@@ -207,7 +207,7 @@
     caller_context_t *ct, int flags)
 {
 	bootfs_node_t *bnp = (bootfs_node_t *)vp->v_data;
-	dirent64_t *dp;
+	dirent_t *dp;
 	void *buf;
 	ulong_t bsize, brem;
 	offset_t coff, roff;
@@ -243,7 +243,7 @@
 	 * what's actually stored when we update the offset in the structure.
 	 */
 	if (roff == 0) {
-		dlen = DIRENT64_RECLEN(1);
+		dlen = DIRENT_RECLEN(1);
 		if (first == B_TRUE) {
 			if (dlen > brem) {
 				kmem_free(buf, bsize);
@@ -254,13 +254,13 @@
 		dp->d_ino = (ino64_t)bnp->bvn_attr.va_nodeid;
 		dp->d_off = 0;
 		dp->d_reclen = (ushort_t)dlen;
-		(void) strncpy(dp->d_name, ".", DIRENT64_NAMELEN(dlen));
-		dp = (struct dirent64 *)((uintptr_t)dp + dp->d_reclen);
+		(void) strncpy(dp->d_name, ".", DIRENT_NAMELEN(dlen));
+		dp = (struct dirent *)((uintptr_t)dp + dp->d_reclen);
 		brem -= dlen;
 	}
 
 	if (roff <= 1) {
-		dlen = DIRENT64_RECLEN(2);
+		dlen = DIRENT_RECLEN(2);
 		if (first == B_TRUE) {
 			if (dlen > brem) {
 				kmem_free(buf, bsize);
@@ -271,8 +271,8 @@
 		dp->d_ino = (ino64_t)bnp->bvn_parent->bvn_attr.va_nodeid;
 		dp->d_off = 1;
 		dp->d_reclen = (ushort_t)dlen;
-		(void) strncpy(dp->d_name, "..", DIRENT64_NAMELEN(dlen));
-		dp = (struct dirent64 *)((uintptr_t)dp + dp->d_reclen);
+		(void) strncpy(dp->d_name, "..", DIRENT_NAMELEN(dlen));
+		dp = (struct dirent *)((uintptr_t)dp + dp->d_reclen);
 		brem -= dlen;
 	}
 
@@ -286,7 +286,7 @@
 			continue;
 		}
 
-		dlen = DIRENT64_RECLEN(nlen);
+		dlen = DIRENT_RECLEN(nlen);
 		if (dlen > brem) {
 			if (first == B_TRUE) {
 				kmem_free(buf, bsize);
@@ -300,8 +300,8 @@
 		dp->d_off = coff;
 		dp->d_reclen = (ushort_t)dlen;
 		(void) strncpy(dp->d_name, dnp->bvn_name,
-		    DIRENT64_NAMELEN(dlen));
-		dp = (struct dirent64 *)((uintptr_t)dp + dp->d_reclen);
+		    DIRENT_NAMELEN(dlen));
+		dp = (struct dirent *)((uintptr_t)dp + dp->d_reclen);
 		brem -= dlen;
 		coff += nlen;
 	}
--- a/kernel/fs/ctfs/ctfs_all.c	Tue Apr 16 23:02:47 2019 +0300
+++ b/kernel/fs/ctfs/ctfs_all.c	Tue Apr 16 23:40:03 2019 +0300
@@ -124,7 +124,7 @@
 {
 	uint64_t zuniqid;
 	ctid_t next;
-	struct dirent64 *odp = dp;
+	struct dirent *odp = dp;
 
 	ASSERT(!(flags & V_RDDIR_ENTFLAGS));
 
--- a/kernel/fs/ctfs/ctfs_tdir.c	Tue Apr 16 23:02:47 2019 +0300
+++ b/kernel/fs/ctfs/ctfs_tdir.c	Tue Apr 16 23:40:03 2019 +0300
@@ -112,7 +112,7 @@
 	uint64_t zuniqid;
 	ctid_t next;
 	ct_type_t *ty = ct_types[gfs_file_index(vp)];
-	struct dirent64 *odp = dp;
+	struct dirent *odp = dp;
 
 	ASSERT(!(flags & V_RDDIR_ENTFLAGS));
 
--- a/kernel/fs/dev/sdev_profile.c	Tue Apr 16 23:02:47 2019 +0300
+++ b/kernel/fs/dev/sdev_profile.c	Tue Apr 16 23:40:03 2019 +0300
@@ -477,8 +477,8 @@
 	int eof, error;
 	struct iovec iov;
 	struct uio uio;
-	struct dirent64 *dp;
-	dirent64_t *dbuf;
+	struct dirent *dp;
+	dirent_t *dbuf;
 	size_t dbuflen, dlen;
 
 	ASSERT(dvp);
@@ -509,7 +509,7 @@
 			break;
 		for (dp = dbuf; ((intptr_t)dp <
 		    (intptr_t)dbuf + dbuflen);
-		    dp = (dirent64_t *)((intptr_t)dp + dp->d_reclen)) {
+		    dp = (dirent_t *)((intptr_t)dp + dp->d_reclen)) {
 			nm = dp->d_name;
 
 			if (strcmp(nm, ".") == 0 ||
--- a/kernel/fs/dev/sdev_subr.c	Tue Apr 16 23:02:47 2019 +0300
+++ b/kernel/fs/dev/sdev_subr.c	Tue Apr 16 23:40:03 2019 +0300
@@ -1406,8 +1406,8 @@
 	int eof;
 	struct iovec iov;
 	struct uio uio;
-	struct dirent64 *dp;
-	dirent64_t *dbuf;
+	struct dirent *dp;
+	dirent_t *dbuf;
 	size_t dbuflen;
 	struct vattr vattr;
 	char *link = NULL;
@@ -1448,7 +1448,7 @@
 
 		for (dp = dbuf; ((intptr_t)dp <
 		    (intptr_t)dbuf + dbuflen);
-		    dp = (dirent64_t *)((intptr_t)dp + dp->d_reclen)) {
+		    dp = (dirent_t *)((intptr_t)dp + dp->d_reclen)) {
 			nm = dp->d_name;
 
 			if (strcmp(nm, ".") == 0 ||
@@ -2346,16 +2346,16 @@
  * a convenient wrapper for readdir() funcs
  */
 size_t
-add_dir_entry(dirent64_t *de, char *nm, size_t size, ino_t ino, offset_t off)
+add_dir_entry(dirent_t *de, char *nm, size_t size, ino_t ino, offset_t off)
 {
-	size_t reclen = DIRENT64_RECLEN(strlen(nm));
+	size_t reclen = DIRENT_RECLEN(strlen(nm));
 	if (reclen > size)
 		return (0);
 
 	de->d_ino = (ino64_t)ino;
 	de->d_off = (off64_t)off + 1;
 	de->d_reclen = (ushort_t)reclen;
-	(void) strncpy(de->d_name, nm, DIRENT64_NAMELEN(reclen));
+	(void) strncpy(de->d_name, nm, DIRENT_NAMELEN(reclen));
 	return (reclen);
 }
 
@@ -2382,7 +2382,7 @@
 #ifdef nextdp
 #undef nextdp
 #endif
-#define	nextdp(dp)	((struct dirent64 *) \
+#define	nextdp(dp)	((struct dirent *) \
 			    (intptr_t)((char *)(dp) + (dp)->d_reclen))
 
 /*
@@ -2394,7 +2394,7 @@
 {
 	struct sdev_node *ddv = VTOSDEV(vp);
 	struct sdev_node *dv;
-	dirent64_t	*dp;
+	dirent_t	*dp;
 	ulong_t		outcount = 0;
 	size_t		namelen;
 	ulong_t		alloc_count;
@@ -2503,7 +2503,7 @@
 	diroff = 0;
 	if (soff == 0) {
 		/* first time */
-		this_reclen = DIRENT64_RECLEN(1);
+		this_reclen = DIRENT_RECLEN(1);
 		if (alloc_count < this_reclen) {
 			error = EINVAL;
 			goto done;
@@ -2514,14 +2514,14 @@
 		dp->d_reclen = (ushort_t)this_reclen;
 
 		(void) strncpy(dp->d_name, ".",
-		    DIRENT64_NAMELEN(this_reclen));
+		    DIRENT_NAMELEN(this_reclen));
 		outcount += dp->d_reclen;
 		dp = nextdp(dp);
 	}
 
 	diroff++;
 	if (soff <= 1) {
-		this_reclen = DIRENT64_RECLEN(2);
+		this_reclen = DIRENT_RECLEN(2);
 		if (alloc_count < outcount + this_reclen) {
 			error = EINVAL;
 			goto done;
@@ -2532,7 +2532,7 @@
 		dp->d_off = (off64_t)2;
 
 		(void) strncpy(dp->d_name, "..",
-		    DIRENT64_NAMELEN(this_reclen));
+		    DIRENT_NAMELEN(this_reclen));
 		outcount += dp->d_reclen;
 
 		dp = nextdp(dp);
@@ -2586,7 +2586,7 @@
 		}
 
 		namelen = strlen(dv->sdev_name);
-		reclen = DIRENT64_RECLEN(namelen);
+		reclen = DIRENT_RECLEN(namelen);
 		if (outcount + reclen > alloc_count) {
 			goto full;
 		}
@@ -2594,7 +2594,7 @@
 		dp->d_ino = (ino64_t)dv->sdev_ino;
 		dp->d_off = (off64_t)diroff + 1;
 		(void) strncpy(dp->d_name, dv->sdev_name,
-		    DIRENT64_NAMELEN(reclen));
+		    DIRENT_NAMELEN(reclen));
 		outcount += reclen;
 		dp = nextdp(dp);
 	}
@@ -2787,7 +2787,7 @@
 	char	**newlist = NULL;
 	int	npaths = 0;
 	int	npaths_alloc = 0;
-	dirent64_t *dbuf = NULL;
+	dirent_t *dbuf = NULL;
 	int	n;
 	char	*s;
 	int error;
@@ -2795,7 +2795,7 @@
 	int eof;
 	struct iovec iov;
 	struct uio uio;
-	struct dirent64 *dp;
+	struct dirent *dp;
 	size_t dlen;
 	size_t dbuflen;
 	int ndirents = 64;
@@ -2836,7 +2836,7 @@
 			break;
 
 		for (dp = dbuf; ((intptr_t)dp < (intptr_t)dbuf + dbuflen);
-		    dp = (dirent64_t *)((intptr_t)dp + dp->d_reclen)) {
+		    dp = (dirent_t *)((intptr_t)dp + dp->d_reclen)) {
 
 			nm = dp->d_name;
 
--- a/kernel/fs/devfs/devfs_subr.c	Tue Apr 16 23:02:47 2019 +0300
+++ b/kernel/fs/devfs/devfs_subr.c	Tue Apr 16 23:40:03 2019 +0300
@@ -1627,8 +1627,8 @@
 	int		eof;
 	struct iovec	iov;
 	struct uio	uio;
-	struct dirent64	*dp;
-	dirent64_t	*dbuf;
+	struct dirent	*dp;
+	dirent_t	*dbuf;
 	size_t		dlen;
 	size_t		dbuflen;
 	int		ndirents = 64;
@@ -1664,7 +1664,7 @@
 			break;
 
 		for (dp = dbuf; ((intptr_t)dp < (intptr_t)dbuf + dbuflen);
-		    dp = (dirent64_t *)((intptr_t)dp + dp->d_reclen)) {
+		    dp = (dirent_t *)((intptr_t)dp + dp->d_reclen)) {
 
 			nm = dp->d_name;
 
@@ -1724,8 +1724,8 @@
 	int		eof;
 	struct iovec	iov;
 	struct uio	uio;
-	struct dirent64	*dp;
-	dirent64_t	*dbuf;
+	struct dirent	*dp;
+	dirent_t	*dbuf;
 	size_t		dlen;
 	size_t		dbuflen;
 	int		ndirents = 64;
@@ -1804,7 +1804,7 @@
 			break;
 
 		for (dp = dbuf; ((intptr_t)dp < (intptr_t)dbuf + dbuflen);
-		    dp = (dirent64_t *)((intptr_t)dp + dp->d_reclen)) {
+		    dp = (dirent_t *)((intptr_t)dp + dp->d_reclen)) {
 
 			nm = dp->d_name;
 
--- a/kernel/fs/devfs/devfs_vnops.c	Tue Apr 16 23:02:47 2019 +0300
+++ b/kernel/fs/devfs/devfs_vnops.c	Tue Apr 16 23:40:03 2019 +0300
@@ -863,7 +863,7 @@
     caller_context_t *ct, int flags)
 {
 	struct dv_node *ddv, *dv;
-	struct dirent64 *de, *bufp;
+	struct dirent *de, *bufp;
 	offset_t diroff;
 	offset_t	soff;
 	size_t reclen, movesz;
@@ -915,7 +915,7 @@
 	 */
 	diroff = 0;
 	if (soff == 0) {				/* . */
-		reclen = DIRENT64_RECLEN(strlen("."));
+		reclen = DIRENT_RECLEN(strlen("."));
 		if ((movesz + reclen) > bufsz)
 			goto full;
 		de->d_ino = (ino64_t)ddv->dv_ino;
@@ -924,16 +924,16 @@
 
 		/* use strncpy(9f) to zero out uninitialized bytes */
 
-		(void) strncpy(de->d_name, ".", DIRENT64_NAMELEN(reclen));
+		(void) strncpy(de->d_name, ".", DIRENT_NAMELEN(reclen));
 		movesz += reclen;
-		de = (dirent64_t *)(intptr_t)((char *)de + reclen);
+		de = (dirent_t *)(intptr_t)((char *)de + reclen);
 		dcmn_err3(("devfs_readdir: A: diroff %lld, soff %lld: '%s' "
 		    "reclen %lu\n", diroff, soff, ".", reclen));
 	}
 
 	diroff++;
 	if (soff <= 1) {				/* .. */
-		reclen = DIRENT64_RECLEN(strlen(".."));
+		reclen = DIRENT_RECLEN(strlen(".."));
 		if ((movesz + reclen) > bufsz)
 			goto full;
 		de->d_ino = (ino64_t)ddv->dv_dotdot->dv_ino;
@@ -942,9 +942,9 @@
 
 		/* use strncpy(9f) to zero out uninitialized bytes */
 
-		(void) strncpy(de->d_name, "..", DIRENT64_NAMELEN(reclen));
+		(void) strncpy(de->d_name, "..", DIRENT_NAMELEN(reclen));
 		movesz += reclen;
-		de = (dirent64_t *)(intptr_t)((char *)de + reclen);
+		de = (dirent_t *)(intptr_t)((char *)de + reclen);
 		dcmn_err3(("devfs_readdir: B: diroff %lld, soff %lld: '%s' "
 		    "reclen %lu\n", diroff, soff, "..", reclen));
 	}
@@ -971,7 +971,7 @@
 		if ((dv->dv_flags & DV_INTERNAL) && (cred != kcred))
 			continue;
 
-		reclen = DIRENT64_RECLEN(strlen(dv->dv_name));
+		reclen = DIRENT_RECLEN(strlen(dv->dv_name));
 		if ((movesz + reclen) > bufsz) {
 			dcmn_err3(("devfs_readdir: C: diroff "
 			    "%lld, soff %lld: '%s' reclen %lu\n",
@@ -985,12 +985,12 @@
 		/* use strncpy(9f) to zero out uninitialized bytes */
 
 		ASSERT(strlen(dv->dv_name) + 1 <=
-		    DIRENT64_NAMELEN(reclen));
+		    DIRENT_NAMELEN(reclen));
 		(void) strncpy(de->d_name, dv->dv_name,
-		    DIRENT64_NAMELEN(reclen));
+		    DIRENT_NAMELEN(reclen));
 
 		movesz += reclen;
-		de = (dirent64_t *)(intptr_t)((char *)de + reclen);
+		de = (dirent_t *)(intptr_t)((char *)de + reclen);
 		dcmn_err4(("devfs_readdir: D: diroff "
 		    "%lld, soff %lld: '%s' reclen %lu\n", diroff, soff,
 		    dv->dv_name, reclen));
--- a/kernel/fs/fdfs/fdops.c	Tue Apr 16 23:02:47 2019 +0300
+++ b/kernel/fs/fdfs/fdops.c	Tue Apr 16 23:40:03 2019 +0300
@@ -228,8 +228,8 @@
     int flags)
 {
 	/* bp holds one dirent structure */
-	uoff_t bp[DIRENT64_RECLEN(FDNSIZE) / sizeof (uoff_t)];
-	struct dirent64 *dirent = (struct dirent64 *)bp;
+	uoff_t bp[DIRENT_RECLEN(FDNSIZE) / sizeof (uoff_t)];
+	struct dirent *dirent = (struct dirent *)bp;
 	int reclen, nentries;
 	rctl_qty_t fdno_ctl;
 	int  n;
@@ -255,13 +255,13 @@
 			dirent->d_ino = (ino64_t)FDROOTINO;
 			dirent->d_name[0] = '.';
 			dirent->d_name[1] = '\0';
-			reclen = DIRENT64_RECLEN(1);
+			reclen = DIRENT_RECLEN(1);
 		} else if (off == FDSDSIZE) {		/* ".." */
 			dirent->d_ino = (ino64_t)FDROOTINO;
 			dirent->d_name[0] = '.';
 			dirent->d_name[1] = '.';
 			dirent->d_name[2] = '\0';
-			reclen = DIRENT64_RECLEN(2);
+			reclen = DIRENT_RECLEN(2);
 		} else {
 			/*
 			 * Return entries corresponding to the allowable
@@ -271,7 +271,7 @@
 				break;
 			dirent->d_ino = (ino64_t)fdtoi(n);
 			numtos((ulong_t)n, dirent->d_name);
-			reclen = DIRENT64_RECLEN(strlen(dirent->d_name));
+			reclen = DIRENT_RECLEN(strlen(dirent->d_name));
 		}
 		dirent->d_off = (offset_t)(uiop->uio_offset + FDSDSIZE);
 		dirent->d_reclen = (ushort_t)reclen;
--- a/kernel/fs/gfs.c	Tue Apr 16 23:02:47 2019 +0300
+++ b/kernel/fs/gfs.c	Tue Apr 16 23:40:03 2019 +0300
@@ -204,7 +204,7 @@
 	if (flags & V_RDDIR_ENTFLAGS)
 		dirent_size = EDIRENT_RECLEN(st->grd_namlen);
 	else
-		dirent_size = DIRENT64_RECLEN(st->grd_namlen);
+		dirent_size = DIRENT_RECLEN(st->grd_namlen);
 	st->grd_dirent = kmem_zalloc(dirent_size, KM_SLEEP);
 	st->grd_parent = parent;
 	st->grd_self = self;
@@ -225,7 +225,7 @@
 gfs_readdir_emit_int(gfs_readdir_state_t *st, uio_t *uiop, offset_t next)
 {
 	int reclen;
-	dirent64_t *dp;
+	dirent_t *dp;
 	edirent_t *edp;
 
 	if (st->grd_flags & V_RDDIR_ENTFLAGS) {
@@ -233,7 +233,7 @@
 		reclen = EDIRENT_RECLEN(strlen(edp->ed_name));
 	} else {
 		dp = st->grd_dirent;
-		reclen = DIRENT64_RECLEN(strlen(dp->d_name));
+		reclen = DIRENT_RECLEN(strlen(dp->d_name));
 	}
 
 	if (reclen > uiop->uio_resid) {
@@ -286,7 +286,7 @@
 		(void) strncpy(edp->ed_name, name, st->grd_namlen);
 		edp->ed_eflags = eflags;
 	} else {
-		dirent64_t *dp = st->grd_dirent;
+		dirent_t *dp = st->grd_dirent;
 
 		dp->d_ino = ino;
 		(void) strncpy(dp->d_name, name, st->grd_namlen);
@@ -367,7 +367,7 @@
 	if (st->grd_flags & V_RDDIR_ENTFLAGS)
 		dirent_size = EDIRENT_RECLEN(st->grd_namlen);
 	else
-		dirent_size = DIRENT64_RECLEN(st->grd_namlen);
+		dirent_size = DIRENT_RECLEN(st->grd_namlen);
 	kmem_free(st->grd_dirent, dirent_size);
 	if (error > 0)
 		return (error);
@@ -953,7 +953,7 @@
  *	vp	- directory vnode
  *	dp	- directory entry, sized according to maxlen given to
  *		  gfs_dir_create().  callback must fill in d_name and
- *		  d_ino (if a dirent64_t), or ed_name, ed_ino, and ed_eflags
+ *		  d_ino (if a dirent_t), or ed_name, ed_ino, and ed_eflags
  *		  (if an edirent_t). edirent_t is used if V_RDDIR_ENTFLAGS
  *		  is set in 'flags'.
  *	eofp	- callback must set to 1 when EOF has been reached
--- a/kernel/fs/hsfs/hsfs_vnops.c	Tue Apr 16 23:02:47 2019 +0300
+++ b/kernel/fs/hsfs/hsfs_vnops.c	Tue Apr 16 23:40:03 2019 +0300
@@ -453,7 +453,7 @@
 	struct hsnode	*dhp;
 	struct hsfs	*fsp;
 	struct hs_direntry hd;
-	struct dirent64	*nd;
+	struct dirent	*nd;
 	int		error;
 	uint_t		offset;		/* real offset in directory */
 	uint_t		dirsiz;		/* real size of directory */
@@ -486,10 +486,10 @@
 
 	dname_size = fsp->hsfs_namemax + 1;	/* 1 for the ending NUL */
 	dname = kmem_alloc(dname_size, KM_SLEEP);
-	bufsize = uiop->uio_resid + sizeof (struct dirent64);
+	bufsize = uiop->uio_resid + sizeof (struct dirent);
 
 	outbuf = kmem_alloc(bufsize, KM_SLEEP);
-	nd = (struct dirent64 *)outbuf;
+	nd = (struct dirent *)outbuf;
 
 	while (offset < dirsiz) {
 		bytes_wanted = MIN(MAXBSIZE, dirsiz - (offset & MAXBMASK));
@@ -540,7 +540,7 @@
 				/*
 				 * Determine if there is enough room
 				 */
-				ndlen = (long)DIRENT64_RECLEN((dnamelen));
+				ndlen = (long)DIRENT_RECLEN((dnamelen));
 
 				if ((ndlen + ((char *)nd - outbuf)) >
 				    uiop->uio_resid) {
@@ -575,13 +575,13 @@
 				/* strncpy(9f) will zero uninitialized bytes */
 
 				ASSERT(strlen(dname) + 1 <=
-				    DIRENT64_NAMELEN(ndlen));
+				    DIRENT_NAMELEN(ndlen));
 				(void) strncpy(nd->d_name, dname,
-				    DIRENT64_NAMELEN(ndlen));
+				    DIRENT_NAMELEN(ndlen));
 				nd->d_reclen = (ushort_t)ndlen;
 				nd->d_off = (offset_t)diroff;
 				nd->d_ino = dirino;
-				nd = (struct dirent64 *)((char *)nd + ndlen);
+				nd = (struct dirent *)((char *)nd + ndlen);
 
 				/*
 				 * free up space allocated for symlink
--- a/kernel/fs/lookup.c	Tue Apr 16 23:02:47 2019 +0300
+++ b/kernel/fs/lookup.c	Tue Apr 16 23:40:03 2019 +0300
@@ -787,7 +787,7 @@
  */
 int
 dirfindvp(vnode_t *vrootp, vnode_t *dvp, vnode_t *tvp, cred_t *cr, char *dbuf,
-    size_t dlen, dirent64_t **rdp)
+    size_t dlen, dirent_t **rdp)
 {
 	size_t dbuflen;
 	struct iovec iov;
@@ -795,7 +795,7 @@
 	int error;
 	int eof;
 	vnode_t *cmpvp;
-	struct dirent64 *dp;
+	struct dirent *dp;
 	pathname_t pnp;
 
 	ASSERT(dvp->v_type == VDIR);
@@ -831,14 +831,14 @@
 		if (error || dbuflen == 0)
 			break;
 
-		dp = (dirent64_t *)dbuf;
+		dp = (dirent_t *)dbuf;
 		while ((intptr_t)dp < (intptr_t)dbuf + dbuflen) {
 			/*
 			 * Ignore '.' and '..' entries
 			 */
 			if (strcmp(dp->d_name, ".") == 0 ||
 			    strcmp(dp->d_name, "..") == 0) {
-				dp = (dirent64_t *)((intptr_t)dp +
+				dp = (dirent_t *)((intptr_t)dp +
 				    dp->d_reclen);
 				continue;
 			}
@@ -864,7 +864,7 @@
 				return (error);
 			}
 
-			dp = (dirent64_t *)((intptr_t)dp + dp->d_reclen);
+			dp = (dirent_t *)((intptr_t)dp + dp->d_reclen);
 		}
 	}
 
@@ -1071,9 +1071,9 @@
 	vnode_t		*pvp = NULL, *startvp = vp;
 	int		err = 0;
 	size_t		complen;
-	dirent64_t	*dp;
+	dirent_t	*dp;
 	char		*bufloc, *dbuf;
-	const size_t	dlen = DIRENT64_RECLEN(MAXPATHLEN);
+	const size_t	dlen = DIRENT_RECLEN(MAXPATHLEN);
 	struct dirpath_walk *dw_chain = NULL, *dw_entry;
 
 	/* Operation only allowed on directories */
--- a/kernel/fs/nfs/nfs3_srv.c	Tue Apr 16 23:02:47 2019 +0300
+++ b/kernel/fs/nfs/nfs3_srv.c	Tue Apr 16 23:40:03 2019 +0300
@@ -2853,8 +2853,8 @@
 	 * Make sure that there is room to read at least one entry
 	 * if any are available.
 	 */
-	if (args->count < DIRENT64_RECLEN(MAXNAMELEN))
-		count = DIRENT64_RECLEN(MAXNAMELEN);
+	if (args->count < DIRENT_RECLEN(MAXNAMELEN))
+		count = DIRENT_RECLEN(MAXNAMELEN);
 	else
 		count = args->count;
 
@@ -2911,7 +2911,7 @@
 		 * rounded up to the nearest BYTES_PER_XDR_UNIT.
 		 */
 		if (count != uio.uio_resid) {
-			namlen = strlen(((struct dirent64 *)data)->d_name);
+			namlen = strlen(((struct dirent *)data)->d_name);
 			bufsize += (1 + 2 + 1 + 2) * BYTES_PER_XDR_UNIT +
 			    roundup(namlen, BYTES_PER_XDR_UNIT);
 		}
@@ -3011,7 +3011,7 @@
 #ifdef nextdp
 #undef nextdp
 #endif
-#define	nextdp(dp)	((struct dirent64 *)((char *)(dp) + (dp)->d_reclen))
+#define	nextdp(dp)	((struct dirent *)((char *)(dp) + (dp)->d_reclen))
 
 /*
  * This macro computes the size of a response which contains
@@ -3052,7 +3052,7 @@
 	struct uio uio;
 	char *data;
 	int iseof;
-	struct dirent64 *dp;
+	struct dirent *dp;
 	vnode_t *nvp;
 	struct vattr *nvap;
 	struct vattr nva;
@@ -3109,8 +3109,8 @@
 	 */
 	args->dircount = MIN(args->dircount, args->maxcount);
 
-	if (args->dircount < DIRENT64_RECLEN(MAXNAMELEN))
-		args->dircount = DIRENT64_RECLEN(MAXNAMELEN);
+	if (args->dircount < DIRENT_RECLEN(MAXNAMELEN))
+		args->dircount = DIRENT_RECLEN(MAXNAMELEN);
 
 	/*
 	 * This allocation relies on a minimum directory entry
@@ -3122,7 +3122,7 @@
 
 	space_left = args->dircount;
 	data = kmem_alloc(args->dircount, KM_SLEEP);
-	dp = (struct dirent64 *)data;
+	dp = (struct dirent *)data;
 	uio.uio_iov = &iov;
 	uio.uio_iovcnt = 1;
 	uio.uio_segflg = UIO_SYSSPACE;
@@ -3240,7 +3240,7 @@
 	if (!iseof &&
 	    (args->maxcount - bufsize) >= NFS3_READDIRPLUS_ENTRY(MAXNAMELEN)) {
 		space_left -= (prev_len - uio.uio_resid);
-		if (space_left >= DIRENT64_RECLEN(MAXNAMELEN))
+		if (space_left >= DIRENT_RECLEN(MAXNAMELEN))
 			goto getmoredents;
 
 		/* else, fall through */
@@ -3254,7 +3254,7 @@
 	infop = kmem_alloc(nents * sizeof (struct entryplus3_info), KM_SLEEP);
 	resp->resok.infop = infop;
 
-	dp = (struct dirent64 *)data;
+	dp = (struct dirent *)data;
 	for (i = 0; i < nents; i++) {
 
 		if (dp->d_ino == 0) {
@@ -3308,7 +3308,7 @@
 		if (iseof)
 			iseof = FALSE;
 
-		ret = nfscmd_dropped_entrysize((struct dirent64 *)data,
+		ret = nfscmd_dropped_entrysize((struct dirent *)data,
 		    nents, ret);
 	}
 
--- a/kernel/fs/nfs/nfs3_vnops.c	Tue Apr 16 23:02:47 2019 +0300
+++ b/kernel/fs/nfs/nfs3_vnops.c	Tue Apr 16 23:40:03 2019 +0300
@@ -4066,7 +4066,7 @@
 	rdc->entries = kmem_alloc(rdc->buflen, KM_SLEEP);
 #endif
 
-	res.entries = (dirent64_t *)rdc->entries;
+	res.entries = (dirent_t *)rdc->entries;
 	res.entries_size = rdc->buflen;
 	res.dir_attributes.fres.vap = &dva;
 	res.dir_attributes.fres.vp = vp;
@@ -4176,7 +4176,7 @@
 	rdc->entries = kmem_alloc(rdc->buflen, KM_SLEEP);
 #endif
 
-	res.entries = (dirent64_t *)rdc->entries;
+	res.entries = (dirent_t *)rdc->entries;
 	res.entries_size = rdc->buflen;
 	res.dir_attributes.fres.vap = &dva;
 	res.dir_attributes.fres.vp = vp;
--- a/kernel/fs/nfs/nfs3_xdr.c	Tue Apr 16 23:02:47 2019 +0300
+++ b/kernel/fs/nfs/nfs3_xdr.c	Tue Apr 16 23:40:03 2019 +0300
@@ -2013,7 +2013,7 @@
 #ifdef	nextdp
 #undef	nextdp
 #endif
-#define	nextdp(dp)	((struct dirent64 *)((char *)(dp) + (dp)->d_reclen))
+#define	nextdp(dp)	((struct dirent *)((char *)(dp) + (dp)->d_reclen))
 #ifdef	roundup
 #undef	roundup
 #endif
@@ -2025,7 +2025,7 @@
 static bool_t
 xdr_putdirlist(XDR *xdrs, READDIR3resok *objp)
 {
-	struct dirent64 *dp;
+	struct dirent *dp;
 	char *name;
 	int size;
 	int bufsize;
@@ -2055,7 +2055,7 @@
 	bufsize = (1 + 1 + 2) * BYTES_PER_XDR_UNIT;
 	if (objp->dir_attributes.attributes)
 		bufsize += NFS3_SIZEOF_FATTR3 * BYTES_PER_XDR_UNIT;
-	for (size = objp->size, dp = (struct dirent64 *)objp->reply.entries;
+	for (size = objp->size, dp = (struct dirent *)objp->reply.entries;
 	    size > 0;
 	    size -= dp->d_reclen, dp = nextdp(dp)) {
 		if (dp->d_reclen == 0)
@@ -2144,7 +2144,7 @@
 bool_t
 xdr_READDIR3vres(XDR *xdrs, READDIR3vres *objp)
 {
-	dirent64_t *dp;
+	dirent_t *dp;
 	uint_t entries_size;
 	int outcount = 0;
 
@@ -2207,7 +2207,7 @@
 		 */
 		if (!XDR_GETINT32(xdrs, (int32_t *)&namlen))
 			return (FALSE);
-		this_reclen = DIRENT64_RECLEN(namlen);
+		this_reclen = DIRENT_RECLEN(namlen);
 
 		/*
 		 * If this will overflow buffer, stop decoding
@@ -2222,7 +2222,7 @@
 		if (!xdr_opaque(xdrs, dp->d_name, namlen))
 			return (FALSE);
 		bzero(&dp->d_name[namlen],
-		    DIRENT64_NAMELEN(this_reclen) - namlen);
+		    DIRENT_NAMELEN(this_reclen) - namlen);
 
 		/*
 		 * cookie3 cookie
@@ -2232,7 +2232,7 @@
 		objp->loff = dp->d_off;
 
 		outcount += this_reclen;
-		dp = (dirent64_t *)((intptr_t)dp + this_reclen);
+		dp = (dirent_t *)((intptr_t)dp + this_reclen);
 	}
 
 	objp->size = outcount;
@@ -2287,7 +2287,7 @@
 static bool_t
 xdr_putdirpluslist(XDR *xdrs, READDIRPLUS3resok *objp)
 {
-	struct dirent64 *dp;
+	struct dirent *dp;
 	char *name;
 	int nents;
 	bool_t t = TRUE;
@@ -2299,7 +2299,7 @@
 	if (xdrs->x_op != XDR_ENCODE)
 		return (FALSE);
 
-	dp = (struct dirent64 *)objp->reply.entries;
+	dp = (struct dirent *)objp->reply.entries;
 	nents = objp->size;
 	infop = objp->infop;
 
@@ -2370,12 +2370,12 @@
 }
 
 /*
- * Decode readdirplus directly into a dirent64_t and do the DNLC caching.
+ * Decode readdirplus directly into a dirent_t and do the DNLC caching.
  */
 bool_t
 xdr_READDIRPLUS3vres(XDR *xdrs, READDIRPLUS3vres *objp)
 {
-	dirent64_t *dp;
+	dirent_t *dp;
 	vnode_t *dvp;
 	uint_t entries_size;
 	int outcount = 0;
@@ -2452,7 +2452,7 @@
 		 */
 		if (!XDR_GETINT32(xdrs, (int32_t *)&namlen))
 			return (FALSE);
-		this_reclen = DIRENT64_RECLEN(namlen);
+		this_reclen = DIRENT_RECLEN(namlen);
 
 		/*
 		 * If this will overflow buffer, stop decoding
@@ -2467,7 +2467,7 @@
 		if (!xdr_opaque(xdrs, dp->d_name, namlen))
 			return (FALSE);
 		bzero(&dp->d_name[namlen],
-		    DIRENT64_NAMELEN(this_reclen) - namlen);
+		    DIRENT_NAMELEN(this_reclen) - namlen);
 
 		/*
 		 * cookie3 cookie
@@ -2528,7 +2528,7 @@
 		}
 
 		outcount += this_reclen;
-		dp = (dirent64_t *)((intptr_t)dp + this_reclen);
+		dp = (dirent_t *)((intptr_t)dp + this_reclen);
 	}
 
 	objp->size = outcount;
--- a/kernel/fs/nfs/nfs4_srv.c	Tue Apr 16 23:02:47 2019 +0300
+++ b/kernel/fs/nfs/nfs4_srv.c	Tue Apr 16 23:40:03 2019 +0300
@@ -115,9 +115,9 @@
  *
  * RFS4_MINLEN_RDDIR_BUF: minimum length of buffer server will provide to
  *	fop_readdir.  Its value is the size of the maximum possible dirent
- *	for solaris.  The DIRENT64_RECLEN macro returns	the size of dirent
+ *	for solaris.  The DIRENT_RECLEN macro returns	the size of dirent
  *	required for a given name length.  MAXNAMELEN is the maximum
- *	filename length allowed in Solaris.  The first two DIRENT64_RECLEN()
+ *	filename length allowed in Solaris.  The first two DIRENT_RECLEN()
  *	macros are to allow for . and .. entries -- just a minor tweak to try
  *	and guarantee that buffer we give to fop_readdir will be large enough
  *	to hold ., .., and the largest possible solaris dirent64.
@@ -125,7 +125,7 @@
 #define	RFS4_MINLEN_ENTRY4 36
 #define	RFS4_MINLEN_RDDIR4 (4 + NFS4_VERIFIER_SIZE + 4 + RFS4_MINLEN_ENTRY4 + 4)
 #define	RFS4_MINLEN_RDDIR_BUF \
-	(DIRENT64_RECLEN(1) + DIRENT64_RECLEN(2) + DIRENT64_RECLEN(MAXNAMELEN))
+	(DIRENT_RECLEN(1) + DIRENT_RECLEN(2) + DIRENT_RECLEN(MAXNAMELEN))
 
 /*
  * It would be better to pad to 4 bytes since that's what XDR would do,
@@ -141,7 +141,7 @@
  *
  */
 #define	DIRENT64_TO_DIRCOUNT(dp) \
-	(3 * BYTES_PER_XDR_UNIT + DIRENT64_NAMELEN((dp)->d_reclen))
+	(3 * BYTES_PER_XDR_UNIT + DIRENT_NAMELEN((dp)->d_reclen))
 
 time_t rfs4_start_time;			/* Initialized in rfs4_srvrinit */
 
@@ -468,7 +468,7 @@
 #ifdef	nextdp
 #undef nextdp
 #endif
-#define	nextdp(dp)	((struct dirent64 *)((char *)(dp) + (dp)->d_reclen))
+#define	nextdp(dp)	((struct dirent *)((char *)(dp) + (dp)->d_reclen))
 
 fem_t deleg_rdops = {
 	.name = "deleg_rdops",
--- a/kernel/fs/nfs/nfs4_srv_readdir.c	Tue Apr 16 23:02:47 2019 +0300
+++ b/kernel/fs/nfs/nfs4_srv_readdir.c	Tue Apr 16 23:40:03 2019 +0300
@@ -79,9 +79,9 @@
  *
  * RFS4_MINLEN_RDDIR_BUF: minimum length of buffer server will provide to
  *	fop_readdir.  Its value is the size of the maximum possible dirent
- *	for solaris.  The DIRENT64_RECLEN macro returns	the size of dirent
+ *	for solaris.  The DIRENT_RECLEN macro returns	the size of dirent
  *	required for a given name length.  MAXNAMELEN is the maximum
- *	filename length allowed in Solaris.  The first two DIRENT64_RECLEN()
+ *	filename length allowed in Solaris.  The first two DIRENT_RECLEN()
  *	macros are to allow for . and .. entries -- just a minor tweak to try
  *	and guarantee that buffer we give to fop_readdir will be large enough
  *	to hold ., .., and the largest possible solaris dirent64.
@@ -89,13 +89,13 @@
 #define	RFS4_MINLEN_ENTRY4 36
 #define	RFS4_MINLEN_RDDIR4 (4 + NFS4_VERIFIER_SIZE + 4 + RFS4_MINLEN_ENTRY4 + 4)
 #define	RFS4_MINLEN_RDDIR_BUF \
-	(DIRENT64_RECLEN(1) + DIRENT64_RECLEN(2) + DIRENT64_RECLEN(MAXNAMELEN))
+	(DIRENT_RECLEN(1) + DIRENT_RECLEN(2) + DIRENT_RECLEN(MAXNAMELEN))
 
 
 #ifdef	nextdp
 #undef nextdp
 #endif
-#define	nextdp(dp)	((struct dirent64 *)((char *)(dp) + (dp)->d_reclen))
+#define	nextdp(dp)	((struct dirent *)((char *)(dp) + (dp)->d_reclen))
 
 verifier4	Readdir4verf = 0x0;
 
@@ -375,7 +375,7 @@
 	vnode_t *dvp = cs->vp;
 	vnode_t *vp;
 	vattr_t va;
-	struct dirent64 *dp;
+	struct dirent *dp;
 	rfs4_sb_encode_t dsbe, sbe;
 	int vfs_different;
 	int rddir_data_len, rddir_result_size;
@@ -663,7 +663,7 @@
 
 	lastentry_ptr = ptr;
 	no_space = 0;
-	for (dp = (struct dirent64 *)rddir_data;
+	for (dp = (struct dirent *)rddir_data;
 	    !no_space && rddir_result_size > 0; dp = nextdp(dp)) {
 		bool_t fs_migrated = FALSE;
 
@@ -798,7 +798,7 @@
 		 * However, use the regular DIRENT64 to match most
 		 * client's APIs.
 		 */
-		dircount -= DIRENT64_RECLEN(namelen);
+		dircount -= DIRENT_RECLEN(namelen);
 		if (nents != 0 && dircount < 0) {
 			no_space = TRUE;
 			continue;
--- a/kernel/fs/nfs/nfs4_state.c	Tue Apr 16 23:02:47 2019 +0300
+++ b/kernel/fs/nfs/nfs4_state.c	Tue Apr 16 23:40:03 2019 +0300
@@ -610,7 +610,7 @@
 #ifdef	nextdp
 #undef nextdp
 #endif
-#define	nextdp(dp)	((struct dirent64 *)((char *)(dp) + (dp)->d_reclen))
+#define	nextdp(dp)	((struct dirent *)((char *)(dp) + (dp)->d_reclen))
 
 /*
  * Add entries from statedir to supplied oldstate list.
@@ -626,7 +626,7 @@
 	vnode_t *dvp;
 	struct iovec iov;
 	struct uio uio;
-	struct dirent64 *dep;
+	struct dirent *dep;
 	offset_t dirchunk_offset = 0;
 
 	/*
@@ -664,7 +664,7 @@
 		 * Process all the directory entries in this
 		 * readdir chunk
 		 */
-		for (dep = (struct dirent64 *)dirt; size > 0;
+		for (dep = (struct dirent *)dirt; size > 0;
 		    dep = nextdp(dep)) {
 
 			size -= dep->d_reclen;
--- a/kernel/fs/nfs/nfs4_vnops.c	Tue Apr 16 23:02:47 2019 +0300
+++ b/kernel/fs/nfs/nfs4_vnops.c	Tue Apr 16 23:40:03 2019 +0300
@@ -9279,7 +9279,7 @@
 	 * If count < than the minimum required, we return no entries
 	 * and fail with EINVAL
 	 */
-	if (rargs->dircount < (DIRENT64_RECLEN(1) + DIRENT64_RECLEN(2))) {
+	if (rargs->dircount < (DIRENT_RECLEN(1) + DIRENT_RECLEN(2))) {
 		rdc->error = EINVAL;
 		goto out;
 	}
--- a/kernel/fs/nfs/nfs4_xdr.c	Tue Apr 16 23:02:47 2019 +0300
+++ b/kernel/fs/nfs/nfs4_xdr.c	Tue Apr 16 23:40:03 2019 +0300
@@ -2090,32 +2090,32 @@
 /*
  * Create the "." or ".." and pad the buffer once so they are
  * copied out as required into the user supplied buffer everytime.
- * DIRENT64_RECLEN(sizeof (".") - 1) = DIRENT64_RECLEN(1)
- * DIRENT64_RECLEN(sizeof ("..") - 1) = DIRENT64_RECLEN(2)
+ * DIRENT_RECLEN(sizeof (".") - 1) = DIRENT_RECLEN(1)
+ * DIRENT_RECLEN(sizeof ("..") - 1) = DIRENT_RECLEN(2)
  */
 void
 nfs4_init_dot_entries()
 {
-	struct dirent64 *odp;
+	struct dirent *odp;
 
 	/*
 	 * zalloc it so it zeros the buffer out. Need
 	 * to just do it once.
 	 */
-	nfs4_dot_entries = kmem_zalloc(DIRENT64_RECLEN(1) + DIRENT64_RECLEN(2),
+	nfs4_dot_entries = kmem_zalloc(DIRENT_RECLEN(1) + DIRENT_RECLEN(2),
 	    KM_SLEEP);
 
-	odp = (struct dirent64 *)nfs4_dot_entries;
+	odp = (struct dirent *)nfs4_dot_entries;
 	odp->d_off = 1; /* magic cookie for "." entry */
-	odp->d_reclen = DIRENT64_RECLEN(1);
+	odp->d_reclen = DIRENT_RECLEN(1);
 	odp->d_name[0] = '.';
 	odp->d_name[1] = '\0';
 
-	nfs4_dot_dot_entry = nfs4_dot_entries + DIRENT64_RECLEN(1);
-	odp = (struct dirent64 *)nfs4_dot_dot_entry;
+	nfs4_dot_dot_entry = nfs4_dot_entries + DIRENT_RECLEN(1);
+	odp = (struct dirent *)nfs4_dot_dot_entry;
 
 	odp->d_off = 2;
-	odp->d_reclen = DIRENT64_RECLEN(2);
+	odp->d_reclen = DIRENT_RECLEN(2);
 	odp->d_name[0] = '.';
 	odp->d_name[1] = '.';
 	odp->d_name[2] = '\0';
@@ -2125,8 +2125,8 @@
 nfs4_destroy_dot_entries()
 {
 	if (nfs4_dot_entries)
-		kmem_free(nfs4_dot_entries, DIRENT64_RECLEN(1) +
-		    DIRENT64_RECLEN(2));
+		kmem_free(nfs4_dot_entries, DIRENT_RECLEN(1) +
+		    DIRENT_RECLEN(2));
 
 	nfs4_dot_entries = nfs4_dot_dot_entry = NULL;
 }
@@ -2136,7 +2136,7 @@
 {
 	bool_t more_data;
 	rddir4_cache *rdc = aobjp->rdc;
-	dirent64_t *dp = NULL;
+	dirent_t *dp = NULL;
 	int entry_length = 0;
 	int space_left = 0;
 	bitmap4 resbmap;
@@ -2169,7 +2169,7 @@
 	/* READDIR4res_clnt_free needs to kmem_free this buffer */
 	rdc->entries = kmem_alloc(aobjp->dircount, KM_SLEEP);
 
-	dp = (dirent64_t *)rdc->entries;
+	dp = (dirent_t *)rdc->entries;
 	rdc->entlen = rdc->buflen = space_left = aobjp->dircount;
 
 	/* Fill in dot and dot-dot if needed */
@@ -2178,23 +2178,23 @@
 
 		if (rdc->nfs4_cookie == (nfs_cookie4)0) {
 			bcopy(nfs4_dot_entries, rdc->entries,
-			    DIRENT64_RECLEN(1) + DIRENT64_RECLEN(2));
+			    DIRENT_RECLEN(1) + DIRENT_RECLEN(2));
 			objp->dotp = dp;
-			dp = (struct dirent64 *)(((char *)dp) +
-			    DIRENT64_RECLEN(1));
+			dp = (struct dirent *)(((char *)dp) +
+			    DIRENT_RECLEN(1));
 			objp->dotdotp = dp;
-			dp = (struct dirent64 *)(((char *)dp) +
-			    DIRENT64_RECLEN(2));
-			space_left -= DIRENT64_RECLEN(1) + DIRENT64_RECLEN(2);
+			dp = (struct dirent *)(((char *)dp) +
+			    DIRENT_RECLEN(2));
+			space_left -= DIRENT_RECLEN(1) + DIRENT_RECLEN(2);
 
 		} else	{	/* for ".." entry */
 			bcopy(nfs4_dot_dot_entry, rdc->entries,
-			    DIRENT64_RECLEN(2));
+			    DIRENT_RECLEN(2));
 			objp->dotp = NULL;
 			objp->dotdotp = dp;
-			dp = (struct dirent64 *)(((char *)dp) +
-			    DIRENT64_RECLEN(2));
-			space_left -= DIRENT64_RECLEN(2);
+			dp = (struct dirent *)(((char *)dp) +
+			    DIRENT_RECLEN(2));
+			space_left -= DIRENT_RECLEN(2);
 		}
 		/* Magic NFSv4 number for entry after start */
 		last_cookie = 2;
@@ -2236,7 +2236,7 @@
 			 * the rest of the response as "skip" and
 			 * decode or skip the remaining data
 			 */
-			entry_length = DIRENT64_RECLEN(namelen);
+			entry_length = DIRENT_RECLEN(namelen);
 			if (space_left < entry_length)
 				skip_to_end = 1;
 		}
@@ -2246,7 +2246,7 @@
 			if (!xdr_opaque(xdrs, dp->d_name, namelen))
 				goto noentries;
 			bzero(&dp->d_name[namelen],
-			    DIRENT64_NAMELEN(entry_length) - namelen);
+			    DIRENT_NAMELEN(entry_length) - namelen);
 			dp->d_off = last_cookie = cookie;
 			dp->d_reclen = entry_length;
 		} else {
@@ -2313,7 +2313,7 @@
 				VN_RELE(vp);
 			}
 
-			dp = (struct dirent64 *)(((caddr_t)dp) + dp->d_reclen);
+			dp = (struct dirent *)(((caddr_t)dp) + dp->d_reclen);
 
 			space_left -= entry_length;
 
--- a/kernel/fs/nfs/nfs_cmd.c	Tue Apr 16 23:02:47 2019 +0300
+++ b/kernel/fs/nfs/nfs_cmd.c	Tue Apr 16 23:40:03 2019 +0300
@@ -43,7 +43,7 @@
 #ifdef nextdp
 #undef nextdp
 #endif
-#define	nextdp(dp)	((struct dirent64 *)((char *)(dp) + (dp)->d_reclen))
+#define	nextdp(dp)	((struct dirent *)((char *)(dp) + (dp)->d_reclen))
 
 kmutex_t	nfscmd_lock;
 door_handle_t   nfscmd_dh;
@@ -382,12 +382,12 @@
 
 	newdata = kmem_zalloc(size, KM_SLEEP);
 
-	nsize = strlen(((struct dirent64 *)data)->d_name);
+	nsize = strlen(((struct dirent *)data)->d_name);
 	count = size;
-	bcopy(data, newdata, sizeof (struct dirent64));
+	bcopy(data, newdata, sizeof (struct dirent));
 
-	iname = ((struct dirent64 *)data)->d_name;
-	oname = ((struct dirent64 *)newdata)->d_name;
+	iname = ((struct dirent *)data)->d_name;
+	oname = ((struct dirent *)newdata)->d_name;
 
 	ret = kiconv(charset->outbound, &iname, &nsize, &oname, &count, &err);
 	if (ret == (size_t)-1) {
@@ -400,9 +400,9 @@
 			newdata = data;
 		}
 	} else {
-		ret = strlen(((struct dirent64 *)newdata)->d_name);
-		((struct dirent64 *)newdata)->d_reclen =
-		    DIRENT64_RECLEN(ret + 1);
+		ret = strlen(((struct dirent *)newdata)->d_name);
+		((struct dirent *)newdata)->d_reclen =
+		    DIRENT_RECLEN(ret + 1);
 	}
 	return (newdata);
 }
@@ -419,8 +419,8 @@
 {
 	char *newdata;
 	size_t nsize;
-	struct dirent64 *dp;
-	struct dirent64 *ndp;
+	struct dirent *dp;
+	struct dirent *ndp;
 	size_t i;
 	size_t ret;
 	char *iname;
@@ -440,8 +440,8 @@
 	newdata = kmem_zalloc(maxsize, KM_SLEEP);
 	nsize = 0;
 
-	dp = (struct dirent64 *)data;
-	ndp = (struct dirent64 *)newdata;
+	dp = (struct dirent *)data;
+	ndp = (struct dirent *)newdata;
 
 	for (skipped = 0, i = 0; i < nents; i++) {
 		/*
@@ -476,7 +476,7 @@
 		 * What to do with other errors?
 		 * For now, we return the unconverted string.
 		 */
-		ndp->d_reclen = DIRENT64_RECLEN(strlen(ndp->d_name) + 1);
+		ndp->d_reclen = DIRENT_RECLEN(strlen(ndp->d_name) + 1);
 		nsize += ndp->d_reclen;
 		dp = nextdp(dp);
 		ndp = nextdp(ndp);
@@ -495,7 +495,7 @@
 size_t
 nfscmd_countents(char *data, size_t len)
 {
-	struct dirent64 *dp = (struct dirent64 *)data;
+	struct dirent *dp = (struct dirent *)data;
 	size_t curlen;
 	size_t reclen;
 	size_t nents;
@@ -515,7 +515,7 @@
  */
 
 size_t
-nfscmd_dropped_entrysize(struct dirent64 *dir, size_t drop, size_t nents)
+nfscmd_dropped_entrysize(struct dirent *dir, size_t drop, size_t nents)
 {
 	size_t size;
 	size_t i;
--- a/kernel/fs/nfs/nfs_log_xdr.c	Tue Apr 16 23:02:47 2019 +0300
+++ b/kernel/fs/nfs/nfs_log_xdr.c	Tue Apr 16 23:40:03 2019 +0300
@@ -797,19 +797,19 @@
 #ifdef	nextdp
 #undef	nextdp
 #endif
-#define	nextdp(dp)	((struct dirent64 *)((char *)(dp) + (dp)->d_reclen))
+#define	nextdp(dp)	((struct dirent *)((char *)(dp) + (dp)->d_reclen))
 
 bool_t
 xdr_nfslog_READDIRPLUS3resok(XDR *xdrs, READDIRPLUS3resok *objp)
 {
 	bool_t t = TRUE;
 	bool_t f = FALSE;
-	struct dirent64 *dp;
+	struct dirent *dp;
 	int nents;
 	char *name;
 	entryplus3_info *infop;
 
-	dp = (struct dirent64 *)objp->reply.entries;
+	dp = (struct dirent *)objp->reply.entries;
 	nents = objp->size;
 	infop = objp->infop;
 	while (nents > 0) {
--- a/kernel/fs/nfs/nfs_srv.c	Tue Apr 16 23:02:47 2019 +0300
+++ b/kernel/fs/nfs/nfs_srv.c	Tue Apr 16 23:40:03 2019 +0300
@@ -2605,7 +2605,7 @@
 		if (rd->rd_eof)
 			rd->rd_eof = FALSE;
 		dropbytes = nfscmd_dropped_entrysize(
-		    (struct dirent64 *)rd->rd_entries, nents, ret);
+		    (struct dirent *)rd->rd_entries, nents, ret);
 		rd->rd_size -= dropbytes;
 	}
 	if (ndata == NULL) {
--- a/kernel/fs/nfs/nfs_subr.c	Tue Apr 16 23:02:47 2019 +0300
+++ b/kernel/fs/nfs/nfs_subr.c	Tue Apr 16 23:40:03 2019 +0300
@@ -5102,7 +5102,7 @@
 	struct uio uio;
 	struct iovec iov;
 	char *dbuf;
-	struct dirent64 *dp;
+	struct dirent *dp;
 	size_t dlen = 8 * 1024;
 	size_t dbuflen;
 	int eof = 0;
@@ -5130,14 +5130,14 @@
 		return (error);
 	}
 
-	dp = (dirent64_t *)dbuf;
+	dp = (dirent_t *)dbuf;
 
 	while ((intptr_t)dp < (intptr_t)dbuf + dbuflen) {
 		if (strcmp(dp->d_name, ".") == 0 ||
 		    strcmp(dp->d_name, "..") == 0 || strcmp(dp->d_name,
 		    VIEW_READWRITE) == 0 || strcmp(dp->d_name,
 		    VIEW_READONLY) == 0) {
-			dp = (dirent64_t *)((intptr_t)dp + dp->d_reclen);
+			dp = (dirent_t *)((intptr_t)dp + dp->d_reclen);
 			continue;
 		}
 
--- a/kernel/fs/nfs/nfs_xdr.c	Tue Apr 16 23:02:47 2019 +0300
+++ b/kernel/fs/nfs/nfs_xdr.c	Tue Apr 16 23:40:03 2019 +0300
@@ -759,7 +759,7 @@
 #ifdef nextdp
 #undef	nextdp
 #endif
-#define	nextdp(dp)	((struct dirent64 *)((char *)(dp) + (dp)->d_reclen))
+#define	nextdp(dp)	((struct dirent *)((char *)(dp) + (dp)->d_reclen))
 #ifdef roundup
 #undef	roundup
 #endif
@@ -771,7 +771,7 @@
 bool_t
 xdr_putrddirres(XDR *xdrs, struct nfsrddirres *rd)
 {
-	struct dirent64 *dp;
+	struct dirent *dp;
 	char *name;
 	int size;
 	uint_t namlen;
@@ -831,7 +831,7 @@
 bool_t
 xdr_getrddirres(XDR *xdrs, struct nfsrddirres *rd)
 {
-	struct dirent64 *dp;
+	struct dirent *dp;
 	uint_t namlen;
 	int size;
 	bool_t valid;
@@ -857,7 +857,7 @@
 		if (!xdr_u_int(xdrs, &fileid) ||
 		    !xdr_u_int(xdrs, &namlen))
 			return (FALSE);
-		this_reclen = DIRENT64_RECLEN(namlen);
+		this_reclen = DIRENT_RECLEN(namlen);
 		if (this_reclen > size) {
 			rd->rd_eof = FALSE;
 			goto bufovflw;
@@ -867,7 +867,7 @@
 			return (FALSE);
 		}
 		bzero(&dp->d_name[namlen],
-		    DIRENT64_NAMELEN(this_reclen) - namlen);
+		    DIRENT_NAMELEN(this_reclen) - namlen);
 		dp->d_ino = (ino64_t)fileid;
 		dp->d_reclen = this_reclen;
 		dp->d_off = (off64_t)offset;
--- a/kernel/fs/objfs/objfs_root.c	Tue Apr 16 23:02:47 2019 +0300
+++ b/kernel/fs/objfs/objfs_root.c	Tue Apr 16 23:40:03 2019 +0300
@@ -112,7 +112,7 @@
 {
 	struct modctl **mpp = data;
 	struct modctl *mp = *mpp;
-	struct dirent64 *odp = dp;
+	struct dirent *odp = dp;
 
 	ASSERT(!(flags & V_RDDIR_ENTFLAGS));
 
--- a/kernel/fs/pcfs/pc_vnops.c	Tue Apr 16 23:02:47 2019 +0300
+++ b/kernel/fs/pcfs/pc_vnops.c	Tue Apr 16 23:40:03 2019 +0300
@@ -1345,7 +1345,7 @@
 		 */
 		if (offset == 0) {
 			(void) strcpy(ld->d_name, ".");
-			ld->d_reclen = DIRENT64_RECLEN(1);
+			ld->d_reclen = DIRENT_RECLEN(1);
 			ld->d_off = (off64_t)sizeof (struct pcdir);
 			ld->d_ino = (ino64_t)UINT_MAX;
 			if (ld->d_reclen > uiop->uio_resid) {
@@ -1358,7 +1358,7 @@
 		}
 		if (offset == sizeof (struct pcdir)) {
 			(void) strcpy(ld->d_name, "..");
-			ld->d_reclen = DIRENT64_RECLEN(2);
+			ld->d_reclen = DIRENT_RECLEN(2);
 			if (ld->d_reclen > uiop->uio_resid) {
 				pc_unlockfs(fsp);
 				return (ENOSPC);
@@ -2329,7 +2329,7 @@
 
 	ep = *epp;
 	uiop->uio_loffset += *offset - oldoffset;
-	ld->d_reclen = DIRENT64_RECLEN(strlen(ld->d_name));
+	ld->d_reclen = DIRENT_RECLEN(strlen(ld->d_name));
 	if (ld->d_reclen > uiop->uio_resid) {
 		uiop->uio_loffset = uiooffset;
 		return (ENOSPC);
@@ -2374,7 +2374,7 @@
 	error = pc_fname_ext_to_name(&ld->d_name[0], &ep->pcd_filename[0],
 	    &ep->pcd_ext[0], foldcase);
 	if (error == 0) {
-		ld->d_reclen = DIRENT64_RECLEN(strlen(ld->d_name));
+		ld->d_reclen = DIRENT_RECLEN(strlen(ld->d_name));
 		if (ld->d_reclen > uiop->uio_resid) {
 			uiop->uio_loffset = oldoffset;
 			return (ENOSPC);
--- a/kernel/fs/proc/prvnops.c	Tue Apr 16 23:02:47 2019 +0300
+++ b/kernel/fs/proc/prvnops.c	Tue Apr 16 23:40:03 2019 +0300
@@ -5130,8 +5130,8 @@
 static int
 pr_readdir_pathdir(prnode_t *pnp, uio_t *uiop, int *eofp)
 {
-	longlong_t bp[DIRENT64_RECLEN(64) / sizeof (longlong_t)];
-	dirent64_t *dirent = (dirent64_t *)bp;
+	longlong_t bp[DIRENT_RECLEN(64) / sizeof (longlong_t)];
+	dirent_t *dirent = (dirent_t *)bp;
 	int reclen;
 	ssize_t oresid;
 	offset_t off, idx;
@@ -5191,21 +5191,21 @@
 			dirent->d_ino = pmkino(0, pslot, PR_PATHDIR);
 			dirent->d_name[0] = '.';
 			dirent->d_name[1] = '\0';
-			reclen = DIRENT64_RECLEN(1);
+			reclen = DIRENT_RECLEN(1);
 		} else if (idx == 1) {			/* ".." */
 			dirent->d_ino = pmkino(0, pslot, PR_PIDDIR);
 			dirent->d_name[0] = '.';
 			dirent->d_name[1] = '.';
 			dirent->d_name[2] = '\0';
-			reclen = DIRENT64_RECLEN(2);
+			reclen = DIRENT_RECLEN(2);
 		} else if (idx == 2) {			/* "root" */
 			dirent->d_ino = pmkino(idx, pslot, PR_PATH);
 			(void) strcpy(dirent->d_name, "root");
-			reclen = DIRENT64_RECLEN(4);
+			reclen = DIRENT_RECLEN(4);
 		} else if (idx == 3) {			/* "cwd" */
 			dirent->d_ino = pmkino(idx, pslot, PR_PATH);
 			(void) strcpy(dirent->d_name, "cwd");
-			reclen = DIRENT64_RECLEN(3);
+			reclen = DIRENT_RECLEN(3);
 		} else if (idx < 4 + fddirsize) {
 			/*
 			 * In this case, we have one of the file descriptors.
@@ -5215,7 +5215,7 @@
 				continue;
 			dirent->d_ino = pmkino(idx, pslot, PR_PATH);
 			(void) pr_u32tos(fd, dirent->d_name, PLNSIZ+1);
-			reclen = DIRENT64_RECLEN(PLNSIZ);
+			reclen = DIRENT_RECLEN(PLNSIZ);
 		} else if (idx < 4 + fddirsize + objdirsize) {
 			if (fip != NULL) {
 				mutex_exit(&fip->fi_lock);
@@ -5249,7 +5249,7 @@
 			else
 				pr_object_name(dirent->d_name, vp, &vattr);
 			dirent->d_ino = pmkino(idx, pslot, PR_PATH);
-			reclen = DIRENT64_RECLEN(strlen(dirent->d_name));
+			reclen = DIRENT_RECLEN(strlen(dirent->d_name));
 		} else {
 			break;
 		}
@@ -5564,8 +5564,8 @@
 	vnode_t *vp, *execvp, *vrootp;
 	int ret;
 	size_t len;
-	dirent64_t *dp;
-	size_t dlen = DIRENT64_RECLEN(MAXPATHLEN);
+	dirent_t *dp;
+	size_t dlen = DIRENT_RECLEN(MAXPATHLEN);
 	char *dbuf;
 
 	p = curproc;
--- a/kernel/fs/tmpfs/tmp_vnops.c	Tue Apr 16 23:02:47 2019 +0300
+++ b/kernel/fs/tmpfs/tmp_vnops.c	Tue Apr 16 23:40:03 2019 +0300
@@ -1460,7 +1460,7 @@
 	struct tdirent *tdp;
 	int error = 0;
 	size_t namelen;
-	struct dirent64 *dp;
+	struct dirent *dp;
 	ulong_t offset;
 	ulong_t total_bytes_wanted;
 	long outcount = 0;
@@ -1501,10 +1501,10 @@
 	 * Get space for multiple directory entries
 	 */
 	total_bytes_wanted = uiop->uio_iov->iov_len;
-	bufsize = total_bytes_wanted + sizeof (struct dirent64);
+	bufsize = total_bytes_wanted + sizeof (struct dirent);
 	outbuf = kmem_alloc(bufsize, KM_SLEEP);
 
-	dp = (struct dirent64 *)outbuf;
+	dp = (struct dirent *)outbuf;
 
 
 	offset = 0;
@@ -1513,7 +1513,7 @@
 		namelen = strlen(tdp->td_name);	/* no +1 needed */
 		offset = tdp->td_offset;
 		if (offset >= uiop->uio_offset) {
-			reclen = (int)DIRENT64_RECLEN(namelen);
+			reclen = (int)DIRENT_RECLEN(namelen);
 			if (outcount + reclen > total_bytes_wanted) {
 				if (!outcount)
 					/*
@@ -1527,11 +1527,11 @@
 			/* use strncpy(9f) to zero out uninitialized bytes */
 
 			(void) strncpy(dp->d_name, tdp->td_name,
-			    DIRENT64_NAMELEN(reclen));
+			    DIRENT_NAMELEN(reclen));
 			dp->d_reclen = (ushort_t)reclen;
 			dp->d_ino = (ino64_t)tdp->td_tmpnode->tn_nodeid;
 			dp->d_off = (offset_t)tdp->td_offset + 1;
-			dp = (struct dirent64 *)
+			dp = (struct dirent *)
 			    ((uintptr_t)dp + dp->d_reclen);
 			outcount += reclen;
 			ASSERT(outcount <= bufsize);
--- a/kernel/fs/udfs/udf_vnops.c	Tue Apr 16 23:02:47 2019 +0300
+++ b/kernel/fs/udfs/udf_vnops.c	Tue Apr 16 23:40:03 2019 +0300
@@ -1109,7 +1109,7 @@
 	int flags)
 {
 	struct ud_inode *ip;
-	struct dirent64 *nd;
+	struct dirent *nd;
 	struct udf_vfs *udf_vfsp;
 	int32_t error = 0, len, outcount = 0;
 	uint32_t dirsiz, offset;
@@ -1148,13 +1148,13 @@
 
 	outb = outbuf = kmem_alloc((uint32_t)bufsize, KM_SLEEP);
 	end_outb = outb + bufsize;
-	nd = (struct dirent64 *)outbuf;
+	nd = (struct dirent *)outbuf;
 
 	dname = kmem_zalloc(1024, KM_SLEEP);
 	buf = kmem_zalloc(udf_vfsp->udf_lbsize, KM_SLEEP);
 
 	if (offset == 0) {
-		len = DIRENT64_RECLEN(1);
+		len = DIRENT_RECLEN(1);
 		if (((caddr_t)nd + len) >= end_outb) {
 			error = EINVAL;
 			goto end;
@@ -1163,8 +1163,8 @@
 		nd->d_reclen = (uint16_t)len;
 		nd->d_off = 0x10;
 		nd->d_name[0] = '.';
-		bzero(&nd->d_name[1], DIRENT64_NAMELEN(len) - 1);
-		nd = (struct dirent64 *)((char *)nd + nd->d_reclen);
+		bzero(&nd->d_name[1], DIRENT_NAMELEN(len) - 1);
+		nd = (struct dirent *)((char *)nd + nd->d_reclen);
 		outcount++;
 	} else if (offset == 0x10) {
 		offset = 0;
@@ -1180,7 +1180,7 @@
 		if ((fid->fid_flags & FID_DELETED) == 0) {
 			if (fid->fid_flags & FID_PARENT) {
 
-				len = DIRENT64_RECLEN(2);
+				len = DIRENT_RECLEN(2);
 				if (((caddr_t)nd + len) >= end_outb) {
 					error = EINVAL;
 					break;
@@ -1192,8 +1192,8 @@
 				nd->d_name[0] = '.';
 				nd->d_name[1] = '.';
 				bzero(&nd->d_name[2],
-				    DIRENT64_NAMELEN(len) - 2);
-				nd = (struct dirent64 *)
+				    DIRENT_NAMELEN(len) - 2);
+				nd = (struct dirent *)
 				    ((char *)nd + nd->d_reclen);
 			} else {
 				if ((error = ud_uncompress(fid->fid_idlen,
@@ -1204,7 +1204,7 @@
 					offset += FID_LEN(fid);
 					continue;
 				}
-				len = DIRENT64_RECLEN(length);
+				len = DIRENT_RECLEN(length);
 				if (((caddr_t)nd + len) >= end_outb) {
 					if (!outcount) {
 						error = EINVAL;
@@ -1214,14 +1214,14 @@
 				(void) strncpy(nd->d_name,
 				    (caddr_t)dname, length);
 				bzero(&nd->d_name[length],
-				    DIRENT64_NAMELEN(len) - length);
+				    DIRENT_NAMELEN(len) - length);
 				nd->d_ino = ud_xlate_to_daddr(udf_vfsp,
 				    SWAP_16(fid->fid_icb.lad_ext_prn),
 				    SWAP_32(fid->fid_icb.lad_ext_loc), 1,
 				    &dummy);
 				nd->d_reclen = (uint16_t)len;
 				nd->d_off = offset + FID_LEN(fid);
-				nd = (struct dirent64 *)
+				nd = (struct dirent *)
 				    ((char *)nd + nd->d_reclen);
 			}
 			outcount++;
--- a/kernel/fs/ufs/ufs_vnops.c	Tue Apr 16 23:02:47 2019 +0300
+++ b/kernel/fs/ufs/ufs_vnops.c	Tue Apr 16 23:40:03 2019 +0300
@@ -3895,7 +3895,7 @@
 	struct iovec *iovp;
 	struct inode *ip;
 	struct direct *idp;
-	struct dirent64 *odp;
+	struct dirent *odp;
 	struct fbuf *fbp;
 	struct ufsvfs *ufsvfsp;
 	struct ulockfs *ulp;
@@ -3962,10 +3962,10 @@
 	if (uiop->uio_segflg != UIO_SYSSPACE || uiop->uio_iovcnt != 1) {
 		bufsize = total_bytes_wanted;
 		outbuf = kmem_alloc(bufsize, KM_SLEEP);
-		odp = (struct dirent64 *)outbuf;
+		odp = (struct dirent *)outbuf;
 	} else {
 		bufsize = total_bytes_wanted;
-		odp = (struct dirent64 *)iovp->iov_base;
+		odp = (struct dirent *)iovp->iov_base;
 	}
 
 nextblk:
@@ -4017,7 +4017,7 @@
 		/* Skip to requested offset and skip empty entries */
 		if (idp->d_ino != 0 && offset >= (uint_t)uiop->uio_offset) {
 			ushort_t this_reclen =
-			    DIRENT64_RECLEN(idp->d_namlen);
+			    DIRENT_RECLEN(idp->d_namlen);
 			/* Buffer too small for any entries */
 			if (!outcount && this_reclen > bufsize) {
 				fbrelse(fbp, S_OTHER);
@@ -4036,11 +4036,11 @@
 			/* use strncpy(9f) to zero out uninitialized bytes */
 
 			ASSERT(strlen(idp->d_name) + 1 <=
-			    DIRENT64_NAMELEN(this_reclen));
+			    DIRENT_NAMELEN(this_reclen));
 			(void) strncpy(odp->d_name, idp->d_name,
-			    DIRENT64_NAMELEN(this_reclen));
+			    DIRENT_NAMELEN(this_reclen));
 			outcount += odp->d_reclen;
-			odp = (struct dirent64 *)
+			odp = (struct dirent *)
 			    ((intptr_t)odp + odp->d_reclen);
 			ASSERT(outcount <= bufsize);
 		}
--- a/kernel/fs/zfs/zfs_ctldir.c	Tue Apr 16 23:02:47 2019 +0300
+++ b/kernel/fs/zfs/zfs_ctldir.c	Tue Apr 16 23:40:03 2019 +0300
@@ -976,7 +976,7 @@
 		eodp->ed_ino = ZFSCTL_INO_SNAP(id);
 		eodp->ed_eflags = case_conflict ? ED_CASE_CONFLICT : 0;
 	} else {
-		struct dirent64 *odp = dp;
+		struct dirent *odp = dp;
 
 		(void) strcpy(odp->d_name, snapname);
 		odp->d_ino = ZFSCTL_INO_SNAP(id);
--- a/kernel/fs/zfs/zfs_vnops.c	Tue Apr 16 23:02:47 2019 +0300
+++ b/kernel/fs/zfs/zfs_vnops.c	Tue Apr 16 23:40:03 2019 +0300
@@ -2206,7 +2206,7 @@
 	znode_t		*zp = VTOZ(vp);
 	iovec_t		*iovp;
 	edirent_t	*eodp;
-	dirent64_t	*odp;
+	dirent_t	*odp;
 	zfsvfs_t	*zfsvfs = zp->z_zfsvfs;
 	objset_t	*os;
 	caddr_t		outbuf;
@@ -2282,11 +2282,11 @@
 	if (uio->uio_segflg != UIO_SYSSPACE || uio->uio_iovcnt != 1) {
 		bufsize = bytes_wanted;
 		outbuf = kmem_alloc(bufsize, KM_SLEEP);
-		odp = (struct dirent64 *)outbuf;
+		odp = (struct dirent *)outbuf;
 	} else {
 		bufsize = bytes_wanted;
 		outbuf = NULL;
-		odp = (struct dirent64 *)iovp->iov_base;
+		odp = (struct dirent *)iovp->iov_base;
 	}
 	eodp = (struct edirent *)odp;
 
@@ -2375,7 +2375,7 @@
 		if (flags & V_RDDIR_ENTFLAGS)
 			reclen = EDIRENT_RECLEN(strlen(zap.za_name));
 		else
-			reclen = DIRENT64_RECLEN(strlen(zap.za_name));
+			reclen = DIRENT_RECLEN(strlen(zap.za_name));
 
 		/*
 		 * Will this entry fit in the buffer?
@@ -2412,8 +2412,8 @@
 			/* NOTE: d_off is the offset for the *next* entry */
 			next = &(odp->d_off);
 			(void) strncpy(odp->d_name, zap.za_name,
-			    DIRENT64_NAMELEN(reclen));
-			odp = (dirent64_t *)((intptr_t)odp + reclen);
+			    DIRENT_NAMELEN(reclen));
+			odp = (dirent_t *)((intptr_t)odp + reclen);
 		}
 		outcount += reclen;
 
--- a/kernel/syscall/getdents.c	Tue Apr 16 23:02:47 2019 +0300
+++ b/kernel/syscall/getdents.c	Tue Apr 16 23:40:03 2019 +0300
@@ -59,7 +59,7 @@
 	register int error;
 	int sink;
 
-	if (count < sizeof (struct dirent64))
+	if (count < sizeof (struct dirent))
 		return (set_errno(EINVAL));
 
 	/*
--- a/usr/src/cmd/ctstat/ctstat.c	Tue Apr 16 23:02:47 2019 +0300
+++ b/usr/src/cmd/ctstat/ctstat.c	Tue Apr 16 23:40:03 2019 +0300
@@ -620,7 +620,7 @@
 scan_type(int typeno)
 {
 	DIR *dir;
-	struct dirent64 *de;
+	struct dirent *de;
 	char path[PATH_MAX];
 
 	verbout_t *vo = cttypes[typeno].verbout;
@@ -666,7 +666,7 @@
 scan_all(int *types, int ntypes, ctid_t *ids, int nids)
 {
 	DIR *dir;
-	struct dirent64 *de;
+	struct dirent *de;
 	const char *path = CTFS_ROOT "/all";
 	int key, test;
 
--- a/usr/src/cmd/diff/diff.c	Tue Apr 16 23:02:47 2019 +0300
+++ b/usr/src/cmd/diff/diff.c	Tue Apr 16 23:40:03 2019 +0300
@@ -1400,7 +1400,7 @@
 setupdir(char *cp)
 {
 	struct dir *dp = 0, *ep;
-	struct dirent64 *rp;
+	struct dirent *rp;
 	int nitems;
 	int size;
 	DIR *dirp;
--- a/usr/src/cmd/fs.d/autofs/autod_readdir.c	Tue Apr 16 23:02:47 2019 +0300
+++ b/usr/src/cmd/fs.d/autofs/autod_readdir.c	Tue Apr 16 23:40:03 2019 +0300
@@ -213,8 +213,8 @@
 }
 
 #define	roundtoint(x)	(((x) + sizeof (int) - 1) & ~(sizeof (int) - 1))
-#define	DIRENT64_RECLEN(namelen)	\
-	(((int)(((dirent64_t *)0)->d_name) + 1 + (namelen) + 7) & ~ 7)
+#define	DIRENT_RECLEN(namelen)	\
+	(((int)(((dirent_t *)0)->d_name) + 1 + (namelen) + 7) & ~ 7)
 
 static int
 create_dirents(
@@ -228,7 +228,7 @@
 	int outcount = 0;
 	int namelen;
 	struct dir_entry *list = NULL, *l, *nl;
-	struct dirent64 *dp;
+	struct dirent *dp;
 	char *outbuf;
 	struct off_tbl *offtp, *next = NULL;
 	int this_bucket = 0;
@@ -270,7 +270,7 @@
 		trace_prt(1, "%s: offset searches (%d, %d)\n", rdcp->map, x, y);
 
 	total_bytes_wanted = res->rd_bufsize;
-	bufsize = total_bytes_wanted + sizeof (struct dirent64);
+	bufsize = total_bytes_wanted + sizeof (struct dirent);
 	outbuf = malloc(bufsize);
 	if (outbuf == NULL) {
 		syslog(LOG_ERR, "memory allocation error\n");
@@ -279,12 +279,12 @@
 	}
 	memset(outbuf, 0, bufsize);
 	/* LINTED pointer alignment */
-	dp = (struct dirent64 *)outbuf;
+	dp = (struct dirent *)outbuf;
 
 	while (l) {
 		nl = l->next;
 		namelen = strlen(l->name);
-		this_reclen = DIRENT64_RECLEN(namelen);
+		this_reclen = DIRENT_RECLEN(namelen);
 		if (outcount + this_reclen > total_bytes_wanted) {
 			break;
 		}
@@ -304,7 +304,7 @@
 		(void) strcpy(dp->d_name, l->name);
 		dp->d_reclen = (ushort_t)this_reclen;
 		outcount += dp->d_reclen;
-		dp = (struct dirent64 *)((int)dp + dp->d_reclen);
+		dp = (struct dirent *)((int)dp + dp->d_reclen);
 		assert(outcount <= total_bytes_wanted);
 		l = l->next;
 	}
@@ -316,7 +316,7 @@
 		 */
 		res->rd_rddir.rddir_eof = (l == NULL);
 		/* LINTED pointer alignment */
-		res->rd_rddir.rddir_entries = (struct dirent64 *)outbuf;
+		res->rd_rddir.rddir_entries = (struct dirent *)outbuf;
 		error = 0;
 	} else {
 		/*
--- a/usr/src/cmd/fs.d/autofs/autod_xdr.c	Tue Apr 16 23:02:47 2019 +0300
+++ b/usr/src/cmd/fs.d/autofs/autod_xdr.c	Tue Apr 16 23:40:03 2019 +0300
@@ -377,7 +377,7 @@
 #ifdef nextdp
 #undef nextdp
 #endif
-#define	nextdp(dp)	((struct dirent64 *)((char *)(dp) + (dp)->d_reclen))
+#define	nextdp(dp)	((struct dirent *)((char *)(dp) + (dp)->d_reclen))
 
 /*
  * ENCODE ONLY
@@ -390,7 +390,7 @@
 {
 	bool_t t = TRUE;
 	bool_t f = FALSE;
-	struct dirent64 *dp;
+	struct dirent *dp;
 	char *name;
 	int size;
 	uint_t namlen;
@@ -438,9 +438,9 @@
 	return (TRUE);
 }
 
-#define	DIRENT64_RECLEN(namelen)	\
-	(((int)(((dirent64_t *)0)->d_name) + 1 + (namelen) + 7) & ~ 7)
-#define	reclen(namlen)	DIRENT64_RECLEN((namlen))
+#define	DIRENT_RECLEN(namelen)	\
+	(((int)(((dirent_t *)0)->d_name) + 1 + (namelen) + 7) & ~ 7)
+#define	reclen(namlen)	DIRENT_RECLEN((namlen))
 
 /*
  * DECODE ONLY
@@ -450,7 +450,7 @@
 	XDR *xdrs;
 	struct autofsrddir *rddir;
 {
-	struct dirent64 *dp;
+	struct dirent *dp;
 	uint_t namlen;
 	int size;
 	bool_t valid;
--- a/usr/src/cmd/zlook/zlook.c	Tue Apr 16 23:02:47 2019 +0300
+++ b/usr/src/cmd/zlook/zlook.c	Tue Apr 16 23:40:03 2019 +0300
@@ -120,10 +120,10 @@
 static void
 print_entries(zut_readdir_t *r)
 {
-	dirent64_t *dp;
+	dirent_t *dp;
 	char *bufstart;
 
-	dp = (dirent64_t *)(intptr_t)r->zr_buf;
+	dp = (dirent_t *)(intptr_t)r->zr_buf;
 	bufstart = (char *)dp;
 	while ((char *)dp < bufstart + r->zr_bytes) {
 		int i = 0;
@@ -133,7 +133,7 @@
 			(void) printf("%c", dp->d_name[i++]);
 		}
 		(void) printf("\n");
-		dp = (dirent64_t *)((intptr_t)dp + dp->d_reclen);
+		dp = (dirent_t *)((intptr_t)dp + dp->d_reclen);
 	}
 }
 
--- a/usr/src/lib/libvolmgt/common/volmgt_on_private.c	Tue Apr 16 23:02:47 2019 +0300
+++ b/usr/src/lib/libvolmgt/common/volmgt_on_private.c	Tue Apr 16 23:40:03 2019 +0300
@@ -450,7 +450,7 @@
 		char		*mnt_dir;
 		int		mtype_len;
 		DIR		*dirp = NULL;
-		struct dirent64	*dp;
+		struct dirent	*dp;
 		char		*volname;
 
 
--- a/usr/src/lib/libzfs/common/libzfs_import.c	Tue Apr 16 23:02:47 2019 +0300
+++ b/usr/src/lib/libzfs/common/libzfs_import.c	Tue Apr 16 23:40:03 2019 +0300
@@ -1105,7 +1105,7 @@
 zpool_find_import_impl(libzfs_handle_t *hdl, importargs_t *iarg)
 {
 	int i, dirs = iarg->paths;
-	struct dirent64 *dp;
+	struct dirent *dp;
 	char path[MAXPATHLEN];
 	char *end, **dir = iarg->path;
 	size_t pathleft;
--- a/usr/src/lib/libzfs/common/libzfs_mount.c	Tue Apr 16 23:02:47 2019 +0300
+++ b/usr/src/lib/libzfs/common/libzfs_mount.c	Tue Apr 16 23:40:03 2019 +0300
@@ -207,7 +207,7 @@
 dir_is_empty_readdir(const char *dirname)
 {
 	DIR *dirp;
-	struct dirent64 *dp;
+	struct dirent *dp;
 	int dirfd;
 
 	if ((dirfd = openat(AT_FDCWD, dirname,
--- a/usr/src/lib/scsi/libses/common/ses_plugin.c	Tue Apr 16 23:02:47 2019 +0300
+++ b/usr/src/lib/scsi/libses/common/ses_plugin.c	Tue Apr 16 23:40:03 2019 +0300
@@ -279,7 +279,7 @@
 {
 	char path[PATH_MAX];
 	DIR *dirp;
-	struct dirent64 *dp;
+	struct dirent *dp;
 	char *vendor, *product, *revision;
 	char isa[257];
 
--- a/usr/src/lib/scsi/libsmp/common/smp_plugin.c	Tue Apr 16 23:02:47 2019 +0300
+++ b/usr/src/lib/scsi/libsmp/common/smp_plugin.c	Tue Apr 16 23:40:03 2019 +0300
@@ -266,7 +266,7 @@
 {
 	char path[PATH_MAX];
 	DIR *dirp;
-	struct dirent64 *dp;
+	struct dirent *dp;
 	char *c_vendor, *vendor, *product, *revision;
 	char isa[257];
 
--- a/usr/src/uts/common/fs/smbclnt/smbfs/smbfs_vnops.c	Tue Apr 16 23:02:47 2019 +0300
+++ b/usr/src/uts/common/fs/smbclnt/smbfs/smbfs_vnops.c	Tue Apr 16 23:40:03 2019 +0300
@@ -3387,12 +3387,12 @@
 	 */
 	static const int limit = 1000;
 	/* Largest possible dirent size. */
-	static const size_t dbufsiz = DIRENT64_RECLEN(SMB_MAXFNAMELEN);
+	static const size_t dbufsiz = DIRENT_RECLEN(SMB_MAXFNAMELEN);
 	struct smb_cred scred;
 	vnode_t		*newvp;
 	struct smbnode	*np = VTOSMB(vp);
 	struct smbfs_fctx *ctx;
-	struct dirent64 *dp;
+	struct dirent *dp;
 	ssize_t		save_resid;
 	offset_t	save_offset; /* 64 bits */
 	int		offset; /* yes, 32 bits */
@@ -3442,7 +3442,7 @@
 		 * offset 0 is ".", offset 1 is ".."
 		 * so strlen of these is offset+1.
 		 */
-		reclen = DIRENT64_RECLEN(offset + 1);
+		reclen = DIRENT_RECLEN(offset + 1);
 		if (uio->uio_resid < reclen)
 			goto out;
 		bzero(dp, reclen);
@@ -3538,7 +3538,7 @@
 				VN_RELE(newvp);
 		}
 
-		reclen = DIRENT64_RECLEN(nmlen);
+		reclen = DIRENT_RECLEN(nmlen);
 		bzero(dp, reclen);
 		dp->d_reclen = reclen;
 		bcopy(ctx->f_name, dp->d_name, nmlen);
--- a/usr/src/uts/common/fs/smbsrv/smb_mangle_name.c	Tue Apr 16 23:02:47 2019 +0300
+++ b/usr/src/uts/common/fs/smbsrv/smb_mangle_name.c	Tue Apr 16 23:40:03 2019 +0300
@@ -353,7 +353,7 @@
  *
  * File systems which support VFSFT_EDIRENT_FLAGS will return the
  * directory entries as a buffer of edirent_t structure. Others will
- * return a buffer of dirent64_t structures. A union is used for the
+ * return a buffer of dirent_t structures. A union is used for the
  * the pointer into the buffer (bufptr, edp and dp).
  * The ed_name/d_name is NULL terminated by the file system.
  *
@@ -378,7 +378,7 @@
 	union {
 		char		*u_bufptr;
 		edirent_t	*u_edp;
-		dirent64_t	*u_dp;
+		dirent_t	*u_dp;
 	} u;
 #define	bufptr		u.u_bufptr
 #define	edp		u.u_edp
--- a/usr/src/uts/common/fs/smbsrv/smb_node.c	Tue Apr 16 23:02:47 2019 +0300
+++ b/usr/src/uts/common/fs/smbsrv/smb_node.c	Tue Apr 16 23:40:03 2019 +0300
@@ -611,7 +611,7 @@
 	union {
 		char		*u_bufptr;
 		struct edirent	*u_edp;
-		struct dirent64	*u_dp;
+		struct dirent	*u_dp;
 	} u;
 #define	bufptr	u.u_bufptr
 #define	extdp	u.u_edp
--- a/usr/src/uts/common/fs/smbsrv/smb_odir.c	Tue Apr 16 23:02:47 2019 +0300
+++ b/usr/src/uts/common/fs/smbsrv/smb_odir.c	Tue Apr 16 23:40:03 2019 +0300
@@ -199,7 +199,7 @@
  * The data in d_buf (that which is returned from the file system) can
  * be in one of two formats. If the file system supports extended directory
  * entries we request that the data be returned as edirent_t structures. If
- * it does not the data will be returned as dirent64_t structures. For
+ * it does not the data will be returned as dirent_t structures. For
  * convenience, when the next directory entry is read from d_buf by
  * smb_odir_next_odirent it is translated into an smb_odirent_t.
  *
@@ -1026,7 +1026,7 @@
  *
  * File systems which support VFSFT_EDIRENT_FLAGS will return the
  * directory entries as a buffer of edirent_t structure. Others will
- * return a buffer of dirent64_t structures.  For simplicity translate
+ * return a buffer of dirent_t structures.  For simplicity translate
  * the data into an smb_odirent_t structure.
  * The ed_name/d_name in d_buf is NULL terminated by the file system.
  *
@@ -1045,7 +1045,7 @@
 	int		rc;
 	int		reclen;
 	int		eof;
-	dirent64_t	*dp;
+	dirent_t	*dp;
 	edirent_t	*edp;
 	char		*np;
 	uint32_t	abe_flag = 0;
--- a/usr/src/uts/common/fs/smbsrv/smb_vops.c	Tue Apr 16 23:02:47 2019 +0300
+++ b/usr/src/uts/common/fs/smbsrv/smb_vops.c	Tue Apr 16 23:40:03 2019 +0300
@@ -953,7 +953,7 @@
  * not literally stored on-disk in the format returned.
  * If the file system supports extended directory entries (has features
  * VFSFT_DIRENTFLAGS), set V_RDDIR_ENTFLAGS to cause the buffer to be
- * filled with edirent_t structures, instead of dirent64_t structures.
+ * filled with edirent_t structures, instead of dirent_t structures.
  * If the file system supports access based enumeration (abe), set
  * V_RDDIR_ACCFILTER to filter directory entries based on user cred.
  */
@@ -974,7 +974,7 @@
 		flags |= V_RDDIR_ENTFLAGS;
 		rdirent_size = sizeof (edirent_t);
 	} else {
-		rdirent_size = sizeof (dirent64_t);
+		rdirent_size = sizeof (dirent_t);
 	}
 
 	if (*count < rdirent_size)
--- a/usr/src/uts/common/nfs/nfs.h	Tue Apr 16 23:02:47 2019 +0300
+++ b/usr/src/uts/common/nfs/nfs.h	Tue Apr 16 23:40:03 2019 +0300
@@ -620,7 +620,7 @@
 	uint32_t rdok_offset;		/* next offset (opaque) */
 	uint32_t rdok_size;		/* size in bytes of entries */
 	bool_t	rdok_eof;		/* true if last entry is in result */
-	struct dirent64 *rdok_entries;	/* variable number of entries */
+	struct dirent *rdok_entries;	/* variable number of entries */
 };
 
 /*
@@ -1843,7 +1843,7 @@
 	nfsstat3 status;
 	post_op_vattr dir_attributes;
 	cookieverf3 cookieverf;
-	dirent64_t *entries;			/* decoded dirent64s */
+	dirent_t *entries;			/* decoded dirent64s */
 	uint_t size;				/* actual size of entries */
 	uint_t entries_size;			/* max size of entries */
 	off64_t loff;				/* last offset/cookie */
@@ -1922,7 +1922,7 @@
 	nfsstat3 status;
 	post_op_vattr dir_attributes;
 	cookieverf3 cookieverf;
-	dirent64_t *entries;			/* decoded dirent64s */
+	dirent_t *entries;			/* decoded dirent64s */
 	uint_t size;				/* actual size of entries */
 	uint_t entries_size;			/* max size of entries */
 	bool_t eof;				/* End of directory */
--- a/usr/src/uts/common/nfs/nfs4_kprot.h	Tue Apr 16 23:02:47 2019 +0300
+++ b/usr/src/uts/common/nfs/nfs4_kprot.h	Tue Apr 16 23:40:03 2019 +0300
@@ -1150,7 +1150,7 @@
 	nfsstat4 status;
 	verifier4 cookieverf;
 	bool_t eof;
-	struct dirent64 *dotp, *dotdotp;
+	struct dirent *dotp, *dotdotp;
 	struct rddir4_cache *rdc;
 };
 typedef struct READDIR4res_clnt READDIR4res_clnt;
--- a/usr/src/uts/common/nfs/nfs_cmd.h	Tue Apr 16 23:02:47 2019 +0300
+++ b/usr/src/uts/common/nfs/nfs_cmd.h	Tue Apr 16 23:40:03 2019 +0300
@@ -85,7 +85,7 @@
 extern size_t nfscmd_convdirplus(struct sockaddr *, struct exportinfo *, char *,
     size_t, size_t, char **);
 extern size_t nfscmd_countents(char *, size_t);
-extern size_t nfscmd_dropped_entrysize(struct dirent64 *, size_t, size_t);
+extern size_t nfscmd_dropped_entrysize(struct dirent *, size_t, size_t);
 
 #endif
 
--- a/usr/src/uts/common/smbsrv/smb_ktypes.h	Tue Apr 16 23:02:47 2019 +0300
+++ b/usr/src/uts/common/smbsrv/smb_ktypes.h	Tue Apr 16 23:40:03 2019 +0300
@@ -1171,7 +1171,7 @@
 	union {
 		char		*u_bufptr;
 		struct edirent	*u_edp;
-		struct dirent64	*u_dp;
+		struct dirent	*u_dp;
 	} d_u;
 	uint32_t		d_last_cookie;
 	uint32_t		d_cookies[SMB_MAX_SEARCH];