From: Jeffrey Altman <jaltman@secure-endpoints.com>
Date: Sat, 14 Mar 2009 04:49:15 +0000 (+0000)
Subject: DEVEL15-windows-afsd-callback-20090312
X-Git-Tag: openafs-devel-1_5_58~120
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=44e15daff08f14553d2213d4d79e9448f4923c72;p=packages%2Fo%2Fopenafs.git

DEVEL15-windows-afsd-callback-20090312

LICENSE MIT

use cm_HaveCallback() to check for a call back instead of explicit
checks on cbExpires and cbServerp.  cm_HaveCallback takes into account
Freelance mode and offline status.


(cherry picked from commit ef81e9395c171f9dcb8df120991ba65ec1ca5610)
---

diff --git a/src/WINNT/afsd/cm_callback.c b/src/WINNT/afsd/cm_callback.c
index 47da75930..70538d1b2 100644
--- a/src/WINNT/afsd/cm_callback.c
+++ b/src/WINNT/afsd/cm_callback.c
@@ -190,8 +190,7 @@ void cm_RevokeCallback(struct rx_call *callp, cm_cell_t * cellp, AFSFid *fidp)
              scp->fid.vnode == tfid.vnode &&
              scp->fid.unique == tfid.unique &&
              (cellp == NULL || scp->fid.cell == cellp->cellID) &&
-             scp->cbExpires > 0 && 
-             scp->cbServerp != NULL)
+             cm_HaveCallback(scp))
         {
             cm_HoldSCacheNoLock(scp);
             lock_ReleaseWrite(&cm_scacheLock);