xnu-792.21.3.tar.gz

[apple/xnu.git] / bsd / kern / ubc_subr.c

diff --git a/bsd/kern/ubc_subr.c b/bsd/kern/ubc_subr.c
index deaaa090a5e3dc053e5d92609bc318d36dfd2e55..cf2087a37c937b6405b4aa5de46eef71267b7e89 100644 (file)
--- a/bsd/kern/ubc_subr.c
+++ b/bsd/kern/ubc_subr.c
@@ -76,9 +76,9 @@
 #endif /* DIAGNOSTIC */
 
 int ubc_info_init_internal(struct vnode *vp, int withfsize, off_t filesize);
-static int ubc_umcallback(vnode_t, void *);
+int ubc_umcallback(vnode_t, void *);
 int ubc_isinuse_locked(vnode_t, int, int);
-static int ubc_msync_internal(vnode_t, off_t, off_t, off_t *, int, int *);
+int ubc_msync_internal(vnode_t, off_t, off_t, off_t *, int, int *);
 
 struct zone    *ubc_info_zone;
 
@@ -199,8 +199,12 @@ ubc_info_init_internal(struct vnode *vp, int withfsize, off_t filesize)
 static void
 ubc_info_free(struct ubc_info *uip)
 {
-       if (IS_VALID_CRED(uip->ui_ucred)) {
-               kauth_cred_unref(&uip->ui_ucred);
+       kauth_cred_t credp;
+       
+       credp = uip->ui_ucred;
+       if (credp != NOCRED) {
+               uip->ui_ucred = NOCRED;
+               kauth_cred_rele(credp);
        }
 
        if (uip->ui_control != MEMORY_OBJECT_CONTROL_NULL)
@@ -365,7 +369,7 @@ ubc_setthreadcred(struct vnode *vp, struct proc *p, thread_t thread)
        uip = vp->v_ubcinfo;
        credp = uip->ui_ucred;
 
-       if (!IS_VALID_CRED(credp)) {
+       if (credp == NOCRED) {
                /* use per-thread cred, if assumed identity, else proc cred */
                if (uthread == NULL || (uthread->uu_flag & UT_SETUID) == 0) {
                        uip->ui_ucred = kauth_cred_proc_ref(p);
@@ -398,7 +402,7 @@ ubc_setcred(struct vnode *vp, struct proc *p)
        uip = vp->v_ubcinfo;
        credp = uip->ui_ucred;
 
-       if (!IS_VALID_CRED(credp)) {
+       if (credp == NOCRED) {
                uip->ui_ucred = kauth_cred_proc_ref(p);
        } 
        vnode_unlock(vp);