diff options
| author | Jason Gunthorpe <jgg@mellanox.com> | 2020-03-04 13:11:06 -0400 |
|---|---|---|
| committer | Jason Gunthorpe <jgg@mellanox.com> | 2020-03-04 13:11:06 -0400 |
| commit | c13cac2a21b44c6d18a2cf5485f26eee0fb686f6 (patch) | |
| tree | 1cf120a57dbbc95a2d450f1c2047e89b9f917596 /include/linux/blkdev.h | |
| parent | bb8865f435d81223596f1abd6dec0b12ed122af0 (diff) | |
| parent | 98d54f81e36ba3bf92172791eba5ca5bd813989b (diff) | |
Merge tag 'v5.6-rc4' into rdma.git for-next
Required due to dependencies in following patches.
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
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 /* |