xnu-792.12.6.tar.gz

[apple/xnu.git] / bsd / hfs / hfs_cnode.c

diff --git a/bsd/hfs/hfs_cnode.c b/bsd/hfs/hfs_cnode.c
index 1fb30d020a94d45513d1d87372ddc5a52b783e0c..cbf964e067937dfb386d6d37937600325ab0edb2 100644 (file)
--- a/bsd/hfs/hfs_cnode.c
+++ b/bsd/hfs/hfs_cnode.c
@@ -1,23 +1,31 @@
 /*
  * Copyright (c) 2002-2005 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_LICENSE_OSREFERENCE_HEADER_START@
  * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
- * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
- * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
- * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
- * 
- * @APPLE_LICENSE_HEADER_END@
+ * This file contains Original Code and/or Modifications of Original Code 
+ * as defined in and that are subject to the Apple Public Source License 
+ * Version 2.0 (the 'License'). You may not use this file except in 
+ * compliance with the License.  The rights granted to you under the 
+ * License may not be used to create, or enable the creation or 
+ * redistribution of, unlawful or unlicensed copies of an Apple operating 
+ * system, or to circumvent, violate, or enable the circumvention or 
+ * violation of, any terms of an Apple operating system software license 
+ * agreement.
+ *
+ * Please obtain a copy of the License at 
+ * http://www.opensource.apple.com/apsl/ and read it before using this 
+ * file.
+ *
+ * The Original Code and all software distributed under the License are 
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER 
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, 
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, 
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. 
+ * Please see the License for the specific language governing rights and 
+ * limitations under the License.
+ *
+ * @APPLE_LICENSE_OSREFERENCE_HEADER_END@
  */
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -85,9 +93,11 @@ hfs_vnop_inactive(struct vnop_inactive_args *ap)
        v_type = vnode_vtype(vp);
        cp = VTOC(vp);
 
-       if ((hfsmp->hfs_flags & HFS_READ_ONLY) || vnode_issystem(vp)) {
+       if ((hfsmp->hfs_flags & HFS_READ_ONLY) || vnode_issystem(vp) ||
+           (hfsmp->hfs_freezing_proc == p)) {
                return (0);
        }
+
        /*
         * Ignore nodes related to stale file handles.
         */
@@ -142,11 +152,11 @@ hfs_vnop_inactive(struct vnop_inactive_args *ap)
                    // them in the catalog entry and then double
                    // free them later.
                    //
-                   if (hfs_start_transaction(hfsmp) != 0) {
-                       error = EINVAL;
-                       goto out;
-                   }
-                   started_tr = 1;
+//                 if (hfs_start_transaction(hfsmp) != 0) {
+//                     error = EINVAL;
+//                     goto out;
+//                 }
+//                 started_tr = 1;
                    
                        /*
                         * Since we're already inside a transaction,
@@ -496,7 +506,7 @@ hfs_getnewvnode(
                lck_rw_init(&cp->c_truncatelock, hfs_rwlock_group, hfs_lock_attr);
 
                /* Make sure its still valid (ie exists on disk). */
-               if (!hfs_valid_cnode(hfsmp, dvp, cnp, cp->c_fileid)) {
+               if (!hfs_valid_cnode(hfsmp, dvp, (wantrsrc ? NULL : cnp), cp->c_fileid)) {
                        hfs_chash_abort(cp);
                        hfs_reclaim_cnode(cp);
                        *vpp = NULL;