libafs: Fix statistics for PrefetchFromTape pioctl

The PrefetchFromTape pioctl was overloading SetAcl's statistics. Give
it a slot of its own.

1.6-only: Also give a slot for the master-only PSetTokens2, so xstat
data will be more consistent across versions.

Reviewed-on: http://gerrit.openafs.org/4989
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
(cherry picked from commit 4e9a49c58aa1a6c910b01fe995739d0852c75dd4)

Change-Id: I718585a6ff6fcb39469bd6a007e6ebd2b59ef4fa
Reviewed-on: http://gerrit.openafs.org/9468
Reviewed-by: Derrick Brashear <shadow@your-file-system.com>
Reviewed-by: Andrew Deason <adeason@sinenomine.net>
Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>
Tested-by: BuildBot <buildbot@rampaginggeek.com>

diff --git a/src/afs/afs_pioctl.c b/src/afs/afs_pioctl.c
index 98919a3442b8d31d39b90dd95c674f50307655df..e941d2681b1d7ec2de3fa50904b65cb6ffc926ad 100644 (file)
--- a/src/afs/afs_pioctl.c
+++ b/src/afs/afs_pioctl.c
@@ -4880,7 +4880,7 @@ DECL_PIOCTL(PPrefetchFromTape)
     struct vcache *tvc;
     struct rx_connection *rxconn;
 
-    AFS_STATCNT(PSetAcl);
+    AFS_STATCNT(PPrefetchFromTape);
     if (!avc)
        return EINVAL;
 

diff --git a/src/afs/afs_stats.h b/src/afs/afs_stats.h
index d7abda4e497a6939c61602bdb0f4d32370d6aaff..3dcee64e5c43c3faabd6580c99e345894428723a 100644 (file)
--- a/src/afs/afs_stats.h
+++ b/src/afs/afs_stats.h
@@ -657,6 +657,8 @@ struct afs_CMCallStats {
     afs_int32 C_SRXAFSCB_GetCellByNum; /* afs_callback.c */
     afs_int32 C_BPrefetchNoCache;      /* afs_daemons.c */
     afs_int32 C_afs_ReadNoCache;       /* osi_vnodeops.c */
+    afs_int32 C_PSetTokens2;   /* afs_pioctl.c */
+    afs_int32 C_PPrefetchFromTape;     /* afs_pioctl.c */
 };
 
 struct afs_CMMeanStats {