macos: make the OpenAFS client aware of APFS

[openafs.git] / src / afs / DARWIN / osi_machdep.h

diff --git a/src/afs/DARWIN/osi_machdep.h b/src/afs/DARWIN/osi_machdep.h
index e186d3a..a4f01b3 100644 (file)
--- a/src/afs/DARWIN/osi_machdep.h
+++ b/src/afs/DARWIN/osi_machdep.h
@@ -34,6 +34,7 @@ typedef unsigned short etap_event_t;
 #include <sys/user.h>
 #include <sys/vnode.h>
 #endif
+#include <sys/kauth.h>
 #include <kern/thread.h>
 
 #ifdef AFS_DARWIN80_ENV
@@ -68,7 +69,7 @@ enum vcexcl { EXCL, NONEXCL };
 #ifndef AFS_DARWIN80_ENV
 #define vnode_clearfsnode(x) ((x)->v_data = 0)
 #define vnode_fsnode(x) (x)->v_data
-#define vnode_lock(x) vn_lock(x, LK_EXCLUSIVE | LK_RETRY, current_proc());
+#define vnode_lock(x) vn_lock(x, LK_EXCLUSIVE | LK_RETRY, current_proc())
 #define vnode_isvroot(x) (((x)->v_flag & VROOT)?1:0)
 #define vnode_vtype(x) (x)->v_type
 #define vnode_isdir(x) ((x)->v_type == VDIR)
@@ -142,7 +143,7 @@ typedef struct proc afs_proc_t;
 
 #define osi_vnhold(avc,r)       VN_HOLD(AFSTOV(avc))
 #define VN_HOLD(vp) darwin_vn_hold(vp)
-#define VN_RELE(vp) vrele(vp);
+#define VN_RELE(vp) vrele(vp)
 
 void darwin_vn_hold(struct vnode *vp);
 
@@ -204,15 +205,16 @@ extern struct lock__bsd__ afs_global_lock;
 #define USERPRI
 #if 0
 #undef SPLVAR
-#define SPLVAR int x;
+#define SPLVAR int x
 #undef NETPRI
-#define NETPRI x=splnet();
+#define NETPRI x=splnet()
 #undef USERPRI
-#define USERPRI splx(x);
+#define USERPRI splx(x)
 #endif
 
 #define AFS_APPL_UFS_CACHE 1
 #define AFS_APPL_HFS_CACHE 2
+#define AFS_APPL_APFS_CACHE 3
 
 extern ino_t VnodeToIno(vnode_t avp);
 extern dev_t VnodeToDev(vnode_t vp);