xnu-344.21.73.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 65617595f965aaaac498e34fb142f5f71f4b0e9d..e1549bab5ee593500d6ab1757830509e391a1974 100644 (file)
--- a/bsd/hfs/hfs_cnode.c
+++ b/bsd/hfs/hfs_cnode.c
@@ -3,19 +3,22 @@
  *
  * @APPLE_LICENSE_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.
+ * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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. 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 OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * 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_HEADER_END@
  */
@@ -82,15 +85,14 @@ hfs_inactive(ap)
                ++forkcount;
 
        /* If needed, get rid of any fork's data for a deleted file */
-       if ((cp->c_flag & C_DELETED) &&
-           vp->v_type == VREG &&
-           (VTOF(vp)->ff_blocks != 0)) {                       
-               error = VOP_TRUNCATE(vp, (off_t)0, IO_NDELAY, NOCRED, p);
-               truncated = 1;
-               // have to do this to prevent the lost ubc_info panic
-               SET(cp->c_flag, C_TRANSIT);
+       if ((vp->v_type == VREG) && (cp->c_flag & C_DELETED)) {
+               if (VTOF(vp)->ff_blocks != 0) {
+                       error = VOP_TRUNCATE(vp, (off_t)0, IO_NDELAY, NOCRED, p);
+                       if (error)
+                               goto out;
+                       truncated = 1;
+               }
                recycle = 1;
-               if (error) goto out;
        }
 
        /*
@@ -145,8 +147,7 @@ hfs_inactive(ap)
                if (error) goto out;
 
 #if QUOTA
-               if (!hfs_getinoquota(cp))
-                       (void)hfs_chkiq(cp, -1, NOCRED, 0);
+               (void)hfs_chkiq(cp, -1, NOCRED, 0);
 #endif /* QUOTA */
 
                cp->c_mode = 0;
@@ -265,7 +266,7 @@ hfs_reclaim(ap)
 #if QUOTA
                for (i = 0; i < MAXQUOTAS; i++) {
                        if (cp->c_dquot[i] != NODQUOT) {
-                               dqrele(vp, cp->c_dquot[i]);
+                               dqreclaim(vp, cp->c_dquot[i]);
                                cp->c_dquot[i] = NODQUOT;
                        }
                }