xnu-2782.40.9.tar.gz

[apple/xnu.git] / bsd / hfs / hfs_attrlist.h

diff --git a/bsd/hfs/hfs_attrlist.h b/bsd/hfs/hfs_attrlist.h
index 990adf227b40e6eb379c542ed2044faddf92cc20..cb72bce1e8f1072aec4aa4587c22eb152f78abdc 100644 (file)
--- a/bsd/hfs/hfs_attrlist.h
+++ b/bsd/hfs/hfs_attrlist.h
@@ -63,31 +63,45 @@ struct attrblock {
         ATTR_CMN_FNDRINFO |ATTR_CMN_OWNERID |          \
         ATTR_CMN_GRPID | ATTR_CMN_ACCESSMASK |         \
         ATTR_CMN_FLAGS | ATTR_CMN_USERACCESS |         \
-        ATTR_CMN_EXTENDED_SECURITY | ATTR_CMN_UUID |   \
-        ATTR_CMN_GRPUUID | ATTR_CMN_FILEID |           \
-        ATTR_CMN_PARENTID )
+        ATTR_CMN_FILEID | ATTR_CMN_PARENTID )
+
+#define HFS_ATTR_CMN_SEARCH_VALID      \
+       (ATTR_CMN_NAME | ATTR_CMN_OBJID |       \
+        ATTR_CMN_PAROBJID | ATTR_CMN_CRTIME |  \
+        ATTR_CMN_MODTIME | ATTR_CMN_CHGTIME |  \
+        ATTR_CMN_ACCTIME | ATTR_CMN_BKUPTIME | \
+        ATTR_CMN_FNDRINFO | ATTR_CMN_OWNERID | \
+        ATTR_CMN_GRPID | ATTR_CMN_ACCESSMASK | \
+        ATTR_CMN_FILEID | ATTR_CMN_PARENTID ) 
+
+
 
 #define HFS_ATTR_DIR_VALID                             \
        (ATTR_DIR_LINKCOUNT | ATTR_DIR_ENTRYCOUNT | ATTR_DIR_MOUNTSTATUS)
 
+#define HFS_ATTR_DIR_SEARCH_VALID      \
+       (ATTR_DIR_ENTRYCOUNT)
+
 #define HFS_ATTR_FILE_VALID                              \
        (ATTR_FILE_LINKCOUNT |ATTR_FILE_TOTALSIZE |       \
         ATTR_FILE_ALLOCSIZE | ATTR_FILE_IOBLOCKSIZE |    \
         ATTR_FILE_CLUMPSIZE | ATTR_FILE_DEVTYPE |        \
-        ATTR_FILE_FORKCOUNT | ATTR_FILE_FORKLIST |       \
         ATTR_FILE_DATALENGTH | ATTR_FILE_DATAALLOCSIZE | \
         ATTR_FILE_RSRCLENGTH | ATTR_FILE_RSRCALLOCSIZE)
 
+#define HFS_ATTR_FILE_SEARCH_VALID             \
+       (ATTR_FILE_DATALENGTH | ATTR_FILE_DATAALLOCSIZE |       \
+        ATTR_FILE_RSRCLENGTH | ATTR_FILE_RSRCALLOCSIZE )
 
 extern int hfs_attrblksize(struct attrlist *attrlist);
 
-extern unsigned long DerivePermissionSummary(uid_t obj_uid, gid_t obj_gid,
+extern u_int32_t DerivePermissionSummary(uid_t obj_uid, gid_t obj_gid,
                        mode_t obj_mode, struct mount *mp,
                        kauth_cred_t cred, struct proc *p);
 
 extern void hfs_packattrblk(struct attrblock *abp, struct hfsmount *hfsmp,
                struct vnode *vp, struct cat_desc *descp, struct cat_attr *attrp,
-               struct cat_fork *datafork, struct cat_fork *rsrcfork, struct proc *p);
+               struct cat_fork *datafork, struct cat_fork *rsrcfork, struct vfs_context *ctx);
 
 #endif /* __APPLE_API_PRIVATE */
 #endif /* KERNEL */