DEVEL15-disconnected-refcount-fixes-20081130

LICENSE IPL10
FIXES 123714

fix code which tweaks refcounts on disconnected vcaches to be correct

(cherry picked from commit fb549013e7bb2cf5cb3da3083349cb559c093e8f)

diff --git a/src/afs/VNOPS/afs_vnop_rename.c b/src/afs/VNOPS/afs_vnop_rename.c
index cb7a3f0af6359ddf77d4a7cc64d2bb996345b921..13ced95369087202066fba9c7f7a298637e4c588 100644 (file)
--- a/src/afs/VNOPS/afs_vnop_rename.c
+++ b/src/afs/VNOPS/afs_vnop_rename.c
@@ -246,6 +246,8 @@ afsrename(struct vcache *aodp, char *aname1, struct vcache *andp,
                    tvc->ddirty_flags |= VDisconRenameSameDir;
                ReleaseWriteLock(&tvc->lock);
            }                   /* if not previously renamed */
+
+           afs_PutVCache(tvc);
        } else {
            code = ENOENT;
        }                       /* if (tvc) */

diff --git a/src/afs/afs_disconnected.c b/src/afs/afs_disconnected.c
index aeeaaa37b210e5d2671cbd2b8a6b35427a63ba2b..5579a0759728ca49a943c03a2b12549394592a5e 100644 (file)
--- a/src/afs/afs_disconnected.c
+++ b/src/afs/afs_disconnected.c
@@ -322,8 +322,10 @@ int chk_del_children_hook(void *hdata,
     /* Count unfinished dirty children. VDisconShadowed can still be set,
      * because we need it to remove the shadow dir.
      */
-    if (tvc && tvc->ddirty_flags) {
-       v->count++;
+    if (tvc) {
+       if (tvc->ddirty_flags)
+           v->count++;
+
        afs_PutVCache(tvc);
     }