xnu-517.9.4.tar.gz

[apple/xnu.git] / bsd / vfs / vfs_subr.c

diff --git a/bsd/vfs/vfs_subr.c b/bsd/vfs/vfs_subr.c
index 0801f1a0953c56cb2e004636067a424aba6a367a..e91eab1655a91a428bc3166165abfb1ae8501f99 100644 (file)
--- a/bsd/vfs/vfs_subr.c
+++ b/bsd/vfs/vfs_subr.c
@@ -591,7 +591,7 @@ retry:
        if (UBCINFOEXISTS(vp))
                panic("getnewvnode: ubcinfo not cleaned");
        else
-               vp->v_ubcinfo = 0;
+               vp->v_ubcinfo = UBC_INFO_NULL;
 
        if (vp->v_flag & VHASDIRTY)
                cluster_release(vp);
@@ -947,7 +947,7 @@ retry:
        /*
         * Recover named reference as needed
         */
-       if (UBCISVALID(vp) && !ubc_issetflags(vp, UI_HASOBJREF)) {
+       if (UBCISVALID(vp) && !UBCINFOMISSING(vp) && !ubc_issetflags(vp, UI_HASOBJREF)) {
                simple_unlock(&vp->v_interlock);
                if (ubc_getobject(vp, UBC_HOLDOBJECT) == MEMORY_OBJECT_CONTROL_NULL) {
                        error = ENOENT;