diff options
| author | Jens Axboe <axboe@kernel.dk> | 2021-06-15 15:42:56 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2021-06-15 15:42:56 -0600 |
| commit | e0d245e2230998e66dfda10fb8c413f29196eb1c (patch) | |
| tree | 555c54326b400a3924d1dc2d45540baaddbea8c9 /drivers/md/raid0.c | |
| parent | 491e5b170ef8bf951d9337b1a7ee9f9c1465ffe8 (diff) | |
| parent | 97ae27252f4962d0fcc38ee1d9f913d817a2024e (diff) | |
| download | linux-e0d245e2230998e66dfda10fb8c413f29196eb1c.tar.gz linux-e0d245e2230998e66dfda10fb8c413f29196eb1c.tar.bz2 linux-e0d245e2230998e66dfda10fb8c413f29196eb1c.zip | |
Merge branch 'md-next' of https://git.kernel.org/pub/scm/linux/kernel/git/song/md into for-5.14/drivers
Pull MD changes from Song:
"1) iostats rewrite by Guoqing Jiang;
2) raid5 lock contention optimization by Gal Ofri."
* 'md-next' of https://git.kernel.org/pub/scm/linux/kernel/git/song/md:
md/raid5: avoid device_lock in read_one_chunk()
md: add comments in md_integrity_register
md: check level before create and exit io_acct_set
md: Constify attribute_group structs
md: mark some personalities as deprecated
md/raid10: enable io accounting
md/raid1: enable io accounting
md/raid1: rename print_msg with r1bio_existed
md/raid5: avoid redundant bio clone in raid5_read_one_chunk
md/raid5: move checking badblock before clone bio in raid5_read_one_chunk
md: add io accounting for raid0 and raid5
md: revert io stats accounting
Diffstat (limited to 'drivers/md/raid0.c')
| -rw-r--r-- | drivers/md/raid0.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c index e5d7411cba9b..62c8b6adac70 100644 --- a/drivers/md/raid0.c +++ b/drivers/md/raid0.c @@ -546,6 +546,9 @@ static bool raid0_make_request(struct mddev *mddev, struct bio *bio) bio = split; } + if (bio->bi_pool != &mddev->bio_set) + md_account_bio(mddev, &bio); + orig_sector = sector; zone = find_zone(mddev->private, §or); switch (conf->layout) { |