diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-17 15:09:51 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-17 15:09:51 -0400 |
| commit | e076b7c1343e0810880e6b909445f06921f31067 (patch) | |
| tree | 73f57305e66bd32208628fbcc2a009faea42ccce /include | |
| parent | 0f5abd4020bfd2b1eec6975b91bd5068aa674a93 (diff) | |
| parent | 569fd0ce96087283866ab8c438dac4bcf1738846 (diff) | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
Pull block core fix from Jens Axboe:
"A commit in the previous pull request introduce a regression. So far
only observed on qemu-sparc64, but it's a general bug. Please pull
this single fix to rectify that, thanks"
[ And it turns out that it's been seen outside of that qemu-sparc64
case, and is easy to trigger with small number of CPUs and blk-mq
enabled by default - Linus ]
* 'for-linus' of git://git.kernel.dk/linux-block:
blk-mq: fix iteration of busy bitmap
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/blk-mq.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h index 8210e8797c12..2056a99b92f8 100644 --- a/include/linux/blk-mq.h +++ b/include/linux/blk-mq.h @@ -13,7 +13,7 @@ struct blk_mq_cpu_notifier { }; struct blk_mq_ctxmap { - unsigned int map_size; + unsigned int size; unsigned int bits_per_word; struct blk_align_bitmap *map; }; |