[patch 13/28] cpu alloc: blktrace conversion

Christoph Lameter
2007-11-06T20:01:38Z

[-- Attachment #1: cpu_alloc_blktrace --]
[-- Type: text/plain, Size: 1825 bytes --]

Signed-off-by: Christoph Lameter <clameter@sgi.com>

---
block/blktrace.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)

Index: linux-2.6/block/blktrace.c
===================================================================
--- linux-2.6.orig/block/blktrace.c 2007-11-04 13:14:44.000000000 -0800
+++ linux-2.6/block/blktrace.c 2007-11-04 13:16:22.000000000 -0800
@@ -18,12 +18,12 @@
#include <linux/kernel.h>
#include <linux/blkdev.h>
#include <linux/blktrace_api.h>
-#include <linux/percpu.h>
#include <linux/init.h>
#include <linux/mutex.h>
#include <linux/debugfs.h>
#include <linux/time.h>
#include <asm/uaccess.h>
+#include <linux/cpu_alloc.h>

static DEFINE_PER_CPU(unsigned long long, blk_trace_cpu_offset) = { 0, };
static unsigned int blktrace_seq __read_mostly = 1;
@@ -155,7 +155,7 @@ void __blk_add_trace(struct blk_trace *b
t = relay_reserve(bt->rchan, sizeof(*t) + pdu_len);
if (t) {
cpu = smp_processor_id();
- sequence = per_cpu_ptr(bt->sequence, cpu);
+ sequence = CPU_PTR(bt->sequence, cpu);

t->magic = BLK_IO_TRACE_MAGIC | BLK_IO_TRACE_VERSION;
t->sequence = ++(*sequence);
@@ -227,7 +227,7 @@ static void blk_trace_cleanup(struct blk
relay_close(bt->rchan);
debugfs_remove(bt->dropped_file);
blk_remove_tree(bt->dir);
- free_percpu(bt->sequence);
+ CPU_FREE(bt->sequence);
kfree(bt);
}

@@ -338,7 +338,7 @@ int do_blk_trace_setup(struct request_qu
if (!bt)
goto err;

- bt->sequence = alloc_percpu(unsigned long);
+ bt->sequence = CPU_ALLOC(unsigned long, GFP_KERNEL | __GFP_ZERO);
if (!bt->sequence)
goto err;

@@ -387,7 +387,7 @@ err:
if (bt) {
if (bt->dropped_file)
debugfs_remove(bt->dropped_file);
- free_percpu(bt->sequence);
+ CPU_FREE(bt->sequence);
if (bt->rchan)
relay_close(bt->rchan);
kfree(bt);

--