diff options
author | Philipp Reisner <philipp.reisner@linbit.com> | 2010-05-26 11:59:55 -0400 |
---|---|---|
committer | Jens Axboe <jaxboe@fusionio.com> | 2010-06-01 05:12:27 -0400 |
commit | 2a0ab2cd73c26835e635ed4e3868f983519048fb (patch) | |
tree | 3809dc43507fc168d1982b460527232255bb9bde /drivers | |
parent | 7383506c87237dbd627f0b8b72b50117f25c5ca2 (diff) |
drbd: Reduce verbosity
The "Local READ/WRITE failed" messages are too verbose.
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/block/drbd/drbd_req.c | 5 | ||||
-rw-r--r-- | drivers/block/drbd/drbd_worker.c | 4 |
2 files changed, 0 insertions, 9 deletions
diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c index 8915644af722..654f1ef5cbb0 100644 --- a/drivers/block/drbd/drbd_req.c +++ b/drivers/block/drbd/drbd_req.c | |||
@@ -428,9 +428,6 @@ void __req_mod(struct drbd_request *req, enum drbd_req_event what, | |||
428 | req->rq_state |= RQ_LOCAL_COMPLETED; | 428 | req->rq_state |= RQ_LOCAL_COMPLETED; |
429 | req->rq_state &= ~RQ_LOCAL_PENDING; | 429 | req->rq_state &= ~RQ_LOCAL_PENDING; |
430 | 430 | ||
431 | dev_alert(DEV, "Local WRITE failed sec=%llus size=%u\n", | ||
432 | (unsigned long long)req->sector, req->size); | ||
433 | /* and now: check how to handle local io error. */ | ||
434 | __drbd_chk_io_error(mdev, FALSE); | 431 | __drbd_chk_io_error(mdev, FALSE); |
435 | _req_may_be_done(req, m); | 432 | _req_may_be_done(req, m); |
436 | put_ldev(mdev); | 433 | put_ldev(mdev); |
@@ -450,8 +447,6 @@ void __req_mod(struct drbd_request *req, enum drbd_req_event what, | |||
450 | req->rq_state |= RQ_LOCAL_COMPLETED; | 447 | req->rq_state |= RQ_LOCAL_COMPLETED; |
451 | req->rq_state &= ~RQ_LOCAL_PENDING; | 448 | req->rq_state &= ~RQ_LOCAL_PENDING; |
452 | 449 | ||
453 | dev_alert(DEV, "Local READ failed sec=%llus size=%u\n", | ||
454 | (unsigned long long)req->sector, req->size); | ||
455 | D_ASSERT(!(req->rq_state & RQ_NET_MASK)); | 450 | D_ASSERT(!(req->rq_state & RQ_NET_MASK)); |
456 | 451 | ||
457 | __drbd_chk_io_error(mdev, FALSE); | 452 | __drbd_chk_io_error(mdev, FALSE); |
diff --git a/drivers/block/drbd/drbd_worker.c b/drivers/block/drbd/drbd_worker.c index 67371fcbc5aa..b623ceee2a4a 100644 --- a/drivers/block/drbd/drbd_worker.c +++ b/drivers/block/drbd/drbd_worker.c | |||
@@ -224,9 +224,6 @@ void drbd_endio_pri(struct bio *bio, int error) | |||
224 | enum drbd_req_event what; | 224 | enum drbd_req_event what; |
225 | int uptodate = bio_flagged(bio, BIO_UPTODATE); | 225 | int uptodate = bio_flagged(bio, BIO_UPTODATE); |
226 | 226 | ||
227 | if (error) | ||
228 | dev_warn(DEV, "p %s: error=%d\n", | ||
229 | bio_data_dir(bio) == WRITE ? "write" : "read", error); | ||
230 | if (!error && !uptodate) { | 227 | if (!error && !uptodate) { |
231 | dev_warn(DEV, "p %s: setting error to -EIO\n", | 228 | dev_warn(DEV, "p %s: setting error to -EIO\n", |
232 | bio_data_dir(bio) == WRITE ? "write" : "read"); | 229 | bio_data_dir(bio) == WRITE ? "write" : "read"); |
@@ -269,7 +266,6 @@ int w_read_retry_remote(struct drbd_conf *mdev, struct drbd_work *w, int cancel) | |||
269 | if (cancel || mdev->state.pdsk != D_UP_TO_DATE) { | 266 | if (cancel || mdev->state.pdsk != D_UP_TO_DATE) { |
270 | _req_mod(req, read_retry_remote_canceled); | 267 | _req_mod(req, read_retry_remote_canceled); |
271 | spin_unlock_irq(&mdev->req_lock); | 268 | spin_unlock_irq(&mdev->req_lock); |
272 | dev_alert(DEV, "WE ARE LOST. Local IO failure, no peer.\n"); | ||
273 | return 1; | 269 | return 1; |
274 | } | 270 | } |
275 | spin_unlock_irq(&mdev->req_lock); | 271 | spin_unlock_irq(&mdev->req_lock); |