DEVEL15-linux-warning-reduction-20090318

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

diff --git a/src/afs/afs_server.c b/src/afs/afs_server.c
index b2ed3ef..19f3092 100644 (file)
--- a/src/afs/afs_server.c
+++ b/src/afs/afs_server.c
@@ -275,7 +275,7 @@ afs_HaveCallBacksFrom(struct server *aserver)
             * from the required host
             */
            if (aserver == tvc->callback && tvc->cbExpires >= now
-               && ((tvc->states & CRO) == 0))
+               && ((tvc->f.states & CRO) == 0))
                return 1;
        }
     }
@@ -643,7 +643,7 @@ afs_CheckServers(int adown, struct cell *acellp)
     multi_Rx(rxconns,nconns)
       {
        tv.tv_sec = tv.tv_usec = 0;
-       multi_RXAFS_GetTime(&tv.tv_sec, &tv.tv_usec);
+       multi_RXAFS_GetTime((afs_uint32 *)&tv.tv_sec, (afs_uint32 *)&tv.tv_usec);
        tc = conns[multi_i];
        sa = tc->srvr;
        if (conntimer[multi_i] == 1)
@@ -1852,8 +1852,6 @@ void afs_ActivateServer(struct srvAddr *sap) {
     }
 }
 
-#ifdef AFS_DISCON_ENV
-
 void afs_RemoveAllConns()
 {
     int i;
@@ -1891,7 +1889,24 @@ void afs_RemoveAllConns()
     
 }
 
-#endif /* AFS_DISCON_ENV */
+void afs_MarkAllServersUp()
+{
+    int i;
+    struct server *ts;
+    struct srvAddr *sa;
+
+    ObtainWriteLock(&afs_xserver, 721);
+    ObtainWriteLock(&afs_xsrvAddr, 722);
+    for (i = 0; i< NSERVERS; i++) {
+       for (ts = afs_servers[i]; ts; ts = ts->next) {
+           for (sa = ts->addr; sa; sa = sa->next_sa) {
+               afs_MarkServerUpOrDown(sa, 0);
+           }
+       }
+    }
+    ReleaseWriteLock(&afs_xsrvAddr);
+    ReleaseWriteLock(&afs_xserver);
+}
 
 void shutdown_server()
 {