diff options
Diffstat (limited to 'drivers/block/drbd/drbd_worker.c')
-rw-r--r-- | drivers/block/drbd/drbd_worker.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/drivers/block/drbd/drbd_worker.c b/drivers/block/drbd/drbd_worker.c index 34a4b3ef6c0e..ed8796f1112d 100644 --- a/drivers/block/drbd/drbd_worker.c +++ b/drivers/block/drbd/drbd_worker.c | |||
@@ -40,7 +40,6 @@ | |||
40 | 40 | ||
41 | #include "drbd_int.h" | 41 | #include "drbd_int.h" |
42 | #include "drbd_req.h" | 42 | #include "drbd_req.h" |
43 | #include "drbd_tracing.h" | ||
44 | 43 | ||
45 | #define SLEEP_TIME (HZ/10) | 44 | #define SLEEP_TIME (HZ/10) |
46 | 45 | ||
@@ -82,8 +81,6 @@ void drbd_md_io_complete(struct bio *bio, int error) | |||
82 | md_io = (struct drbd_md_io *)bio->bi_private; | 81 | md_io = (struct drbd_md_io *)bio->bi_private; |
83 | md_io->error = error; | 82 | md_io->error = error; |
84 | 83 | ||
85 | trace_drbd_bio(md_io->mdev, "Md", bio, 1, NULL); | ||
86 | |||
87 | complete(&md_io->event); | 84 | complete(&md_io->event); |
88 | } | 85 | } |
89 | 86 | ||
@@ -114,8 +111,6 @@ void drbd_endio_read_sec(struct bio *bio, int error) __releases(local) | |||
114 | 111 | ||
115 | D_ASSERT(e->block_id != ID_VACANT); | 112 | D_ASSERT(e->block_id != ID_VACANT); |
116 | 113 | ||
117 | trace_drbd_bio(mdev, "Sec", bio, 1, NULL); | ||
118 | |||
119 | spin_lock_irqsave(&mdev->req_lock, flags); | 114 | spin_lock_irqsave(&mdev->req_lock, flags); |
120 | mdev->read_cnt += e->size >> 9; | 115 | mdev->read_cnt += e->size >> 9; |
121 | list_del(&e->w.list); | 116 | list_del(&e->w.list); |
@@ -126,8 +121,6 @@ void drbd_endio_read_sec(struct bio *bio, int error) __releases(local) | |||
126 | drbd_chk_io_error(mdev, error, FALSE); | 121 | drbd_chk_io_error(mdev, error, FALSE); |
127 | drbd_queue_work(&mdev->data.work, &e->w); | 122 | drbd_queue_work(&mdev->data.work, &e->w); |
128 | put_ldev(mdev); | 123 | put_ldev(mdev); |
129 | |||
130 | trace_drbd_ee(mdev, e, "read completed"); | ||
131 | } | 124 | } |
132 | 125 | ||
133 | /* writes on behalf of the partner, or resync writes, | 126 | /* writes on behalf of the partner, or resync writes, |
@@ -176,8 +169,6 @@ void drbd_endio_write_sec(struct bio *bio, int error) __releases(local) | |||
176 | 169 | ||
177 | D_ASSERT(e->block_id != ID_VACANT); | 170 | D_ASSERT(e->block_id != ID_VACANT); |
178 | 171 | ||
179 | trace_drbd_bio(mdev, "Sec", bio, 1, NULL); | ||
180 | |||
181 | spin_lock_irqsave(&mdev->req_lock, flags); | 172 | spin_lock_irqsave(&mdev->req_lock, flags); |
182 | mdev->writ_cnt += e->size >> 9; | 173 | mdev->writ_cnt += e->size >> 9; |
183 | is_syncer_req = is_syncer_block_id(e->block_id); | 174 | is_syncer_req = is_syncer_block_id(e->block_id); |
@@ -192,8 +183,6 @@ void drbd_endio_write_sec(struct bio *bio, int error) __releases(local) | |||
192 | list_del(&e->w.list); /* has been on active_ee or sync_ee */ | 183 | list_del(&e->w.list); /* has been on active_ee or sync_ee */ |
193 | list_add_tail(&e->w.list, &mdev->done_ee); | 184 | list_add_tail(&e->w.list, &mdev->done_ee); |
194 | 185 | ||
195 | trace_drbd_ee(mdev, e, "write completed"); | ||
196 | |||
197 | /* No hlist_del_init(&e->colision) here, we did not send the Ack yet, | 186 | /* No hlist_del_init(&e->colision) here, we did not send the Ack yet, |
198 | * neither did we wake possibly waiting conflicting requests. | 187 | * neither did we wake possibly waiting conflicting requests. |
199 | * done from "drbd_process_done_ee" within the appropriate w.cb | 188 | * done from "drbd_process_done_ee" within the appropriate w.cb |
@@ -244,8 +233,6 @@ void drbd_endio_pri(struct bio *bio, int error) | |||
244 | error = -EIO; | 233 | error = -EIO; |
245 | } | 234 | } |
246 | 235 | ||
247 | trace_drbd_bio(mdev, "Pri", bio, 1, NULL); | ||
248 | |||
249 | /* to avoid recursion in __req_mod */ | 236 | /* to avoid recursion in __req_mod */ |
250 | if (unlikely(error)) { | 237 | if (unlikely(error)) { |
251 | what = (bio_data_dir(bio) == WRITE) | 238 | what = (bio_data_dir(bio) == WRITE) |
@@ -1321,9 +1308,6 @@ void drbd_start_resync(struct drbd_conf *mdev, enum drbd_conns side) | |||
1321 | return; | 1308 | return; |
1322 | } | 1309 | } |
1323 | 1310 | ||
1324 | trace_drbd_resync(mdev, TRACE_LVL_SUMMARY, "Resync starting: side=%s\n", | ||
1325 | side == C_SYNC_TARGET ? "SyncTarget" : "SyncSource"); | ||
1326 | |||
1327 | /* In case a previous resync run was aborted by an IO error/detach on the peer. */ | 1311 | /* In case a previous resync run was aborted by an IO error/detach on the peer. */ |
1328 | drbd_rs_cancel_all(mdev); | 1312 | drbd_rs_cancel_all(mdev); |
1329 | 1313 | ||