From a161dfb5864f306c93a6ef6e93cd3c591b16529a Mon Sep 17 00:00:00 2001
From: Christoph Lameter <cl@linux-foundation.org>
Date: Sat, 3 Oct 2009 19:48:22 +0900
Subject: [PATCH] --- yaml --- r: 175891 b: refs/heads/master c:
 fce22848a1e9887d92c2a975494b69149808750e h: refs/heads/master i:   175889:
 1c1f70510e8a1d843e183f947b1ccb084f90de1e   175887:
 3ba6903b56009b6f4cd0c3fd914a57179ebe5591 v: v3

---
 [refs]                |  2 +-
 trunk/fs/nfs/iostat.h | 24 +++---------------------
 2 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/[refs] b/[refs]
index 71ed2cd6071b..e38cf00c1d0e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4eb41d10c7ab419a1408bed2e63a9c0fdfa38844
+refs/heads/master: fce22848a1e9887d92c2a975494b69149808750e
diff --git a/trunk/fs/nfs/iostat.h b/trunk/fs/nfs/iostat.h
index ceda50aad73c..46d779abafd3 100644
--- a/trunk/fs/nfs/iostat.h
+++ b/trunk/fs/nfs/iostat.h
@@ -25,13 +25,7 @@ struct nfs_iostats {
 static inline void nfs_inc_server_stats(const struct nfs_server *server,
 					enum nfs_stat_eventcounters stat)
 {
-	struct nfs_iostats *iostats;
-	int cpu;
-
-	cpu = get_cpu();
-	iostats = per_cpu_ptr(server->io_stats, cpu);
-	iostats->events[stat]++;
-	put_cpu();
+	this_cpu_inc(server->io_stats->events[stat]);
 }
 
 static inline void nfs_inc_stats(const struct inode *inode,
@@ -44,13 +38,7 @@ static inline void nfs_add_server_stats(const struct nfs_server *server,
 					enum nfs_stat_bytecounters stat,
 					unsigned long addend)
 {
-	struct nfs_iostats *iostats;
-	int cpu;
-
-	cpu = get_cpu();
-	iostats = per_cpu_ptr(server->io_stats, cpu);
-	iostats->bytes[stat] += addend;
-	put_cpu();
+	this_cpu_add(server->io_stats->bytes[stat], addend);
 }
 
 static inline void nfs_add_stats(const struct inode *inode,
@@ -65,13 +53,7 @@ static inline void nfs_add_fscache_stats(struct inode *inode,
 					 enum nfs_stat_fscachecounters stat,
 					 unsigned long addend)
 {
-	struct nfs_iostats *iostats;
-	int cpu;
-
-	cpu = get_cpu();
-	iostats = per_cpu_ptr(NFS_SERVER(inode)->io_stats, cpu);
-	iostats->fscache[stat] += addend;
-	put_cpu();
+	this_cpu_add(NFS_SERVER(inode)->io_stats->fscache[stat], addend);
 }
 #endif