From 43fc8f861fba55951e6e052b88525d9de0223ae0 Mon Sep 17 00:00:00 2001
From: Jens Axboe <axboe@suse.de>
Date: Sat, 22 Jul 2006 15:37:43 +0200
Subject: [PATCH] --- yaml --- r: 37550 b: refs/heads/master c:
 4a893e837bb470867d74c05d6c6b97bba5a96185 h: refs/heads/master v: v3

---
 [refs]                         |  2 +-
 trunk/include/linux/elevator.h | 25 +++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 8319007e1da2..0b30037f6e2c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fc46379daf90dce57bf765c81d3b39f55150aac2
+refs/heads/master: 4a893e837bb470867d74c05d6c6b97bba5a96185
diff --git a/trunk/include/linux/elevator.h b/trunk/include/linux/elevator.h
index cc81645a3e18..9c5a04f6114c 100644
--- a/trunk/include/linux/elevator.h
+++ b/trunk/include/linux/elevator.h
@@ -1,6 +1,8 @@
 #ifndef _LINUX_ELEVATOR_H
 #define _LINUX_ELEVATOR_H
 
+#include <linux/percpu.h>
+
 typedef int (elevator_merge_fn) (request_queue_t *, struct request **,
 				 struct bio *);
 
@@ -178,4 +180,27 @@ enum {
 	INIT_LIST_HEAD(&(rq)->donelist);	\
 	} while (0)
 
+/*
+ * io context count accounting
+ */
+#define elv_ioc_count_mod(name, __val)				\
+	do {							\
+		preempt_disable();				\
+		__get_cpu_var(name) += (__val);			\
+		preempt_enable();				\
+	} while (0)
+
+#define elv_ioc_count_inc(name)	elv_ioc_count_mod(name, 1)
+#define elv_ioc_count_dec(name)	elv_ioc_count_mod(name, -1)
+
+#define elv_ioc_count_read(name)				\
+({								\
+	unsigned long __val = 0;				\
+	int __cpu;						\
+	smp_wmb();						\
+	for_each_possible_cpu(__cpu)				\
+		__val += per_cpu(name, __cpu);			\
+	__val;							\
+})
+
 #endif