DEVEL15-viced-cbstuff-20071205

LICENSE IPL10

Keep track of AddCallBack calls in cbstuff.

Increment cbstuff.DeleteCallBacks after holding H_LOCK

(cherry picked from commit 974ad01826f39c817834c6377cf2872177fa7031)

diff --git a/src/viced/callback.c b/src/viced/callback.c
index efef03b3db42e20de9aff9e2a4ac044d687a36da..809dce2d2763d8355772672451cbf90499287a0d 100644 (file)
--- a/src/viced/callback.c
+++ b/src/viced/callback.c
@@ -537,6 +537,8 @@ AddCallBack1_r(struct host *host, AFSFid * fid, afs_uint32 * thead, int type,
     struct CallBack *newcb = 0;
     int safety;
 
+    cbstuff.AddCallBacks++;
+
     host->Console |= 2;
 
     /* allocate these guys first, since we can't call the allocator with
@@ -861,9 +863,9 @@ DeleteCallBack(struct host *host, AFSFid * fid)
     register afs_uint32 *pcb;
     char hoststr[16];
 
+    H_LOCK;
     cbstuff.DeleteCallBacks++;
 
-    H_LOCK;
     h_Lock_r(host);
     fe = FindFE(fid);
     if (!fe) {