summaryrefslogtreecommitdiff
path: root/fs/nfs
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2008-06-11 16:42:05 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2008-07-09 12:09:18 -0400
commit2e96d2867245668dbdb973729288cf69b9fafa66 (patch)
tree8f8b0642beaf0f7d53e31963328dfbc992c5ac88 /fs/nfs
parent34e8f92831cb5c40b3137e47a3daf4c09016ef02 (diff)
downloadlinux-3.10-2e96d2867245668dbdb973729288cf69b9fafa66.tar.gz
linux-3.10-2e96d2867245668dbdb973729288cf69b9fafa66.tar.bz2
linux-3.10-2e96d2867245668dbdb973729288cf69b9fafa66.zip
NFS: Fix a warning in nfs4_async_handle_error
We're not modifying the nfs_server when we call nfs_inc_server_stats and friends, so allow the compiler to pass 'const' pointers too. Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs')
-rw-r--r--fs/nfs/iostat.h8
-rw-r--r--fs/nfs/nfs4proc.c3
2 files changed, 5 insertions, 6 deletions
diff --git a/fs/nfs/iostat.h b/fs/nfs/iostat.h
index 2ec65e12bfe..a3695281003 100644
--- a/fs/nfs/iostat.h
+++ b/fs/nfs/iostat.h
@@ -19,7 +19,7 @@ struct nfs_iostats {
unsigned long events[__NFSIOS_COUNTSMAX];
} ____cacheline_aligned;
-static inline void nfs_inc_server_stats(struct nfs_server *server,
+static inline void nfs_inc_server_stats(const struct nfs_server *server,
enum nfs_stat_eventcounters stat)
{
struct nfs_iostats *iostats;
@@ -31,13 +31,13 @@ static inline void nfs_inc_server_stats(struct nfs_server *server,
put_cpu_no_resched();
}
-static inline void nfs_inc_stats(struct inode *inode,
+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(struct nfs_server *server,
+static inline void nfs_add_server_stats(const struct nfs_server *server,
enum nfs_stat_bytecounters stat,
unsigned long addend)
{
@@ -50,7 +50,7 @@ static inline void nfs_add_server_stats(struct nfs_server *server,
put_cpu_no_resched();
}
-static inline void nfs_add_stats(struct inode *inode,
+static inline void nfs_add_stats(const struct inode *inode,
enum nfs_stat_bytecounters stat,
unsigned long addend)
{
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index dfdd19a6d17..058723d9122 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -2756,8 +2756,7 @@ nfs4_async_handle_error(struct rpc_task *task, const struct nfs_server *server)
task->tk_status = 0;
return -EAGAIN;
case -NFS4ERR_DELAY:
- nfs_inc_server_stats((struct nfs_server *) server,
- NFSIOS_DELAY);
+ nfs_inc_server_stats(server, NFSIOS_DELAY);
case -NFS4ERR_GRACE:
rpc_delay(task, NFS4_POLL_RETRY_MAX);
task->tk_status = 0;