diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2020-02-28 11:43:30 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-02-28 11:43:30 -0800 |
| commit | 2edc78b9a4b868d7bfee4f87ea29f2df19b6e955 (patch) | |
| tree | e719289213d2691ad2a89a9576f72e9b670cbf74 /include/linux/blkdev.h | |
| parent | Merge tag 'io_uring-5.6-2020-02-28' of git://git.kernel.dk/linux-block (diff) | |
| parent | Merge branch 'nvme-5.6-rc4' of git://git.infradead.org/nvme into block-5.6 (diff) | |
| download | linux-dev-2edc78b9a4b868d7bfee4f87ea29f2df19b6e955.tar.xz linux-dev-2edc78b9a4b868d7bfee4f87ea29f2df19b6e955.zip | |
Merge tag 'block-5.6-2020-02-28' of git://git.kernel.dk/linux-block
Pull block fixes from Jens Axboe:
- Passthrough insertion fix (Ming)
- Kill off some unused arguments (John)
- blktrace RCU fix (Jan)
- Dead fields removal for null_blk (Dongli)
- NVMe polled IO fix (Bijan)
* tag 'block-5.6-2020-02-28' of git://git.kernel.dk/linux-block:
nvme-pci: Hold cq_poll_lock while completing CQEs
blk-mq: Remove some unused function arguments
null_blk: remove unused fields in 'nullb_cmd'
blktrace: Protect q->blk_trace with RCU
blk-mq: insert passthrough request into hctx->dispatch directly
Diffstat (limited to 'include/linux/blkdev.h')
| -rw-r--r-- | include/linux/blkdev.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 053ea4b51988..10455b2bbbb4 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -524,7 +524,7 @@ struct request_queue { unsigned int sg_reserved_size; int node; #ifdef CONFIG_BLK_DEV_IO_TRACE - struct blk_trace *blk_trace; + struct blk_trace __rcu *blk_trace; struct mutex blk_trace_mutex; #endif /* |