Commit 1b76d1df authored by Amir Goldstein's avatar Amir Goldstein Committed by Chuck Lever
Browse files

nfsd: remove unused stats counters 



Commit 501cb184 ("nfsd: rip out the raparms cache") removed the
code that updates read-ahead cache stats counters,
commit 8bbfa9f3 ("knfsd: remove the nfsd thread busy histogram")
removed code that updates the thread busy stats counters back in 2009
and code that updated filehandle cache stats was removed back in 2002.

Remove the unused stats counters from nfsd_stats struct and print
hardcoded zeros in /proc/net/rpc/nfsd.

Signed-off-by: default avatarAmir Goldstein <amir73il@gmail.com>
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
parent 9cee763e

fs/nfsd/stats.c

+16 −25
Original line number Diff line number Diff line
@@ -7,16 +7,14 @@ 
 * Format:

 *	rc <hits> <misses> <nocache>

 *			Statistsics for the reply cache

 *	fh <stale> <total-lookups> <anonlookups> <dir-not-in-dcache> <nondir-not-in-dcache>

 *	fh <stale> <deprecated filehandle cache stats>

 *			statistics for filehandle lookup

 *	io <bytes-read> <bytes-written>

 *			statistics for IO throughput

 *	th <threads> <fullcnt> <10%-20%> <20%-30%> ... <90%-100%> <100%> 

 *			time (seconds) when nfsd thread usage above thresholds

 *			and number of times that all threads were in use

 *	ra cache-size  <10%  <20%  <30% ... <100% not-found

 *			number of times that read-ahead entry was found that deep in

 *			the cache.

 *	th <threads> <deprecated thread usage histogram stats>

 *			number of threads

 *	ra <deprecated ra-cache stats>

 *

 *	plus generic RPC stats (see net/sunrpc/stats.c)

 *

 * Copyright (C) 1995, 1996, 1997 Olaf Kirch <okir@monad.swb.de>
@@ -38,30 +36,23 @@ static int nfsd_proc_show(struct seq_file *seq, void *v) 
{

	int i;



	seq_printf(seq, "rc %u %u %u\nfh %u %u %u %u %u\nio %u %u\n",

	seq_printf(seq, "rc %u %u %u\nfh %u 0 0 0 0\nio %u %u\n",

		      nfsdstats.rchits,

		      nfsdstats.rcmisses,

		      nfsdstats.rcnocache,

		      nfsdstats.fh_stale,

		      nfsdstats.fh_lookup,

		      nfsdstats.fh_anon,

		      nfsdstats.fh_nocache_dir,

		      nfsdstats.fh_nocache_nondir,

		      nfsdstats.io_read,

		      nfsdstats.io_write);



	/* thread usage: */

	seq_printf(seq, "th %u %u", nfsdstats.th_cnt, nfsdstats.th_fullcnt);

	for (i=0; i<10; i++) {

		unsigned int jifs = nfsdstats.th_usage[i];

		unsigned int sec = jifs / HZ, msec = (jifs % HZ)*1000/HZ;

		seq_printf(seq, " %u.%03u", sec, msec);

	}

	seq_printf(seq, "th %u 0", nfsdstats.th_cnt);



	/* newline and ra-cache */

	seq_printf(seq, "\nra %u", nfsdstats.ra_size);

	for (i=0; i<11; i++)

		seq_printf(seq, " %u", nfsdstats.ra_depth[i]);

	seq_putc(seq, '\n');

	/* deprecated thread usage histogram stats */

	for (i = 0; i < 10; i++)

		seq_puts(seq, " 0.000");



	/* deprecated ra-cache stats */

	seq_puts(seq, "\nra 0 0 0 0 0 0 0 0 0 0 0 0\n");



	/* show my rpc info */

	svc_seq_show(seq, &nfsd_svcstats);

fs/nfsd/stats.h

+0 −10
Original line number Diff line number Diff line
@@ -15,19 +15,9 @@ struct nfsd_stats { 
	unsigned int	rcmisses;	/* repcache hits */

	unsigned int	rcnocache;	/* uncached reqs */

	unsigned int	fh_stale;	/* FH stale error */

	unsigned int	fh_lookup;	/* dentry cached */

	unsigned int	fh_anon;	/* anon file dentry returned */

	unsigned int	fh_nocache_dir;	/* filehandle not found in dcache */

	unsigned int	fh_nocache_nondir;	/* filehandle not found in dcache */

	unsigned int	io_read;	/* bytes returned to read requests */

	unsigned int	io_write;	/* bytes passed in write requests */

	unsigned int	th_cnt;		/* number of available threads */

	unsigned int	th_usage[10];	/* number of ticks during which n perdeciles

					 * of available threads were in use */

	unsigned int	th_fullcnt;	/* number of times last free thread was used */

	unsigned int	ra_size;	/* size of ra cache */

	unsigned int	ra_depth[11];	/* number of times ra entry was found that deep

					 * in the cache (10percentiles). [10] = not found */

#ifdef CONFIG_NFSD_V4

	unsigned int	nfs4_opcount[LAST_NFS4_OP + 1];	/* count of individual nfsv4 operations */

#endif