xnu-792.12.6.tar.gz

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

diff --git a/bsd/vfs/vfs_cache.c b/bsd/vfs/vfs_cache.c
index 093f5148d3acb5a5d6b21bd8554daadb0d8a1694..174b0ecb784f490a79ea9100f814c78d5b5b1bc2 100644 (file)
--- a/bsd/vfs/vfs_cache.c
+++ b/bsd/vfs/vfs_cache.c
@@ -1,24 +1,31 @@
 /*
  * Copyright (c) 2000-2003 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_LICENSE_OSREFERENCE_HEADER_START@
  * 
- * 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
+ * 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
+ *
+ * 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_HEADER_END@
+ *
+ * @APPLE_LICENSE_OSREFERENCE_HEADER_END@
  */
 /* Copyright (c) 1995 NeXT Computer, Inc. All Rights Reserved */
 /*
@@ -656,11 +663,33 @@ cache_lookup_path(struct nameidata *ndp, struct componentname *cnp, vnode_t dp,
                if ( (cnp->cn_flags & (ISLASTCN | ISDOTDOT)) ) {
                        if (cnp->cn_nameiop != LOOKUP)
                                break;
-                       if (cnp->cn_flags & (LOCKPARENT | NOCACHE | ISDOTDOT))
+                       if (cnp->cn_flags & (LOCKPARENT | NOCACHE))
                                break;
+                       if (cnp->cn_flags & ISDOTDOT) {
+                               /*
+                                * Quit here only if we can't use
+                                * the parent directory pointer or
+                                * don't have one.  Otherwise, we'll
+                                * use it below.
+                                */
+                               if ((dp->v_flag & VROOT) ||
+                                   dp->v_parent == NULLVP)
+                                       break;
+                       }
+               }
+
+               /*
+                * "." and ".." aren't supposed to be cached, so check
+                * for them before checking the cache.
+                */
+               if (cnp->cn_namelen == 1 && cnp->cn_nameptr[0] == '.')
+                       vp = dp;
+               else if (cnp->cn_flags & ISDOTDOT)
+                       vp = dp->v_parent;
+               else {
+                       if ( (vp = cache_lookup_locked(dp, cnp)) == NULLVP)
+                               break;
                }
-               if ( (vp = cache_lookup_locked(dp, cnp)) == NULLVP)
-                       break;
 
                if ( (cnp->cn_flags & ISLASTCN) )
                        break;