Commit 0631d5e0 authored by Dave Wysochanski's avatar Dave Wysochanski Committed by Anna Schumaker
Browse files

NFS: Remove all NFSIOS_FSCACHE counters due to conversion to netfs API 



The old NFSIOS_FSCACHE counters are no longer accurate or useful with
the conversion to the new netfs API.  The new API does not have a page
based interface, and so the counters in nfs_stat_fscachecounters are
no longer obtainable.  The new netfs the API has extensive statistics
inside /proc/fs/fscache/stats so we no longer need NFS specific fscache
stats.

Note this also removes the 'fsc:' line from /proc/self/mountstats so
it will be a user-visible change.

Signed-off-by: default avatarDave Wysochanski <dwysocha@redhat.com>
Reviewed-by: default avatarJeff Layton <jlayton@kernel.org>
Tested-by: default avatarDaire Byrne <daire@dneg.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent 000dbe0b

fs/nfs/iostat.h

+0 −17
Original line number Diff line number Diff line
@@ -17,9 +17,6 @@ 


struct nfs_iostats {

	unsigned long long	bytes[__NFSIOS_BYTESMAX];

#ifdef CONFIG_NFS_FSCACHE

	unsigned long long	fscache[__NFSIOS_FSCACHEMAX];

#endif

	unsigned long		events[__NFSIOS_COUNTSMAX];

} ____cacheline_aligned;
@@ -49,20 +46,6 @@ static inline void nfs_add_stats(const struct inode *inode, 
	nfs_add_server_stats(NFS_SERVER(inode), stat, addend);

}



#ifdef CONFIG_NFS_FSCACHE

static inline void nfs_add_fscache_stats(struct inode *inode,

					 enum nfs_stat_fscachecounters stat,

					 long addend)

{

	this_cpu_add(NFS_SERVER(inode)->io_stats->fscache[stat], addend);

}

static inline void nfs_inc_fscache_stats(struct inode *inode,

					 enum nfs_stat_fscachecounters stat)

{

	this_cpu_inc(NFS_SERVER(inode)->io_stats->fscache[stat]);

}

#endif



static inline struct nfs_iostats __percpu *nfs_alloc_iostats(void)

{

	return alloc_percpu(struct nfs_iostats);

fs/nfs/super.c

+0 −11
Original line number Diff line number Diff line
@@ -692,10 +692,6 @@ int nfs_show_stats(struct seq_file *m, struct dentry *root) 
			totals.events[i] += stats->events[i];

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

			totals.bytes[i] += stats->bytes[i];

#ifdef CONFIG_NFS_FSCACHE

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

			totals.fscache[i] += stats->fscache[i];

#endif



		preempt_enable();

	}
@@ -706,13 +702,6 @@ int nfs_show_stats(struct seq_file *m, struct dentry *root) 
	seq_puts(m, "\n\tbytes:\t");

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

		seq_printf(m, "%Lu ", totals.bytes[i]);

#ifdef CONFIG_NFS_FSCACHE

	if (nfss->options & NFS_OPTION_FSCACHE) {

		seq_puts(m, "\n\tfsc:\t");

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

			seq_printf(m, "%Lu ", totals.fscache[i]);

	}

#endif

	seq_putc(m, '\n');



	rpc_clnt_show_stats(m, nfss->client);

include/linux/nfs_iostat.h

+0 −12
Original line number Diff line number Diff line
@@ -119,16 +119,4 @@ enum nfs_stat_eventcounters { 
	__NFSIOS_COUNTSMAX,

};



/*

 * NFS local caching servicing counters

 */

enum nfs_stat_fscachecounters {

	NFSIOS_FSCACHE_PAGES_READ_OK,

	NFSIOS_FSCACHE_PAGES_READ_FAIL,

	NFSIOS_FSCACHE_PAGES_WRITTEN_OK,

	NFSIOS_FSCACHE_PAGES_WRITTEN_FAIL,

	NFSIOS_FSCACHE_PAGES_UNCACHED,

	__NFSIOS_FSCACHEMAX,

};



#endif	/* _LINUX_NFS_IOSTAT */