STABLE14-qremove-set-null-20060217

when we remove an object from a queue null its list pointers

(cherry picked from commit 55bdee41e635da3396ddd25234b3d5910921c1d5)

diff --git a/src/afs/afs.h b/src/afs/afs.h
index 177bbdcbe2c80fee38894878c7b830c4a3f2507c..6b0b511dd7f8f5d7335954dda01cb3e9ff73000e 100644 (file)
--- a/src/afs/afs.h
+++ b/src/afs/afs.h
@@ -315,7 +315,7 @@ struct conn {
 #define        QInit(q)    ((q)->prev = (q)->next = (q))
 #define        QAdd(q,e)   ((e)->next = (q)->next, (e)->prev = (q), \
                        (q)->next->prev = (e), (q)->next = (e))
-#define        QRemove(e)  ((e)->next->prev = (e)->prev, (e)->prev->next = (e)->next)
+#define        QRemove(e)  ((e)->next->prev = (e)->prev, (e)->prev->next = (e)->next, (e)->prev = NULL, (e)->next = NULL)
 #define        QNext(e)    ((e)->next)
 #define QPrev(e)    ((e)->prev)
 #define QEmpty(q)   ((q)->prev == (q))

diff --git a/src/afs/afs_cbqueue.c b/src/afs/afs_cbqueue.c
index 3b98d3eaae92208e3523fe75bb36e7a2e7dfc144..451a01f1ffb7a2620b26344f59437f81a413962e 100644 (file)
--- a/src/afs/afs_cbqueue.c
+++ b/src/afs/afs_cbqueue.c
@@ -141,7 +141,6 @@ afs_DequeueCallback(struct vcache *avc)
     debugvc = avc;
     if (avc->callsort.prev) {
        QRemove(&(avc->callsort));
-       avc->callsort.prev = avc->callsort.next = NULL;
     } else;                    /* must have got dequeued in a race */
 
     return;
@@ -220,7 +219,6 @@ afs_CheckCallbacks(unsigned int secs)
                            /* What about locking xvcache or vrefcount++ or
                             * write locking tvc? */
                            QRemove(tq);
-                           tq->prev = tq->next = NULL;
                            tvc->states &= ~(CStatd | CMValid | CUnique);
                             if (!(tvc->states & CVInit) &&
                                 (tvc->fid.Fid.Vnode & 1 ||
@@ -238,7 +236,6 @@ afs_CheckCallbacks(unsigned int secs)
                 * What about locking xvcache or vrefcount++ or write locking tvc?
                 */
                QRemove(tq);
-               tq->prev = tq->next = NULL;
                tvc->states &= ~(CStatd | CMValid | CUnique);
                 if (!(tvc->states & CVInit) &&
                     (tvc->fid.Fid.Vnode & 1 || (vType(tvc) == VDIR)))
@@ -311,7 +308,8 @@ afs_FlushCBs(void)
            tvc->callback = 0;
            tvc->dchint = NULL; /* invalidate hints */
            tvc->states &= ~(CStatd);
-           tvc->callsort.prev = tvc->callsort.next = NULL;
+           if (QPrev(&(tvc->callsort)))
+               QRemove(&(tvc->callsort));
            if (!(tvc->states & CVInit) &&
                 ((tvc->fid.Fid.Vnode & 1) || (vType(tvc) == VDIR)))
                osi_dnlc_purgedp(tvc);

diff --git a/src/afs/afs_vcache.c b/src/afs/afs_vcache.c
index 6f70fc9a5112d7e8bc4b341c22bb62983903372e..841d3bb7ec299daec8b3eb2151373e7757f56fd8 100644 (file)
--- a/src/afs/afs_vcache.c
+++ b/src/afs/afs_vcache.c
@@ -163,7 +163,6 @@ afs_FlushVCache(struct vcache *avc, int *slept)
     avc->states |= CVFlushed;
     /* pull the entry out of the lruq and put it on the free list */
     QRemove(&avc->vlruq);
-    avc->vlruq.prev = avc->vlruq.next = (struct afs_q *)0;
 
     /* keep track of # of files that we bulk stat'd, but never used
      * before they got recycled.