Skip to content

L
linux-davinci
Commit 25d2d4ed authored by Jens Axboe's avatar Jens Axboe
Browse files
Options

drbd: fixup for reverted dual in_flight patch 

Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent 5d13379a
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
drivers/block/drbd/drbd_req.c
View file @ 25d2d4ed
...@@ -40,7 +40,7 @@ static void _drbd_start_io_acct(struct drbd_conf *mdev, struct drbd_request *req ...@@ -40,7 +40,7 @@ static void _drbd_start_io_acct(struct drbd_conf *mdev, struct drbd_request *req
part_stat_inc(cpu, &mdev->vdisk->part0, ios[rw]); part_stat_inc(cpu, &mdev->vdisk->part0, ios[rw]);
part_stat_add(cpu, &mdev->vdisk->part0, sectors[rw], bio_sectors(bio)); part_stat_add(cpu, &mdev->vdisk->part0, sectors[rw], bio_sectors(bio));
part_stat_unlock(); part_stat_unlock();
mdev->vdisk->part0.in_flight[rw]++; mdev->vdisk->part0.in_flight++;
} }
/* Update disk stats when completing request upwards */ /* Update disk stats when completing request upwards */
...@@ -53,7 +53,7 @@ static void _drbd_end_io_acct(struct drbd_conf *mdev, struct drbd_request *req) ...@@ -53,7 +53,7 @@ static void _drbd_end_io_acct(struct drbd_conf *mdev, struct drbd_request *req)
part_stat_add(cpu, &mdev->vdisk->part0, ticks[rw], duration); part_stat_add(cpu, &mdev->vdisk->part0, ticks[rw], duration);
part_round_stats(cpu, &mdev->vdisk->part0); part_round_stats(cpu, &mdev->vdisk->part0);
part_stat_unlock(); part_stat_unlock();
mdev->vdisk->part0.in_flight[rw]--; mdev->vdisk->part0.in_flight--;
} }
static void _req_is_done(struct drbd_conf *mdev, struct drbd_request *req, const int rw) static void _req_is_done(struct drbd_conf *mdev, struct drbd_request *req, const int rw)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment