[patch 14/30] cpu alloc: blktrace conversion

Christoph Lameter
2007-11-16T23:21:59Z

[-- Attachment #1: 0024-cpu-alloc-blktrace-conversion.patch --]
[-- Type: text/plain, Size: 1398 bytes --]

Signed-off-by: Christoph Lameter <clameter@sgi.com>
---
block/blktrace.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

Index: linux-2.6/block/blktrace.c
===================================================================
--- linux-2.6.orig/block/blktrace.c 2007-11-15 21:17:24.586154116 -0800
+++ linux-2.6/block/blktrace.c 2007-11-15 21:25:31.591154091 -0800
@@ -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);

--