source: server/common/patches/openafs-jhutz.patch @ 840

Last change on this file since 840 was 840, checked in by andersk, 16 years ago
Revert STABLE14-linux-fakestat-avoid-mtpt-fillin-issue-20080415 in an effort to fix the getcwd() ENOENT problem. (This has already been running on b-m for about a month.)
  • Property svn:executable set to *
File size: 3.2 KB
RevLine 
[840]1===================================================================
2RCS file: /cvs/openafs/src/afs/LINUX/osi_vnodeops.c,v
3retrieving revision 1.81.2.64
4retrieving revision 1.81.2.63
5diff -u -r1.81.2.64 -r1.81.2.63
6--- openafs/src/afs/LINUX/osi_vnodeops.c        2008/04/15 12:29:54     1.81.2.64
7+++ openafs/src/afs/LINUX/osi_vnodeops.c        2008/04/02 18:27:13     1.81.2.63
8@@ -22,7 +22,7 @@
9 #include "afs/param.h"
10 
11 RCSID
12-    ("$Header: /cvs/openafs/src/afs/LINUX/osi_vnodeops.c,v 1.81.2.64 2008/04/15 12:29:54 shadow Exp $");
13+    ("$Header: /cvs/openafs/src/afs/LINUX/osi_vnodeops.c,v 1.81.2.63 2008/04/02 18:27:13 shadow Exp $");
14 
15 #include "afs/sysincludes.h"
16 #include "afsincludes.h"
17@@ -803,14 +803,8 @@
18        if (vcp == afs_globalVp)
19            goto good_dentry;
20 
21-       if (vcp->mvstat == 1) {         /* mount point */
22-           if (vcp->mvid && (vcp->states & CMValid)) {
23-               /* a mount point, not yet replaced by its directory */
24-               goto bad_dentry;
25-           }
26-       } else
27-           if (*dp->d_name.name != '/' && vcp->mvstat == 2) /* root vnode */
28-               check_bad_parent(dp);   /* check and correct mvid */
29+       if (*dp->d_name.name != '/' && vcp->mvstat == 2)        /* root vnode */
30+           check_bad_parent(dp);       /* check and correct mvid */
31 
32 #ifdef notdef
33        /* If the last looker changes, we should make sure the current
34===================================================================
35RCS file: /cvs/openafs/src/afs/VNOPS/afs_vnop_lookup.c,v
36retrieving revision 1.50.2.21
37retrieving revision 1.50.2.20
38diff -u -r1.50.2.21 -r1.50.2.20
39--- openafs/src/afs/VNOPS/afs_vnop_lookup.c     2008/04/15 12:29:56     1.50.2.21
40+++ openafs/src/afs/VNOPS/afs_vnop_lookup.c     2008/03/07 17:34:08     1.50.2.20
41@@ -18,7 +18,7 @@
42 #include "afs/param.h"
43 
44 RCSID
45-    ("$Header: /cvs/openafs/src/afs/VNOPS/afs_vnop_lookup.c,v 1.50.2.21 2008/04/15 12:29:56 shadow Exp $");
46+    ("$Header: /cvs/openafs/src/afs/VNOPS/afs_vnop_lookup.c,v 1.50.2.20 2008/03/07 17:34:08 shadow Exp $");
47 
48 #include "afs/sysincludes.h"   /* Standard vendor system headers */
49 #include "afsincludes.h"       /* Afs-based standard headers */
50@@ -1120,7 +1120,6 @@
51     register afs_int32 code;
52     register afs_int32 bulkcode = 0;
53     int pass = 0, hit = 0;
54-    int force_eval = afs_fakestat_enable ? 0 : 1;
55     long dirCookie;
56     extern afs_int32 afs_mariner;      /*Writing activity to log? */
57     afs_hyper_t versionNo;
58@@ -1443,6 +1442,8 @@
59     }                          /* sub-block just to reduce stack usage */
60 
61     if (tvc) {
62+       int force_eval = afs_fakestat_enable ? 0 : 1;
63+
64        if (adp->states & CForeign)
65            tvc->states |= CForeign;
66        tvc->parentVnode = adp->fid.Fid.Vnode;
67@@ -1463,9 +1464,6 @@
68                force_eval = 1;
69            ReleaseReadLock(&tvc->lock);
70        }
71-       if (tvc->mvstat == 1 && (tvc->states & CMValid) && tvc->mvid != NULL)
72-         force_eval = 1; /* This is now almost for free, get it correct */
73-
74 #if defined(UKERNEL) && defined(AFS_WEB_ENHANCEMENTS)
75        if (!(flags & AFS_LOOKUP_NOEVAL))
76            /* don't eval mount points */
77@@ -1591,7 +1589,7 @@
78             * rather than the vc of the mount point itself.  we can still find the
79             * mount point's vc in the vcache by its fid. */
80 #endif /* UKERNEL && AFS_WEB_ENHANCEMENTS */
81-           if (!hit && force_eval) {
82+           if (!hit) {
83                osi_dnlc_enter(adp, aname, tvc, &versionNo);
84            } else {
85 #ifdef AFS_LINUX20_ENV
Note: See TracBrowser for help on using the repository browser.