dfe52c0419
Clean up:
fs/nfs/iostat.h: In function ‘nfs_add_server_stats’:
fs/nfs/iostat.h:41: warning: comparison between signed and unsigned integer expressions
fs/nfs/iostat.h:41: warning: comparison between signed and unsigned integer expressions
fs/nfs/iostat.h:41: warning: comparison between signed and unsigned integer expressions
fs/nfs/iostat.h:41: warning: comparison between signed and unsigned integer expressions
Commit fce22848 replaced the open-coded per-cpu logic in several
functions in fs/nfs/iostat.h with a single invocation of
this_cpu_ptr(). This macro assumes its second argument is signed,
not unsigned.
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
71 lines
1.6 KiB
C
71 lines
1.6 KiB
C
/*
|
|
* linux/fs/nfs/iostat.h
|
|
*
|
|
* Declarations for NFS client per-mount statistics
|
|
*
|
|
* Copyright (C) 2005, 2006 Chuck Lever <cel@netapp.com>
|
|
*
|
|
*/
|
|
|
|
#ifndef _NFS_IOSTAT
|
|
#define _NFS_IOSTAT
|
|
|
|
#include <linux/percpu.h>
|
|
#include <linux/cache.h>
|
|
#include <linux/nfs_iostat.h>
|
|
|
|
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;
|
|
|
|
static inline void nfs_inc_server_stats(const struct nfs_server *server,
|
|
enum nfs_stat_eventcounters stat)
|
|
{
|
|
this_cpu_inc(server->io_stats->events[stat]);
|
|
}
|
|
|
|
static inline void nfs_inc_stats(const struct inode *inode,
|
|
enum nfs_stat_eventcounters stat)
|
|
{
|
|
nfs_inc_server_stats(NFS_SERVER(inode), stat);
|
|
}
|
|
|
|
static inline void nfs_add_server_stats(const struct nfs_server *server,
|
|
enum nfs_stat_bytecounters stat,
|
|
long addend)
|
|
{
|
|
this_cpu_add(server->io_stats->bytes[stat], addend);
|
|
}
|
|
|
|
static inline void nfs_add_stats(const struct inode *inode,
|
|
enum nfs_stat_bytecounters stat,
|
|
long addend)
|
|
{
|
|
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);
|
|
}
|
|
#endif
|
|
|
|
static inline struct nfs_iostats __percpu *nfs_alloc_iostats(void)
|
|
{
|
|
return alloc_percpu(struct nfs_iostats);
|
|
}
|
|
|
|
static inline void nfs_free_iostats(struct nfs_iostats __percpu *stats)
|
|
{
|
|
if (stats != NULL)
|
|
free_percpu(stats);
|
|
}
|
|
|
|
#endif /* _NFS_IOSTAT */
|