2 files changed, 11 insertions, 6 deletions
diff --git a/usr/src/uts/common/sys/attr.h b/usr/src/uts/common/sys/attr.h
index 34e802eed1..9f58bed52a 100644
--- a/usr/src/uts/common/sys/attr.h
+++ b/usr/src/uts/common/sys/attr.h
@@ -131,6 +131,7 @@ typedef struct {
 #define	XATTR_FIDSZ (sizeof (xattr_fid_t) - sizeof (uint16_t))
 
 int xattr_dir_vget(vfs_t *, vnode_t **, fid_t *);
+int xattr_sysattr_casechk(char *name);
 #endif
 
 int attr_count(void);
diff --git a/usr/src/uts/common/sys/gfs.h b/usr/src/uts/common/sys/gfs.h
index b53031086b..2c0e0a2e6c 100644
--- a/usr/src/uts/common/sys/gfs.h
+++ b/usr/src/uts/common/sys/gfs.h
@@ -34,6 +34,7 @@
 #include <sys/vfs_opreg.h>
 #include <sys/mutex.h>
 #include <sys/dirent.h>
+#include <sys/extdirent.h>
 #include <sys/uio.h>
 #include <sys/list.h>
 #include <sys/pathname.h>
@@ -74,8 +75,8 @@ typedef struct gfs_file {
 	ino64_t		gfs_ino;	/* inode for this vnode */
 } gfs_file_t;
 
-typedef int (*gfs_readdir_cb)(vnode_t *, struct dirent64 *, int *, offset_t *,
-    offset_t *, void *);
+typedef int (*gfs_readdir_cb)(vnode_t *, void *, int *, offset_t *,
+    offset_t *, void *, int);
 typedef int (*gfs_lookup_cb)(vnode_t *, const char *, vnode_t **, ino64_t *,
     cred_t *);
 typedef ino64_t (*gfs_inode_cb)(vnode_t *, int);
@@ -106,7 +107,7 @@ extern void *gfs_dir_inactive(vnode_t *);
 
 extern int gfs_dir_lookup(vnode_t *, const char *, vnode_t **, cred_t *);
 extern int gfs_dir_readdir(vnode_t *, uio_t *, int *, void *, cred_t *,
-    caller_context_t *);
+    caller_context_t *, int flags);
 
 #define	gfs_dir_lock(gd)	mutex_enter(&(gd)->gfsd_lock)
 #define	gfs_dir_unlock(gd)	mutex_exit(&(gd)->gfsd_lock)
@@ -122,22 +123,25 @@ extern int gfs_dir_readdir(vnode_t *, uio_t *, int *, void *, cred_t *,
 	(((gfs_file_t *)(vp)->v_data)->gfs_ino = (ino))
 
 typedef struct gfs_readdir_state {
-	struct dirent64 *grd_dirent;	/* directory entry buffer */
+	void		*grd_dirent;	/* directory entry buffer */
 	size_t		grd_namlen;	/* max file name length */
 	size_t		grd_ureclen;	/* exported record size */
 	ssize_t		grd_oresid;	/* original uio_resid */
 	ino64_t		grd_parent;	/* inode of parent */
 	ino64_t		grd_self;	/* inode of self */
+	int		grd_flags;	/* flags from VOP_READDIR */
 } gfs_readdir_state_t;
 
 extern int gfs_readdir_init(gfs_readdir_state_t *, int, int, uio_t *, ino64_t,
-    ino64_t);
+    ino64_t, int);
 extern int gfs_readdir_emit(gfs_readdir_state_t *, uio_t *, offset_t, ino64_t,
-    const char *);
+    const char *, int);
 extern int gfs_readdir_emitn(gfs_readdir_state_t *, uio_t *, offset_t, ino64_t,
     unsigned long);
 extern int gfs_readdir_pred(gfs_readdir_state_t *, uio_t *, offset_t *);
 extern int gfs_readdir_fini(gfs_readdir_state_t *, int, int *, int);
+extern int gfs_get_parent_ino(vnode_t *, cred_t *, caller_context_t *,
+    ino64_t *, ino64_t *);
 
 /*
  * Objects with real extended attributes will get their . and ..