diff options
| author | Lars Ellenberg <lars.ellenberg@linbit.com> | 2013-03-19 18:16:57 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2013-03-22 22:18:09 -0600 |
| commit | 7e8c288f6cde950a6ca001ec06a32c8c2cf4180e (patch) | |
| tree | b8d6582b3dc188f6a6d49566f912cd59770a2bfa /drivers/block/drbd | |
| parent | 08a1ddab6df7d3c7b6341774cb1cf4b21b96a214 (diff) | |
| download | blackbird-op-linux-7e8c288f6cde950a6ca001ec06a32c8c2cf4180e.tar.gz blackbird-op-linux-7e8c288f6cde950a6ca001ec06a32c8c2cf4180e.zip | |
drbd: move start io accounting before activity log transaction
The IO accounting of the drbd "queue depth" was misleading.
We only started IO accounting once we already wrote the activity log.
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/block/drbd')
| -rw-r--r-- | drivers/block/drbd/drbd_req.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c index b923d41678e1..d72f2fef1cba 100644 --- a/drivers/block/drbd/drbd_req.c +++ b/drivers/block/drbd/drbd_req.c @@ -1056,6 +1056,9 @@ drbd_request_prepare(struct drbd_conf *mdev, struct bio *bio, unsigned long star req->private_bio = NULL; } + /* Update disk stats */ + _drbd_start_io_acct(mdev, req); + if (rw == WRITE && req->private_bio && req->i.size && !test_bit(AL_SUSPENDED, &mdev->flags)) { if (!drbd_al_begin_io_fastpath(mdev, &req->i)) { @@ -1095,9 +1098,6 @@ static void drbd_send_and_submit(struct drbd_conf *mdev, struct drbd_request *re goto out; } - /* Update disk stats */ - _drbd_start_io_acct(mdev, req); - /* We fail READ/READA early, if we can not serve it. * We must do this before req is registered on any lists. * Otherwise, drbd_req_complete() will queue failed READ for retry. */ |
