X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/13fec9890cf095cc781fdf7b8917cb03bf32dd4c..c0fea4742e91338fffdcf79f86a7c1d5e2b97eb1:/bsd/hfs/hfs_vnops.c

diff --git a/bsd/hfs/hfs_vnops.c b/bsd/hfs/hfs_vnops.c
index 507bb153c..726dee5e0 100644
--- a/bsd/hfs/hfs_vnops.c
+++ b/bsd/hfs/hfs_vnops.c
@@ -1565,18 +1565,17 @@ hfs_removefile(struct vnode *dvp, struct vnode *vp, struct componentname *cnp,
 	if ((cp->c_flag & C_HARDLINK) == 0 &&
 	    (!dataforkbusy || !rsrcforkbusy)) {
 		/*
-		 * A ubc_setsize can cause a pagein here 
-		 * so we need to the drop cnode lock. Note
-		 * that we still hold the truncate lock.
+		 * A ubc_setsize can cause a pagein so defer it
+		 * until after the cnode lock is dropped.  The
+		 * cnode lock cannot be dropped/reacquired here
+		 * since we might already hold the journal lock.
 		 */
-		hfs_unlock(cp);
 		if (!dataforkbusy && cp->c_datafork->ff_blocks && !isbigfile) {
-			ubc_setsize(vp, 0);
+			cp->c_flag |= C_NEED_DATA_SETSIZE;
 		}
 		if (!rsrcforkbusy && rvp) {
-			ubc_setsize(rvp, 0);
+			cp->c_flag |= C_NEED_RSRC_SETSIZE;
 		}
-		hfs_lock(cp, HFS_FORCE_LOCK);
 	} else {
 	    struct cat_desc cndesc;
 
@@ -1890,10 +1889,10 @@ out:
 __private_extern__ void
 replace_desc(struct cnode *cp, struct cat_desc *cdp)
 {
-    if (&cp->c_desc == cdp) {
-        return;
-    }
-         
+	if (&cp->c_desc == cdp) {
+		return;
+	}
+
 	/* First release allocated name buffer */
 	if (cp->c_desc.cd_flags & CD_HASBUF && cp->c_desc.cd_nameptr != 0) {
 		char *name = cp->c_desc.cd_nameptr;
@@ -2829,7 +2828,7 @@ hfs_update(struct vnode *vp, __unused int waitfor)
 	 * we have to do the update.
 	 */
 	if (ISSET(cp->c_flag, C_FORCEUPDATE) == 0 &&
-	    (ISSET(cp->c_flag, C_DELETED) || 
+	    (ISSET(cp->c_flag, C_DELETED) ||
 	    (dataforkp && cp->c_datafork->ff_unallocblocks) ||
 	    (rsrcforkp && cp->c_rsrcfork->ff_unallocblocks))) {
 	//	cp->c_flag &= ~(C_ACCESS | C_CHANGE | C_UPDATE);
@@ -3713,7 +3712,6 @@ struct vnodeopv_entry_desc hfs_specop_entries[] = {
 	{ &vnop_pathconf_desc, (VOPFUNC)spec_pathconf },		/* pathconf */
 	{ &vnop_advlock_desc, (VOPFUNC)err_advlock },		/* advlock */
 	{ &vnop_bwrite_desc, (VOPFUNC)hfs_vnop_bwrite },
-	{ &vnop_devblocksize_desc, (VOPFUNC)spec_devblocksize }, /* devblocksize */
 	{ &vnop_pagein_desc, (VOPFUNC)hfs_vnop_pagein },		/* Pagein */
 	{ &vnop_pageout_desc, (VOPFUNC)hfs_vnop_pageout },	/* Pageout */
         { &vnop_copyfile_desc, (VOPFUNC)err_copyfile },		/* copyfile */