diff options
author | Jens Axboe <jens.axboe@oracle.com> | 2009-10-01 03:04:14 -0400 |
---|---|---|
committer | Jens Axboe <jens.axboe@oracle.com> | 2009-10-01 15:17:58 -0400 |
commit | 6a0afdf58d40200abd0c717261d1bc4c49195c2f (patch) | |
tree | 9ff7ca32d16e6ddb774105528fe051bd04695b3d /drivers/block/drbd/drbd_req.c | |
parent | ab8fafc2e1ecc0090f2c78902d3b992eec8b11f8 (diff) |
drbd: remove tracing bits
They should be reimplemented in the current scheme.
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'drivers/block/drbd/drbd_req.c')
-rw-r--r-- | drivers/block/drbd/drbd_req.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c index 1aaa397669a8..3678d3d66c6c 100644 --- a/drivers/block/drbd/drbd_req.c +++ b/drivers/block/drbd/drbd_req.c | |||
@@ -28,7 +28,6 @@ | |||
28 | #include <linux/slab.h> | 28 | #include <linux/slab.h> |
29 | #include <linux/drbd.h> | 29 | #include <linux/drbd.h> |
30 | #include "drbd_int.h" | 30 | #include "drbd_int.h" |
31 | #include "drbd_tracing.h" | ||
32 | #include "drbd_req.h" | 31 | #include "drbd_req.h" |
33 | 32 | ||
34 | 33 | ||
@@ -218,7 +217,6 @@ static void _about_to_complete_local_write(struct drbd_conf *mdev, | |||
218 | void complete_master_bio(struct drbd_conf *mdev, | 217 | void complete_master_bio(struct drbd_conf *mdev, |
219 | struct bio_and_error *m) | 218 | struct bio_and_error *m) |
220 | { | 219 | { |
221 | trace_drbd_bio(mdev, "Rq", m->bio, 1, NULL); | ||
222 | bio_endio(m->bio, m->error); | 220 | bio_endio(m->bio, m->error); |
223 | dec_ap_bio(mdev); | 221 | dec_ap_bio(mdev); |
224 | } | 222 | } |
@@ -236,8 +234,6 @@ void _req_may_be_done(struct drbd_request *req, struct bio_and_error *m) | |||
236 | /* only WRITES may end up here without a master bio (on barrier ack) */ | 234 | /* only WRITES may end up here without a master bio (on barrier ack) */ |
237 | int rw = req->master_bio ? bio_data_dir(req->master_bio) : WRITE; | 235 | int rw = req->master_bio ? bio_data_dir(req->master_bio) : WRITE; |
238 | 236 | ||
239 | trace_drbd_req(req, nothing, "_req_may_be_done"); | ||
240 | |||
241 | /* we must not complete the master bio, while it is | 237 | /* we must not complete the master bio, while it is |
242 | * still being processed by _drbd_send_zc_bio (drbd_send_dblock) | 238 | * still being processed by _drbd_send_zc_bio (drbd_send_dblock) |
243 | * not yet acknowledged by the peer | 239 | * not yet acknowledged by the peer |
@@ -415,8 +411,6 @@ void __req_mod(struct drbd_request *req, enum drbd_req_event what, | |||
415 | struct drbd_conf *mdev = req->mdev; | 411 | struct drbd_conf *mdev = req->mdev; |
416 | m->bio = NULL; | 412 | m->bio = NULL; |
417 | 413 | ||
418 | trace_drbd_req(req, what, NULL); | ||
419 | |||
420 | switch (what) { | 414 | switch (what) { |
421 | default: | 415 | default: |
422 | dev_err(DEV, "LOGIC BUG in %s:%u\n", __FILE__ , __LINE__); | 416 | dev_err(DEV, "LOGIC BUG in %s:%u\n", __FILE__ , __LINE__); |
@@ -666,7 +660,6 @@ void __req_mod(struct drbd_request *req, enum drbd_req_event what, | |||
666 | * this is bad, because if the connection is lost now, | 660 | * this is bad, because if the connection is lost now, |
667 | * we won't be able to clean them up... */ | 661 | * we won't be able to clean them up... */ |
668 | dev_err(DEV, "FIXME (barrier_acked but pending)\n"); | 662 | dev_err(DEV, "FIXME (barrier_acked but pending)\n"); |
669 | trace_drbd_req(req, nothing, "FIXME (barrier_acked but pending)"); | ||
670 | list_move(&req->tl_requests, &mdev->out_of_sequence_requests); | 663 | list_move(&req->tl_requests, &mdev->out_of_sequence_requests); |
671 | } | 664 | } |
672 | D_ASSERT(req->rq_state & RQ_NET_SENT); | 665 | D_ASSERT(req->rq_state & RQ_NET_SENT); |
@@ -736,8 +729,6 @@ static int drbd_make_request_common(struct drbd_conf *mdev, struct bio *bio) | |||
736 | return 0; | 729 | return 0; |
737 | } | 730 | } |
738 | 731 | ||
739 | trace_drbd_bio(mdev, "Rq", bio, 0, req); | ||
740 | |||
741 | local = get_ldev(mdev); | 732 | local = get_ldev(mdev); |
742 | if (!local) { | 733 | if (!local) { |
743 | bio_put(req->private_bio); /* or we get a bio leak */ | 734 | bio_put(req->private_bio); /* or we get a bio leak */ |
@@ -928,8 +919,6 @@ allocate_barrier: | |||
928 | if (local) { | 919 | if (local) { |
929 | req->private_bio->bi_bdev = mdev->ldev->backing_bdev; | 920 | req->private_bio->bi_bdev = mdev->ldev->backing_bdev; |
930 | 921 | ||
931 | trace_drbd_bio(mdev, "Pri", req->private_bio, 0, NULL); | ||
932 | |||
933 | if (FAULT_ACTIVE(mdev, rw == WRITE ? DRBD_FAULT_DT_WR | 922 | if (FAULT_ACTIVE(mdev, rw == WRITE ? DRBD_FAULT_DT_WR |
934 | : rw == READ ? DRBD_FAULT_DT_RD | 923 | : rw == READ ? DRBD_FAULT_DT_RD |
935 | : DRBD_FAULT_DT_RA)) | 924 | : DRBD_FAULT_DT_RA)) |