From a5f88f8392c6737f43e6c74fccf1ce4e837e2462 Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Wed, 11 Jun 2008 16:42:05 -0400
Subject: [PATCH] --- yaml --- r: 101925 b: refs/heads/master c:
 2e96d2867245668dbdb973729288cf69b9fafa66 h: refs/heads/master i:   101923:
 d6510ac2a833340fa3818d7aa4b27e11450a5f61 v: v3

---
 [refs]                  | 2 +-
 trunk/fs/nfs/iostat.h   | 8 ++++----
 trunk/fs/nfs/nfs4proc.c | 3 +--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index a89e870b2ee5..1626a447f534 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 34e8f92831cb5c40b3137e47a3daf4c09016ef02
+refs/heads/master: 2e96d2867245668dbdb973729288cf69b9fafa66
diff --git a/trunk/fs/nfs/iostat.h b/trunk/fs/nfs/iostat.h
index 2ec65e12bfed..a36952810032 100644
--- a/trunk/fs/nfs/iostat.h
+++ b/trunk/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/trunk/fs/nfs/nfs4proc.c b/trunk/fs/nfs/nfs4proc.c
index dfdd19a6d17e..058723d9122d 100644
--- a/trunk/fs/nfs/nfs4proc.c
+++ b/trunk/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;