xnu-344.23.tar.gz

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

diff --git a/bsd/hfs/hfs_vnops.c b/bsd/hfs/hfs_vnops.c
index b53d8eb2fb41c44190fde32d4a50c12df599f11c..7412131ca71a2a55a59637b7038ac9a5027da6bc 100644 (file)
--- a/bsd/hfs/hfs_vnops.c
+++ b/bsd/hfs/hfs_vnops.c
@@ -3,22 +3,19 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_LICENSE_HEADER_START@
  * 

- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * 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 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
+ * 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,
  * 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.
+ * 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@
  */
  * 
  * @APPLE_LICENSE_HEADER_END@
  */


@@ -61,8 +58,6 @@
 
 extern uid_t console_user;
 
 
 extern uid_t console_user;
 

-extern unsigned long strtoul(const char *, char **, int);
-

 /* Global vfs data structures for hfs */
 
 
 /* Global vfs data structures for hfs */
 
 


@@ -1081,23 +1076,6 @@ hfs_exchange(ap)
 
        hfs_chashinsert(from_cp);
        hfs_chashinsert(to_cp);
 
        hfs_chashinsert(from_cp);
        hfs_chashinsert(to_cp);

-
-       /*
-        * When a file moves out of "Cleanup At Startup"
-        * we can drop its NODUMP status.
-        */
-       if ((from_cp->c_flags & UF_NODUMP) &&
-           (from_cp->c_parentcnid != to_cp->c_parentcnid)) {
-               from_cp->c_flags &= ~UF_NODUMP;
-               from_cp->c_flag |= C_CHANGE;
-       }
-
-       if ((to_cp->c_flags & UF_NODUMP) &&
-           (to_cp->c_parentcnid != from_cp->c_parentcnid)) {
-               to_cp->c_flags &= ~UF_NODUMP;
-               to_cp->c_flag |= C_CHANGE;
-       }
-

 Err_Exit:
        if (to_rvp)
                vrele(to_rvp);
 Err_Exit:
        if (to_rvp)
                vrele(to_rvp);


@@ -1177,11 +1155,8 @@ hfs_fsync(ap)
         * When MNT_WAIT is requested and the zero fill timeout
         * has expired then we must explicitly zero out any areas
         * that are currently marked invalid (holes).
         * When MNT_WAIT is requested and the zero fill timeout
         * has expired then we must explicitly zero out any areas
         * that are currently marked invalid (holes).

-        *
-        * Files with NODUMP can bypass zero filling here.

         */
        if ((wait || (cp->c_flag & C_ZFWANTSYNC)) &&
         */
        if ((wait || (cp->c_flag & C_ZFWANTSYNC)) &&

-           ((cp->c_flags & UF_NODUMP) == 0) &&

            UBCINFOEXISTS(vp) && (fp = VTOF(vp)) &&
            cp->c_zftimeout != 0) {
                int devblksize;
            UBCINFOEXISTS(vp) && (fp = VTOF(vp)) &&
            cp->c_zftimeout != 0) {
                int devblksize;


@@ -1707,8 +1682,15 @@ hfs_remove(ap)
                        cp->c_mode = 0;            /* Suppress VOP_UPDATES */
                        error = VOP_TRUNCATE(rvp, (off_t)0, IO_NDELAY, NOCRED, p);
                        cp->c_mode = mode;
                        cp->c_mode = 0;            /* Suppress VOP_UPDATES */
                        error = VOP_TRUNCATE(rvp, (off_t)0, IO_NDELAY, NOCRED, p);
                        cp->c_mode = mode;

-                       if (error)
+                       if (error && !dataforkbusy)

                                goto out;
                                goto out;

+                       else {
+                               /*
+                                * XXX could also force an update on vp
+                                * and fail the remove.
+                                */
+                               error = 0;
+                       }

                        truncated = 1;
                }
        }
                        truncated = 1;
                }
        }


