From 670381aa5d3a7bc91ad74c7499605cca2c33d612 Mon Sep 17 00:00:00 2001 From: Mark Vitale Date: Wed, 18 Nov 2015 15:09:37 -0500 Subject: [PATCH] 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. Change-Id: Ic5dbc1a5871d0e0ff184dc4f3b11e92166c92f65 Reviewed-on: http://gerrit.openafs.org/12106 Tested-by: BuildBot Reviewed-by: Benjamin Kaduk --- src/vlserver/vlprocs.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/vlserver/vlprocs.c b/src/vlserver/vlprocs.c index 7eb99fe52..78f9ba6b1 100644 --- a/src/vlserver/vlprocs.c +++ b/src/vlserver/vlprocs.c @@ -624,6 +624,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 ((code = Init_VLdbase(&ctx, LOCKREAD, this_op))) -- 2.39.5