block-trace: update to 2.6.36

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/probes/block-trace.c b/probes/block-trace.c
index 51ae2cdd2c57d11435dd498c288e43758b7c80b1..fcb87d58f5a0504278211f81304e0fd421f88c21 100644 (file)
--- a/probes/block-trace.c
+++ b/probes/block-trace.c
@@ -19,10 +19,10 @@ void probe_block_rq_abort(void *data, struct request_queue *q, struct request *r
 {
        int rw = rq->cmd_flags & 0x03;
 
-       if (blk_discard_rq(rq))
-               rw |= (1 << BIO_RW_DISCARD);
+       if (rq->cmd_flags & REQ_DISCARD)
+               rw |= REQ_DISCARD;
 
-       if (blk_pc_request(rq)) {
+       if (rq->cmd_type == REQ_TYPE_BLOCK_PC) {
                trace_mark_tp(block, rq_abort_pc, block_rq_abort,
                        probe_block_rq_abort,
                        "data_len %u rw %d errors %d",
@@ -46,10 +46,10 @@ void probe_block_rq_insert(void *data, struct request_queue *q, struct request *
 {
        int rw = rq->cmd_flags & 0x03;
 
-       if (blk_discard_rq(rq))
-               rw |= (1 << BIO_RW_DISCARD);
+       if (rq->cmd_flags & REQ_DISCARD)
+               rw |= REQ_DISCARD;
 
-       if (blk_pc_request(rq)) {
+       if (rq->cmd_type == REQ_TYPE_BLOCK_PC) {
                trace_mark_tp(block, rq_insert_pc, block_rq_insert,
                        probe_block_rq_insert,
                        "data_len %u rw %d errors %d",
@@ -73,10 +73,10 @@ void probe_block_rq_issue(void *data, struct request_queue *q, struct request *r
 {
        int rw = rq->cmd_flags & 0x03;
 
-       if (blk_discard_rq(rq))
-               rw |= (1 << BIO_RW_DISCARD);
+       if (rq->cmd_flags & REQ_DISCARD)
+               rw |= REQ_DISCARD;
 
-       if (blk_pc_request(rq)) {
+       if (rq->cmd_type == REQ_TYPE_BLOCK_PC) {
                trace_mark_tp(block, rq_issue_pc, block_rq_issue,
                        probe_block_rq_issue,
                        "data_len %u rw %d errors %d",
@@ -100,10 +100,10 @@ void probe_block_rq_requeue(void *data, struct request_queue *q, struct request
 {
        int rw = rq->cmd_flags & 0x03;
 
-       if (blk_discard_rq(rq))
-               rw |= (1 << BIO_RW_DISCARD);
+       if (rq->cmd_flags & REQ_DISCARD)
+               rw |= REQ_DISCARD;
 
-       if (blk_pc_request(rq)) {
+       if (rq->cmd_type == REQ_TYPE_BLOCK_PC) {
                trace_mark_tp(block, rq_requeue_pc, block_rq_requeue,
                        probe_block_rq_requeue,
                        "data_len %u rw %d errors %d",
@@ -128,10 +128,10 @@ void probe_block_rq_complete(void *data, struct request_queue *q, struct request
 {
        int rw = rq->cmd_flags & 0x03;
 
-       if (blk_discard_rq(rq))
-               rw |= (1 << BIO_RW_DISCARD);
+       if (rq->cmd_flags & REQ_DISCARD)
+               rw |= REQ_DISCARD;
 
-       if (blk_pc_request(rq)) {
+       if (rq->cmd_type == REQ_TYPE_BLOCK_PC) {
                trace_mark_tp(block, rq_complete_pc, block_rq_complete,
                        probe_block_rq_complete,
                        "data_len %u rw %d errors %d",