@@ -1838,11 +1820,10 @@ hfs_remove(ap)
 
        } else /* Not busy */ {
 
 
        } else /* Not busy */ {
 

-               if (cp->c_blocks > 0) {
-                       printf("hfs_remove: attempting to delete a non-empty file!");
-                       error = EBUSY;
-                       goto out;
-               }
+               if (vp->v_type == VDIR && cp->c_entries > 0)
+                       panic("hfs_remove: attempting to delete a non-empty directory!");
+               if (vp->v_type != VDIR && cp->c_blocks > 0)
+                       panic("hfs_remove: attempting to delete a non-empty file!");

 
                /* Lock catalog b-tree */
                error = hfs_metafilelocking(hfsmp, kHFSCatalogFileID, LK_EXCLUSIVE, p);
 
                /* Lock catalog b-tree */
                error = hfs_metafilelocking(hfsmp, kHFSCatalogFileID, LK_EXCLUSIVE, p);


@@ -1851,7 +1832,7 @@ hfs_remove(ap)
 
                error = cat_delete(hfsmp, &cp->c_desc, &cp->c_attr);
 
 
                error = cat_delete(hfsmp, &cp->c_desc, &cp->c_attr);
 

-               if (error && error != ENXIO && error != ENOENT && truncated) {
+               if (error && error != ENXIO && truncated) {

                        if ((cp->c_datafork && cp->c_datafork->ff_data.cf_size != 0) ||
                                (cp->c_rsrcfork && cp->c_rsrcfork->ff_data.cf_size != 0)) {
                                panic("hfs: remove: couldn't delete a truncated file! (%d, data sz %lld; rsrc sz %lld)",
                        if ((cp->c_datafork && cp->c_datafork->ff_data.cf_size != 0) ||
                                (cp->c_rsrcfork && cp->c_rsrcfork->ff_data.cf_size != 0)) {
                                panic("hfs: remove: couldn't delete a truncated file! (%d, data sz %lld; rsrc sz %lld)",


@@ -2230,21 +2211,6 @@ hfs_rename(ap)
        fdcp = VTOC(fdvp);
        fcp = VTOC(fvp);
 
        fdcp = VTOC(fdvp);
        fcp = VTOC(fvp);
 

-       /*
-        * When a file moves out of "Cleanup At Startup"
-        * we can drop its NODUMP status.
-        */
-       if ((fcp->c_flags & UF_NODUMP) &&
-           (fvp->v_type == VREG) &&
-           (fdvp != tdvp) &&
-           (fdcp->c_desc.cd_nameptr != NULL) &&
-           (strcmp(fdcp->c_desc.cd_nameptr, "Cleanup At Startup") == 0)) {
-               fcp->c_flags &= ~UF_NODUMP;
-               fcp->c_flag |= C_CHANGE;
-               tv = time;
-               (void) VOP_UPDATE(fvp, &tv, &tv, 0);
-       }
-

        hfs_global_shared_lock_acquire(hfsmp);
        grabbed_lock = 1;
        if (hfsmp->jnl) {
        hfs_global_shared_lock_acquire(hfsmp);
        grabbed_lock = 1;
        if (hfsmp->jnl) {


@@ -3434,38 +3400,7 @@ exit:
 
        if ((cnp->cn_flags & (HASBUF | SAVESTART)) == HASBUF)
                FREE_ZONE(cnp->cn_pnbuf, cnp->cn_pnlen, M_NAMEI);
 
        if ((cnp->cn_flags & (HASBUF | SAVESTART)) == HASBUF)
                FREE_ZONE(cnp->cn_pnbuf, cnp->cn_pnlen, M_NAMEI);

-
-       /*
-        * Check if a file is located in the "Cleanup At Startup"
-        * directory.  If it is then tag it as NODUMP so that we
-        * can be lazy about zero filling data holes.
-        */
-       if ((error == 0) && (vnodetype == VREG) &&
-           (dcp->c_desc.cd_nameptr != NULL) &&
-           (strcmp(dcp->c_desc.cd_nameptr, "Cleanup At Startup") == 0)) {
-               struct vnode *ddvp;
-               cnid_t parid;
-
-               parid = dcp->c_parentcnid;
-               vput(dvp);
-               dvp = NULL;
-
-               /*
-                * The parent of "Cleanup At Startup" should
-                * have the ASCII name of the userid.
-                */
-               if (VFS_VGET(HFSTOVFS(hfsmp), &parid, &ddvp) == 0) {
-                       if (VTOC(ddvp)->c_desc.cd_nameptr &&
-                           (cp->c_uid == strtoul(VTOC(ddvp)->c_desc.cd_nameptr, 0, 0))) {
-                               cp->c_flags |= UF_NODUMP;
-                               cp->c_flag |= C_CHANGE;
-                       }
-                       vput(ddvp);
-               }
-       }
-
-       if (dvp)
-               vput(dvp);
+       vput(dvp);

 
        // XXXdbg
        if (started_tr) {
 
        // XXXdbg
        if (started_tr) {