From 9de260a4c77931adbf9b92dd1ba4c6334c7a32f8 Mon Sep 17 00:00:00 2001 From: Jeffrey Altman Date: Fri, 28 Jul 2006 03:08:41 +0000 Subject: [PATCH] STABLE14-windows-remove-bad-asserts-20060728 remove assert()s that should simply be if() (cherry picked from commit a4211966d7f9d16dd2f93c9122ba09b4920dfd8e) --- src/WINNT/afsd/cm_scache.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/src/WINNT/afsd/cm_scache.c b/src/WINNT/afsd/cm_scache.c index c43cfca65..0763b72bb 100644 --- a/src/WINNT/afsd/cm_scache.c +++ b/src/WINNT/afsd/cm_scache.c @@ -1079,12 +1079,13 @@ void cm_SyncOpDone(cm_scache_t *scp, cm_buf_t *bufp, long flags) /* ensure that the buffer isn't already in the I/O list */ for(qdp = scp->bufReadsp; qdp; qdp = (osi_queueData_t *) osi_QNext(&qdp->q)) { tbufp = osi_GetQData(qdp); - if (tbufp == bufp) break; + if (tbufp == bufp) + break; } - osi_assert(qdp != NULL); - osi_assert(osi_GetQData(qdp) == bufp); - osi_QRemove((osi_queue_t **) &scp->bufReadsp, &qdp->q); - osi_QDFree(qdp); + if (qdp) { + osi_QRemove((osi_queue_t **) &scp->bufReadsp, &qdp->q); + osi_QDFree(qdp); + } if (bufp) { bufp->cmFlags &= ~(CM_BUF_CMFETCHING | CM_BUF_CMFULLYFETCHED); if (bufp->flags & CM_BUF_WAITING) { @@ -1100,12 +1101,13 @@ void cm_SyncOpDone(cm_scache_t *scp, cm_buf_t *bufp, long flags) /* ensure that the buffer isn't already in the I/O list */ for(qdp = scp->bufWritesp; qdp; qdp = (osi_queueData_t *) osi_QNext(&qdp->q)) { tbufp = osi_GetQData(qdp); - if (tbufp == bufp) break; + if (tbufp == bufp) + break; } - osi_assert(qdp != NULL); - osi_assert(osi_GetQData(qdp) == bufp); - osi_QRemove((osi_queue_t **) &scp->bufWritesp, &qdp->q); - osi_QDFree(qdp); + if (qdp) { + osi_QRemove((osi_queue_t **) &scp->bufWritesp, &qdp->q); + osi_QDFree(qdp); + } if (bufp) { bufp->cmFlags &= ~CM_BUF_CMSTORING; if (bufp->flags & CM_BUF_WAITING) { -- 2.39.5