From: Mark Vitale <mvitale@sinenomine.net>
Date: Wed, 18 Nov 2015 20:09:37 +0000 (-0500)
Subject: vlserver: VL_GetEntryByName* requests undercounted
X-Git-Tag: upstream/1.6.18^2~16
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=7a0aa1f6148ef5190d2d1783ad4679b9fe75d24c;p=packages%2Fo%2Fopenafs.git

vlserver: VL_GetEntryByName* requests undercounted

Commit a14e791541bf19c6c377e68bc2f978fba34f94b1
refactored and corrected the counting of requests and aborts.
However, it inadvertently introduced a new undercount for
VL_GetEntryByName* requests, counting them only if
NameIsId(volname), e.g. volname="536870911".

Ensure that the normal case of a non-"numeric" volname is
also counted.

Discovered during review of pullup to 1.6.x.

Reviewed-on: http://gerrit.openafs.org/12106
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
(cherry picked from commit 670381aa5d3a7bc91ad74c7499605cca2c33d612)

Change-Id: Ic41f8775e4897efe5f6280b56d06d733865556a2
Reviewed-on: https://gerrit.openafs.org/12113
Reviewed-by: Mark Vitale <mvitale@sinenomine.net>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>
---

diff --git a/src/vlserver/vlprocs.c b/src/vlserver/vlprocs.c
index c6c35a2d6..cc3af1cfc 100644
--- a/src/vlserver/vlprocs.c
+++ b/src/vlserver/vlprocs.c
@@ -541,6 +541,9 @@ GetEntryByName(struct rx_call *rxcall,
     if (NameIsId(volname)) {
 	return GetEntryByID(rxcall, strtoul(volname, NULL, 10), -1, aentry, new, this_op);
     }
+
+    countRequest(this_op);
+
     if (InvalidVolname(volname))
 	return VL_BADNAME;
     if ((errorcode = Init_VLdbase(&ctx, LOCKREAD, this_op)))