STABLE14-afs-blacklist-initialize-volume-ptr-always-20080628

LICENSE IPL10

always initialize this

(cherry picked from commit dff0d834a7c03d19d572d74849599ac89c2a058e)

diff --git a/src/afs/afs_analyze.c b/src/afs/afs_analyze.c
index 4e45671a54ce399ae5bb1519506ca9425b3b8fc7..8f119c327327cdb4442464f1aa480d46b714ae79 100644 (file)
--- a/src/afs/afs_analyze.c
+++ b/src/afs/afs_analyze.c
@@ -477,20 +477,21 @@ afs_BlackListOnce(struct vrequest *areq, struct VenusFid *afid,
     afs_int32 i;
     afs_int32 serversleft = 0;
 
-    if (afid)
+    if (afid) {
        tvp = afs_FindVolume(afid, READ_LOCK);
-    if (tvp) {
-       for (i = 0; i < MAXHOSTS; i++) {
-           if (tvp->serverHost[i] == tsp) {
-               areq->skipserver[i] = 1;
-           }
-           if (tvp->serverHost[i] &&
-               !(tvp->serverHost[i]->addr->sa_flags & 
-                 SRVR_ISDOWN)) {
-               areq->skipserver[i] = 1;
+       if (tvp) {
+           for (i = 0; i < MAXHOSTS; i++) {
+               if (tvp->serverHost[i] == tsp) {
+                   areq->skipserver[i] = 1;
+               }
+               if (tvp->serverHost[i] &&
+                   !(tvp->serverHost[i]->addr->sa_flags & 
+                     SRVR_ISDOWN)) {
+                   areq->skipserver[i] = 1;
+               }
            }
+           afs_PutVolume(tvp, READ_LOCK);
        }
-       afs_PutVolume(tvp, READ_LOCK);
     }
     for (i = 0; i < MAXHOSTS; i++) {
        if (areq->skipserver[i] == 0) {