libafs: use afs_ResetVCache in flush volume data

[openafs.git] / src / afs / afs_disconnected.c

diff --git a/src/afs/afs_disconnected.c b/src/afs/afs_disconnected.c
index 06d4d0c..4f4ce80 100644 (file)
--- a/src/afs/afs_disconnected.c
+++ b/src/afs/afs_disconnected.c
@@ -71,12 +71,14 @@ afs_FindDCacheByFid(struct VenusFid *afid)
     ObtainWriteLock(&afs_xdcache, 758);
     for (index = afs_dvhashTbl[i]; index != NULLIDX;) {
        if (afs_indexUnique[index] == afid->Fid.Unique) {
-           tdc = afs_GetDSlot(index, NULL);
-           ReleaseReadLock(&tdc->tlock);
-           if (!FidCmp(&tdc->f.fid, afid)) {
-               break;          /* leaving refCount high for caller */
+           tdc = afs_GetValidDSlot(index);
+           if (tdc) {
+               ReleaseReadLock(&tdc->tlock);
+               if (!FidCmp(&tdc->f.fid, afid)) {
+                   break;              /* leaving refCount high for caller */
+               }
+               afs_PutDCache(tdc);
            }
-           afs_PutDCache(tdc);
        }
        index = afs_dvnextTbl[index];
     }
@@ -185,7 +187,6 @@ afs_GetParentDirFid(struct vcache *avc, struct VenusFid *afid)
        break;
     default:
        return -1;
-       break;
     }
 
     return 0;
@@ -553,6 +554,7 @@ afs_ProcessOpRename(struct vcache *avc, struct vrequest *areq)
     struct AFSFetchStatus OutOldDirStatus, OutNewDirStatus;
     struct AFSVolSync tsync;
     struct afs_conn *tc;
+    struct rx_connection *rxconn;
     afs_uint32 code = 0;
     XSTATS_DECLS;
 
