diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-21 22:15:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-21 22:15:00 -0700 |
| commit | 8d829b9bb878904f3419af8003176a12910b94e8 (patch) | |
| tree | a038a1914059c4caf7849caeb967ddb4df818e4a /include | |
| parent | 48b6bbef9a1789f0365c1a385879a1fea4460016 (diff) | |
| parent | 8e8320c9315c47a6a090188720ccff32a6a6ba18 (diff) | |
| download | linux-8d829b9bb878904f3419af8003176a12910b94e8.tar.gz linux-8d829b9bb878904f3419af8003176a12910b94e8.tar.bz2 linux-8d829b9bb878904f3419af8003176a12910b94e8.zip | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
Pull block fixes from Jens Axboe:
"This contains a set of fixes for xen-blkback by way of Konrad, and a
performance regression fix for blk-mq for shared tags.
The latter could account for as much as a 50x reduction in
performance, with the test case from the user with 500 name spaces. A
more realistic setup on my end with 32 drives showed a 3.5x drop. The
fix has been thoroughly tested before being committed"
* 'for-linus' of git://git.kernel.dk/linux-block:
blk-mq: fix performance regression with shared tags
xen-blkback: don't leak stack data via response ring
xen/blkback: don't use xen_blkif_get() in xen-blkback kthread
xen/blkback: don't free be structure too early
xen/blkback: fix disconnect while I/Os in flight
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/blkdev.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index b74a3edcb3da..1ddd36bd2173 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -391,6 +391,8 @@ struct request_queue { int nr_rqs[2]; /* # allocated [a]sync rqs */ int nr_rqs_elvpriv; /* # allocated rqs w/ elvpriv */ + atomic_t shared_hctx_restart; + struct blk_queue_stats *stats; struct rq_wb *rq_wb; |