linux-stable.git/include/linux/blktrace_api.h, branch linux-2.6.30.y

Merge branch 'linus' into tracing/blktrace

2009-02-19T08:00:35+00:00

Conflicts:
	block/blktrace.c

Semantic merge:
	kernel/trace/blktrace.c

Signed-off-by: Ingo Molnar

block: fix bad definition of BIO_RW_SYNC

2009-02-18T09:32:00+00:00

We can't OR shift values, so get rid of BIO_RW_SYNC and use BIO_RW_SYNCIO
and BIO_RW_UNPLUG explicitly. This brings back the behaviour from before
213d9417fec62ef4c3675621b9364a667954d4dd.

Signed-off-by: Jens Axboe

Merge branches 'tracing/ftrace', 'tracing/kmemtrace' and 'linus' into tracing/core

2009-02-03T05:25:38+00:00

headers_check fix: linux/blktrace_api.h

2009-01-30T18:10:35+00:00

fix the following 'make headers_check' warning:

  usr/include/linux/blktrace_api.h:96: found __[us]{8,16,32,64} type without #include 

Signed-off-by: Jaswinder Singh Rajput

tracing/blktrace: fix up checkpatch reported problems in ftrace plugin patch

2009-01-26T17:30:01+00:00

Also make sure sparse (make C=2 block/blktrace.o) is happy too.

Reported-by: Ingo Molnar 
Signed-off-by: Arnaldo Carvalho de Melo 
Signed-off-by: Ingo Molnar

blktrace: port to tracepoints

2008-11-26T11:13:34+00:00

This was a forward port of work done by Mathieu Desnoyers, I changed it to
encode the 'what' parameter on the tracepoint name, so that one can register
interest in specific events and not on classes of events to then check the
'what' parameter.

Signed-off-by: Arnaldo Carvalho de Melo 
Signed-off-by: Jens Axboe 
Signed-off-by: Ingo Molnar

blktrace: add support for driver data

2008-10-17T06:46:57+00:00

This patch adds the new api call blk_add_driver_data() to blktrace.
It allows to trace device driver-specific binary data.

Signed-off-by: Stefan Raspl 
Signed-off-by: Martin Peschke 
Signed-off-by: Jens Axboe

blktrace: use BLKTRACE_BDEV_SIZE as the name size for setup structure

2008-10-09T06:56:20+00:00

Define as 32, which is is what BDEVNAME_SIZE is/was as well. This keeps
the user interface the same and gets rid of the difference between
kernel and user api here.

Signed-off-by: Jens Axboe

include blktrace_api.h in headers_install

2008-10-09T06:56:19+00:00

This header file is of interest for user space programming, i.e.
for tools that process blktrace data.

We would like to use it for a tool on-top of blktrace which processes
data provided by blktrace. For this purpose, it would be helpful
if the blktrace API would make it to /usr/include/linux.

The git tree for the blktrace tools comes with its own copy of this header
file. I didn't manage to replace that copy with the file generated
by the patch below yet. A few more cleanups would be needed.
For example, the blktrace ioctl numbers, which are currently defined in
usr/include/fs.h, might need to be moved. Should be feasible, though.

Signed-off-by: Sven Schuetz 
Signed-off-by: Martin Peschke 
Signed-off-by: Jens Axboe

block: Add interface to abort queued requests

2008-10-09T06:56:13+00:00

Signed-off-by: Mike Anderson 
Signed-off-by: Jens Axboe