xnu-1504.9.17.tar.gz

[apple/xnu.git] / bsd / sys / namei.h

diff --git a/bsd/sys/namei.h b/bsd/sys/namei.h
index c0a8368bad839c52424ac453ed86ca99cd6b7259..5aa2f701a0dda48c7e8b5629f5d71b6379b0d68c 100644 (file)
--- a/bsd/sys/namei.h
+++ b/bsd/sys/namei.h
@@ -155,7 +155,9 @@ struct nameidata {
 #define        AUDITVNPATH2    0x00200000 /* audit the path/vnode info */
 #define        USEDVP          0x00400000 /* start the lookup at ndp.ni_dvp */
 #define        CN_VOLFSPATH    0x00800000 /* user path was a volfs style path */
+#ifndef __LP64__
 #define FSNODELOCKHELD 0x01000000
+#endif /* __LP64__ */
 #define UNIONCREATED   0x02000000 /* union fs creation of vnode */
 #if NAMEDRSRCFORK
 #define CN_WANTSRSRCFORK 0x04000000
@@ -173,9 +175,6 @@ struct nameidata {
        if ((segflg) == UIO_USERSPACE) { \
                (ndp)->ni_segflg = ((IS_64BIT_PROCESS(vfs_context_proc(ctx))) ? UIO_USERSPACE64 : UIO_USERSPACE32); \
        } \
-       else if ((segflg) == UIO_SYSSPACE) { \
-               (ndp)->ni_segflg = UIO_SYSSPACE32; \
-       } \
        else { \
                (ndp)->ni_segflg = segflg; \
        } \
@@ -220,7 +219,7 @@ int relookup(struct vnode *dvp, struct vnode **vpp,
  */
 void    cache_purgevfs(mount_t mp);
 int            cache_lookup_path(struct nameidata *ndp, struct componentname *cnp, vnode_t dp,
-                         vfs_context_t context, int *trailing_slash, int *dp_authorized);
+                         vfs_context_t context, int *trailing_slash, int *dp_authorized, vnode_t last_dp);
 
 void           vnode_cache_authorized_action(vnode_t vp, vfs_context_t context, kauth_action_t action);
 void           vnode_uncache_authorized_action(vnode_t vp, kauth_action_t action);