projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
[powerpc.git]
/
block
/
blktrace.c
diff --git
a/block/blktrace.c
b/block/blktrace.c
index
d3679dd
..
20fa034
100644
(file)
--- a/
block/blktrace.c
+++ b/
block/blktrace.c
@@
-41,7
+41,7
@@
static void trace_note(struct blk_trace *bt, pid_t pid, int action,
const int cpu = smp_processor_id();
t->magic = BLK_IO_TRACE_MAGIC | BLK_IO_TRACE_VERSION;
const int cpu = smp_processor_id();
t->magic = BLK_IO_TRACE_MAGIC | BLK_IO_TRACE_VERSION;
- t->time =
sched_clock(
) - per_cpu(blk_trace_cpu_offset, cpu);
+ t->time =
cpu_clock(cpu
) - per_cpu(blk_trace_cpu_offset, cpu);
t->device = bt->dev;
t->action = action;
t->pid = pid;
t->device = bt->dev;
t->action = action;
t->pid = pid;
@@
-159,7
+159,7
@@
void __blk_add_trace(struct blk_trace *bt, sector_t sector, int bytes,
t->magic = BLK_IO_TRACE_MAGIC | BLK_IO_TRACE_VERSION;
t->sequence = ++(*sequence);
t->magic = BLK_IO_TRACE_MAGIC | BLK_IO_TRACE_VERSION;
t->sequence = ++(*sequence);
- t->time =
sched_clock(
) - per_cpu(blk_trace_cpu_offset, cpu);
+ t->time =
cpu_clock(cpu
) - per_cpu(blk_trace_cpu_offset, cpu);
t->sector = sector;
t->bytes = bytes;
t->action = what;
t->sector = sector;
t->bytes = bytes;
t->action = what;
@@
-231,7
+231,7
@@
static void blk_trace_cleanup(struct blk_trace *bt)
kfree(bt);
}
kfree(bt);
}
-static int blk_trace_remove(
request_queue_t
*q)
+static int blk_trace_remove(
struct request_queue
*q)
{
struct blk_trace *bt;
{
struct blk_trace *bt;
@@
-264,7
+264,7
@@
static ssize_t blk_dropped_read(struct file *filp, char __user *buffer,
return simple_read_from_buffer(buffer, count, ppos, buf, strlen(buf));
}
return simple_read_from_buffer(buffer, count, ppos, buf, strlen(buf));
}
-static struct file_operations blk_dropped_fops = {
+static
const
struct file_operations blk_dropped_fops = {
.owner = THIS_MODULE,
.open = blk_dropped_open,
.read = blk_dropped_read,
.owner = THIS_MODULE,
.open = blk_dropped_open,
.read = blk_dropped_read,
@@
-312,7
+312,7
@@
static struct rchan_callbacks blk_relay_callbacks = {
/*
* Setup everything required to start tracing
*/
/*
* Setup everything required to start tracing
*/
-static int blk_trace_setup(
request_queue_t
*q, struct block_device *bdev,
+static int blk_trace_setup(
struct request_queue
*q, struct block_device *bdev,
char __user *arg)
{
struct blk_user_trace_setup buts;
char __user *arg)
{
struct blk_user_trace_setup buts;
@@
-363,10
+363,9
@@
static int blk_trace_setup(request_queue_t *q, struct block_device *bdev,
if (!bt->dropped_file)
goto err;
if (!bt->dropped_file)
goto err;
- bt->rchan = relay_open("trace", dir, buts.buf_size, buts.buf_nr, &blk_relay_callbacks);
+ bt->rchan = relay_open("trace", dir, buts.buf_size, buts.buf_nr, &blk_relay_callbacks
, bt
);
if (!bt->rchan)
goto err;
if (!bt->rchan)
goto err;
- bt->rchan->private_data = bt;
bt->act_mask = buts.act_mask;
if (!bt->act_mask)
bt->act_mask = buts.act_mask;
if (!bt->act_mask)
@@
-402,7
+401,7
@@
err:
return ret;
}
return ret;
}
-static int blk_trace_startstop(
request_queue_t
*q, int start)
+static int blk_trace_startstop(
struct request_queue
*q, int start)
{
struct blk_trace *bt;
int ret;
{
struct blk_trace *bt;
int ret;
@@
-445,7
+444,7
@@
static int blk_trace_startstop(request_queue_t *q, int start)
**/
int blk_trace_ioctl(struct block_device *bdev, unsigned cmd, char __user *arg)
{
**/
int blk_trace_ioctl(struct block_device *bdev, unsigned cmd, char __user *arg)
{
-
request_queue_t
*q;
+
struct request_queue
*q;
int ret, start = 0;
q = bdev_get_queue(bdev);
int ret, start = 0;
q = bdev_get_queue(bdev);
@@
-480,7
+479,7
@@
int blk_trace_ioctl(struct block_device *bdev, unsigned cmd, char __user *arg)
* @q: the request queue associated with the device
*
**/
* @q: the request queue associated with the device
*
**/
-void blk_trace_shutdown(
request_queue_t
*q)
+void blk_trace_shutdown(
struct request_queue
*q)
{
if (q->blk_trace) {
blk_trace_startstop(q, 0);
{
if (q->blk_trace) {
blk_trace_startstop(q, 0);
@@
-489,17
+488,17
@@
void blk_trace_shutdown(request_queue_t *q)
}
/*
}
/*
- * Average offset over two calls to
sched
_clock() with a gettimeofday()
+ * Average offset over two calls to
cpu
_clock() with a gettimeofday()
* in the middle
*/
* in the middle
*/
-static void blk_check_time(unsigned long long *t)
+static void blk_check_time(unsigned long long *t
, int this_cpu
)
{
unsigned long long a, b;
struct timeval tv;
{
unsigned long long a, b;
struct timeval tv;
- a =
sched_clock(
);
+ a =
cpu_clock(this_cpu
);
do_gettimeofday(&tv);
do_gettimeofday(&tv);
- b =
sched_clock(
);
+ b =
cpu_clock(this_cpu
);
*t = tv.tv_sec * 1000000000 + tv.tv_usec * 1000;
*t -= (a + b) / 2;
*t = tv.tv_sec * 1000000000 + tv.tv_usec * 1000;
*t -= (a + b) / 2;
@@
-511,16
+510,16
@@
static void blk_check_time(unsigned long long *t)
static void blk_trace_check_cpu_time(void *data)
{
unsigned long long *t;
static void blk_trace_check_cpu_time(void *data)
{
unsigned long long *t;
- int cpu = get_cpu();
+ int
this_
cpu = get_cpu();
- t = &per_cpu(blk_trace_cpu_offset, cpu);
+ t = &per_cpu(blk_trace_cpu_offset,
this_
cpu);
/*
* Just call it twice, hopefully the second call will be cache hot
* and a little more precise
*/
/*
* Just call it twice, hopefully the second call will be cache hot
* and a little more precise
*/
- blk_check_time(t);
- blk_check_time(t);
+ blk_check_time(t
, this_cpu
);
+ blk_check_time(t
, this_cpu
);
put_cpu();
}
put_cpu();
}