diff options
| author | Jens Axboe <axboe@kernel.dk> | 2021-03-25 13:18:30 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2021-03-25 13:18:30 -0600 |
| commit | f8d62edfe2563fc86d12b80b07407dc095cdf0d2 (patch) | |
| tree | 9ef00a2b56d0fb0a25733dacf10bcd55439940d2 /drivers/md/md.c | |
| parent | 14d97622448acbea0348be62f62e25d9a361e16b (diff) | |
| parent | 7abfabaf5f805f5171d133ce6af9b65ab766e76a (diff) | |
Merge branch 'md-next' of https://git.kernel.org/pub/scm/linux/kernel/git/song/md into for-5.13/drivers
Pull MD updates from Song:
"The major changes are:
1. Performance improvement for raid10 discard requests, from Xiao Ni.
2. Fix missing information of /proc/mdstat, from Jan Glauber."
* 'md-next' of https://git.kernel.org/pub/scm/linux/kernel/git/song/md:
md: Fix missing unused status line of /proc/mdstat
md/raid10: improve discard request for far layout
md/raid10: improve raid10 discard request
md/raid10: pull the code that wait for blocked dev into one function
md/raid10: extend r10bio devs to raid disks
md: add md_submit_discard_bio() for submitting discard bio
Diffstat (limited to 'drivers/md/md.c')
| -rw-r--r-- | drivers/md/md.c | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c index 21da0c48f6c2..368cad6cd53a 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -8153,7 +8153,11 @@ static void *md_seq_start(struct seq_file *seq, loff_t *pos) loff_t l = *pos; struct mddev *mddev; - if (l >= 0x10000) + if (l == 0x10000) { + ++*pos; + return (void *)2; + } + if (l > 0x10000) return NULL; if (!l--) /* header */ @@ -8575,6 +8579,26 @@ void md_write_end(struct mddev *mddev) EXPORT_SYMBOL(md_write_end); +/* This is used by raid0 and raid10 */ +void md_submit_discard_bio(struct mddev *mddev, struct md_rdev *rdev, + struct bio *bio, sector_t start, sector_t size) +{ + struct bio *discard_bio = NULL; + + if (__blkdev_issue_discard(rdev->bdev, start, size, GFP_NOIO, 0, + &discard_bio) || !discard_bio) + return; + + bio_chain(discard_bio, bio); + bio_clone_blkg_association(discard_bio, bio); + if (mddev->gendisk) + trace_block_bio_remap(discard_bio, + disk_devt(mddev->gendisk), + bio->bi_iter.bi_sector); + submit_bio_noacct(discard_bio); +} +EXPORT_SYMBOL_GPL(md_submit_discard_bio); + /* md_allow_write(mddev) * Calling this ensures that the array is marked 'active' so that writes * may proceed without blocking. It is important to call this before |