@@ -605,11 +607,11 @@ afs_ProcessOpRename(struct vcache *avc, struct vrequest *areq)
 
     /* Send to data to server. */
     do {
-       tc = afs_Conn(&old_pdir_fid, areq, SHARED_LOCK);
+       tc = afs_Conn(&old_pdir_fid, areq, SHARED_LOCK, &rxconn);
        if (tc) {
            XSTATS_START_TIME(AFS_STATS_FS_RPCIDX_RENAME);
            RX_AFS_GUNLOCK();
-           code = RXAFS_Rename(tc->id,
+           code = RXAFS_Rename(rxconn,
                (struct AFSFid *)&old_pdir_fid.Fid,
                old_name,
                (struct AFSFid *)&new_pdir_fid.Fid,
@@ -623,6 +625,7 @@ afs_ProcessOpRename(struct vcache *avc, struct vrequest *areq)
            code = -1;
 
     } while (afs_Analyze(tc,
+                rxconn,
                code,
                &new_pdir_fid,
                areq,
@@ -659,6 +662,7 @@ afs_ProcessOpCreate(struct vcache *avc, struct vrequest *areq,
     struct vcache *tdp = NULL, *tvc = NULL;
     struct dcache *tdc = NULL;
     struct afs_conn *tc;
+    struct rx_connection *rxconn;
     afs_int32 hash, new_hash, index;
     afs_size_t tlen;
     int code, op = 0;
@@ -717,7 +721,7 @@ afs_ProcessOpCreate(struct vcache *avc, struct vrequest *areq,
     InStatus.UnixModeBits = avc->f.m.Mode & 0xffff;
 
     do {
-       tc = afs_Conn(&tdp->f.fid, areq, SHARED_LOCK);
+       tc = afs_Conn(&tdp->f.fid, areq, SHARED_LOCK, &rxconn);
        if (tc) {
            switch (vType(avc)) {
            case VREG:
@@ -725,7 +729,7 @@ afs_ProcessOpCreate(struct vcache *avc, struct vrequest *areq,
                op = AFS_STATS_FS_RPCIDX_CREATEFILE;
                XSTATS_START_TIME(op);
                 RX_AFS_GUNLOCK();
-                code = RXAFS_CreateFile(tc->id,
+                code = RXAFS_CreateFile(rxconn,
                                        (struct AFSFid *)&tdp->f.fid.Fid,
                                        tname, &InStatus,
                                        (struct AFSFid *) &newFid.Fid,
@@ -739,7 +743,7 @@ afs_ProcessOpCreate(struct vcache *avc, struct vrequest *areq,
                op = AFS_STATS_FS_RPCIDX_MAKEDIR;
                XSTATS_START_TIME(op);
                 RX_AFS_GUNLOCK();
-               code = RXAFS_MakeDir(tc->id, (struct AFSFid *) &tdp->f.fid.Fid,
+               code = RXAFS_MakeDir(rxconn, (struct AFSFid *) &tdp->f.fid.Fid,
                                     tname, &InStatus,
                                     (struct AFSFid *) &newFid.Fid,
                                     &OutFidStatus, &OutDirStatus,
@@ -752,7 +756,7 @@ afs_ProcessOpCreate(struct vcache *avc, struct vrequest *areq,
                op = AFS_STATS_FS_RPCIDX_SYMLINK;
                XSTATS_START_TIME(op);
                RX_AFS_GUNLOCK();
-               code = RXAFS_Symlink(tc->id,
+               code = RXAFS_Symlink(rxconn,
                                (struct AFSFid *) &tdp->f.fid.Fid,
                                tname, ttargetName, &InStatus,
                                (struct AFSFid *) &newFid.Fid,
@@ -767,7 +771,7 @@ afs_ProcessOpCreate(struct vcache *avc, struct vrequest *areq,
            }
         } else
            code = -1;
-    } while (afs_Analyze(tc, code, &tdp->f.fid, areq, op, SHARED_LOCK, NULL));
+    } while (afs_Analyze(tc, rxconn, code, &tdp->f.fid, areq, op, SHARED_LOCK, NULL));
 
     /* TODO: Handle errors. */
     if (code) {
@@ -851,7 +855,7 @@ afs_ProcessOpCreate(struct vcache *avc, struct vrequest *areq,
     ObtainWriteLock(&afs_xdcache, 743);
     for (index = afs_dvhashTbl[hash]; index != NULLIDX; index = hash) {
         hash = afs_dvnextTbl[index];
-        tdc = afs_GetDSlot(index, NULL);
+        tdc = afs_GetValidDSlot(index);
         ReleaseReadLock(&tdc->tlock);
        if (afs_indexUnique[index] == avc->f.fid.Fid.Unique) {
             if (!FidCmp(&tdc->f.fid, &avc->f.fid)) {
@@ -911,6 +915,7 @@ afs_ProcessOpRemove(struct vcache *avc, struct vrequest *areq)
     struct VenusFid pdir_fid;
     struct AFSVolSync tsync;
     struct afs_conn *tc;
+    struct rx_connection *rxconn;
     struct vcache *tdp = NULL;
     int code = 0;
     XSTATS_DECLS;
@@ -936,11 +941,11 @@ afs_ProcessOpRemove(struct vcache *avc, struct vrequest *areq)
     if (vType(avc) == VREG || vType(avc) == VLNK) {
        /* Remove file on server. */
        do {
-           tc = afs_Conn(&pdir_fid, areq, SHARED_LOCK);
+           tc = afs_Conn(&pdir_fid, areq, SHARED_LOCK, &rxconn);
            if (tc) {
                XSTATS_START_TIME(AFS_STATS_FS_RPCIDX_REMOVEFILE);
                RX_AFS_GUNLOCK();
-               code = RXAFS_RemoveFile(tc->id,
+               code = RXAFS_RemoveFile(rxconn,
                                &pdir_fid.Fid,
                                tname,
                                &OutDirStatus,
@@ -951,6 +956,7 @@ afs_ProcessOpRemove(struct vcache *avc, struct vrequest *areq)
            } else
                code = -1;
        } while (afs_Analyze(tc,
+                       rxconn,
                        code,
                        &pdir_fid,
                        areq,
@@ -961,11 +967,11 @@ afs_ProcessOpRemove(struct vcache *avc, struct vrequest *areq)
     } else if (vType(avc) == VDIR) {
        /* Remove dir on server. */
        do {
-           tc = afs_Conn(&pdir_fid, areq, SHARED_LOCK);
+           tc = afs_Conn(&pdir_fid, areq, SHARED_LOCK, &rxconn);
            if (tc) {
                XSTATS_START_TIME(AFS_STATS_FS_RPCIDX_REMOVEDIR);
                RX_AFS_GUNLOCK();
-               code = RXAFS_RemoveDir(tc->id,
+               code = RXAFS_RemoveDir(rxconn,
                                &pdir_fid.Fid,
                                tname,
                                &OutDirStatus,
@@ -975,6 +981,7 @@ afs_ProcessOpRemove(struct vcache *avc, struct vrequest *areq)
           } else
                code = -1;
        } while (afs_Analyze(tc,
+                       rxconn,
                        code,
                        &pdir_fid,
                        areq,
@@ -1005,6 +1012,7 @@ int
 afs_SendChanges(struct vcache *avc, struct vrequest *areq)
 {
     struct afs_conn *tc;
+    struct rx_connection *rxconn;
     struct AFSStoreStatus sstat;
     struct AFSFetchStatus fstat;
     struct AFSVolSync tsync;
@@ -1018,12 +1026,12 @@ afs_SendChanges(struct vcache *avc, struct vrequest *areq)
        /* Turn dirty vc data into a new store status... */
        if (afs_GenStoreStatus(avc, &sstat) > 0) {
            do {
-               tc = afs_Conn(&avc->f.fid, areq, SHARED_LOCK);
+               tc = afs_Conn(&avc->f.fid, areq, SHARED_LOCK, &rxconn);
                if (tc) {
                    /* ... and send it. */
                    XSTATS_START_TIME(AFS_STATS_FS_RPCIDX_STORESTATUS);
                    RX_AFS_GUNLOCK();
-                   code = RXAFS_StoreStatus(tc->id,
+                   code = RXAFS_StoreStatus(rxconn,
                                (struct AFSFid *) &avc->f.fid.Fid,
                                &sstat,
                                &fstat,
@@ -1035,6 +1043,7 @@ afs_SendChanges(struct vcache *avc, struct vrequest *areq)
                    code = -1;
 
        } while (afs_Analyze(tc,
+                       rxconn,
                        code,
                        &avc->f.fid,
                        areq,
@@ -1056,7 +1065,7 @@ afs_SendChanges(struct vcache *avc, struct vrequest *areq)
 
        /* Truncate OP: */
        do {
-           tc = afs_Conn(&avc->f.fid, areq, SHARED_LOCK);
+           tc = afs_Conn(&avc->f.fid, areq, SHARED_LOCK, &rxconn);
            if (tc) {
                /* Set storing flags. XXX: A tad inefficient ... */
                if (avc->f.ddirty_flags & VDisconWriteClose)
@@ -1073,6 +1082,7 @@ afs_SendChanges(struct vcache *avc, struct vrequest *areq)
                code = -1;
 
        } while (afs_Analyze(tc,
+                       rxconn,
                        code,
                        &avc->f.fid,
                        areq,
@@ -1102,6 +1112,7 @@ int
 afs_ResyncDisconFiles(struct vrequest *areq, afs_ucred_t *acred)
 {
     struct afs_conn *tc;
+    struct rx_connection *rxconn;
     struct vcache *tvc;
     struct AFSFetchStatus fstat;
     struct AFSCallBack callback;
@@ -1142,11 +1153,11 @@ afs_ResyncDisconFiles(struct vrequest *areq, afs_ucred_t *acred)
 #if 0
        /* Get server write lock. */
        do {
-           tc = afs_Conn(&tvc->f.fid, areq, SHARED_LOCK);
+           tc = afs_Conn(&tvc->f.fid, areq, SHARED_LOCK, &rxconn);
            if (tc) {
                XSTATS_START_TIME(AFS_STATS_FS_RPCIDX_SETLOCK);
                RX_AFS_GUNLOCK();
-               code = RXAFS_SetLock(tc->id,
+               code = RXAFS_SetLock(rxconn,
                                        (struct AFSFid *)&tvc->f.fid.Fid,
                                        LockWrite,
                                        &tsync);
@@ -1156,6 +1167,7 @@ afs_ResyncDisconFiles(struct vrequest *areq, afs_ucred_t *acred)
                code = -1;
 
        } while (afs_Analyze(tc,
+                       rxconn,
                        code,
                        &tvc->f.fid,
                        areq,
@@ -1175,13 +1187,13 @@ afs_ResyncDisconFiles(struct vrequest *areq, afs_ucred_t *acred)
 
        /* Issue a FetchStatus to get info about DV and callbacks. */
        do {
-           tc = afs_Conn(&tvc->f.fid, areq, SHARED_LOCK);
+           tc = afs_Conn(&tvc->f.fid, areq, SHARED_LOCK, &rxconn);
            if (tc) {
-               tvc->callback = tc->srvr->server;
+               tvc->callback = tc->parent->srvr->server;
                start = osi_Time();
                XSTATS_START_TIME(AFS_STATS_FS_RPCIDX_FETCHSTATUS);
                RX_AFS_GUNLOCK();
-               code = RXAFS_FetchStatus(tc->id,
+               code = RXAFS_FetchStatus(rxconn,
                                (struct AFSFid *)&tvc->f.fid.Fid,
                                &fstat,
                                &callback,
@@ -1192,6 +1204,7 @@ afs_ResyncDisconFiles(struct vrequest *areq, afs_ucred_t *acred)
                code = -1;
 
        } while (afs_Analyze(tc,
+                       rxconn,
                        code,
                        &tvc->f.fid,
                        areq,
@@ -1221,7 +1234,7 @@ afs_ResyncDisconFiles(struct vrequest *areq, afs_ucred_t *acred)
        } else if (afs_ConflictPolicy == SERVER_WINS) {
            /* DV mismatch, apply collision resolution policy. */
            /* Discard this files chunks and remove from current dir. */
-           afs_ResetVCache(tvc, acred);
+           afs_ResetVCache(tvc, acred, 0);
            tvc->f.truncPos = AFS_NOTRUNC;
        } else {
            /* printf("afs_ResyncDisconFiles: no resolution policy selected.\n"); */
@@ -1231,11 +1244,11 @@ unlock_srv_file:
        /* Release server write lock. */
 #if 0
        do {
-           tc = afs_Conn(&tvc->f.fid, areq, SHARED_LOCK);
+           tc = afs_Conn(&tvc->f.fid, areq, SHARED_LOCK, &rxconn);
            if (tc) {
                XSTATS_START_TIME(AFS_STATS_FS_RPCIDX_RELEASELOCK);
                RX_AFS_GUNLOCK();
-               ucode = RXAFS_ReleaseLock(tc->id,
+               ucode = RXAFS_ReleaseLock(rxconn,
                                (struct AFSFid *) &tvc->f.fid.Fid,
                                &tsync);
                RX_AFS_GLOCK();
@@ -1243,6 +1256,7 @@ unlock_srv_file:
            } else
                ucode = -1;
        } while (afs_Analyze(tc,
+                       rxconn,
                        ucode,
                        &tvc->f.fid,
                        areq,
@@ -1313,7 +1327,7 @@ afs_DisconDiscardAllShadows(int squash, afs_ucred_t *acred)
        ObtainWriteLock(&tvc->lock, 706);
 
        if (squash)
-          afs_ResetVCache(tvc, acred);
+          afs_ResetVCache(tvc, acred, 0);
 
        afs_DeleteShadowDir(tvc);
 
@@ -1342,7 +1356,7 @@ afs_DisconDiscardAll(afs_ucred_t *acred)
        ReleaseWriteLock(&afs_disconDirtyLock);
 
        ObtainWriteLock(&tvc->lock, 718);
-       afs_ResetVCache(tvc, acred);
+       afs_ResetVCache(tvc, acred, 0);
        tvc->f.truncPos = AFS_NOTRUNC;
        ReleaseWriteLock(&tvc->lock);
        ObtainWriteLock(&afs_disconDirtyLock, 719);