From 393a20d0b5138e8f4e42273ac4c8942bfd84a2f6 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Sun, 24 Oct 2010 20:35:25 -0400 Subject: [PATCH] block-trace: update to 2.6.36 Signed-off-by: Mathieu Desnoyers --- probes/block-trace.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/probes/block-trace.c b/probes/block-trace.c index 51ae2cdd..fcb87d58 100644 --- 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", -- 2.34.1