Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2a0ab2cd authored by Philipp Reisner's avatar Philipp Reisner Committed by Jens Axboe
Browse files

drbd: Reduce verbosity 



The "Local READ/WRITE failed" messages are too verbose.

Signed-off-by: default avatarPhilipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: default avatarLars Ellenberg <lars.ellenberg@linbit.com>
Signed-off-by: default avatarJens Axboe <jaxboe@fusionio.com>
parent 7383506c

drivers/block/drbd/drbd_req.c

+0 −5
Original line number Diff line number Diff line
@@ -428,9 +428,6 @@ void __req_mod(struct drbd_request *req, enum drbd_req_event what, 
		req->rq_state |= RQ_LOCAL_COMPLETED;

		req->rq_state &= ~RQ_LOCAL_PENDING;



		dev_alert(DEV, "Local WRITE failed sec=%llus size=%u\n",

		      (unsigned long long)req->sector, req->size);

		/* and now: check how to handle local io error. */

		__drbd_chk_io_error(mdev, FALSE);

		_req_may_be_done(req, m);

		put_ldev(mdev);
@@ -450,8 +447,6 @@ void __req_mod(struct drbd_request *req, enum drbd_req_event what, 
		req->rq_state |= RQ_LOCAL_COMPLETED;

		req->rq_state &= ~RQ_LOCAL_PENDING;



		dev_alert(DEV, "Local READ failed sec=%llus size=%u\n",

		      (unsigned long long)req->sector, req->size);

		D_ASSERT(!(req->rq_state & RQ_NET_MASK));



		__drbd_chk_io_error(mdev, FALSE);

drivers/block/drbd/drbd_worker.c

+0 −4
Original line number Diff line number Diff line
@@ -224,9 +224,6 @@ void drbd_endio_pri(struct bio *bio, int error) 
	enum drbd_req_event what;

	int uptodate = bio_flagged(bio, BIO_UPTODATE);



	if (error)

		dev_warn(DEV, "p %s: error=%d\n",

			 bio_data_dir(bio) == WRITE ? "write" : "read", error);

	if (!error && !uptodate) {

		dev_warn(DEV, "p %s: setting error to -EIO\n",

			 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) 
	if (cancel || mdev->state.pdsk != D_UP_TO_DATE) {

		_req_mod(req, read_retry_remote_canceled);

		spin_unlock_irq(&mdev->req_lock);

		dev_alert(DEV, "WE ARE LOST. Local IO failure, no peer.\n");

		return 1;

	}

	spin_unlock_irq(&mdev->req_lock);