diff options
| author |   Mikulas Patocka <mpatocka@redhat.com> | 2018-12-06 11:41:16 -0500 |
|---|---|---|
| committer |   Jens Axboe <axboe@kernel.dk> | 2018-12-10 08:30:37 -0700 |
| commit | 80a787ba3809deb694ee632919badb73890daf05 (patch) | |
| tree | d7ff1137fc58685d26b86a8fe845a21c8e6cfa90 /drivers/md/dm.c | |
| parent | Merge tag 'v4.20-rc6' into for-4.21/block (diff) | |
| download | linux-dev-80a787ba3809deb694ee632919badb73890daf05.tar.xz linux-dev-80a787ba3809deb694ee632919badb73890daf05.zip | |
dm: dont rewrite dm_disk(md)->part0.in_flight
generic_start_io_acct and generic_end_io_acct already update the variable
in_flight using atomic operations, so we don't have to overwrite them
again.
Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/md/dm.c')
| -rw-r--r-- | drivers/md/dm.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/md/dm.c b/drivers/md/dm.c index ab72d79775ee..33100e536c4e 100644 --- a/drivers/md/dm.c +++ b/drivers/md/dm.c @@ -663,8 +663,7 @@ static void start_io_acct(struct dm_io *io) generic_start_io_acct(md->queue, bio_op(bio), bio_sectors(bio), &dm_disk(md)->part0); - atomic_set(&dm_disk(md)->part0.in_flight[rw], - atomic_inc_return(&md->pending[rw])); + atomic_inc(&md->pending[rw]); if (unlikely(dm_stats_used(&md->stats))) dm_stats_account_io(&md->stats, bio_data_dir(bio), @@ -693,7 +692,6 @@ static void end_io_acct(struct dm_io *io) * a flush. */ pending = atomic_dec_return(&md->pending[rw]); - atomic_set(&dm_disk(md)->part0.in_flight[rw], pending); pending += atomic_read(&md->pending[rw^0x1]); /* nudge anyone waiting on suspend queue */ |