Pull block fixes from Jens Axboe: "Here are a few fixes that should go into this release. This contains: - Revert of a bad bcache patch from this merge window - Removed unused function (Daniel) - Fixup for the blktrace fix from Jan from this release (Cengiz) - Fix of deeper level bfqq overwrite in BFQ (Carlo)" * tag 'block-5.6-2020-03-07' of git://git.kernel.dk/linux-block: block, bfq: fix overwrite of bfq_group pointer in bfq_find_set_group() blktrace: fix dereference after null check Revert "bcache: ignore pending signals when creating gc and allocator thread" block: Remove used kblockd_schedule_work_on()
Showing the changes to kernel (1 of 6 files). Show all
Unified · Split
| @@ -1896,8 +1896,11 @@ static ssize_t sysfs_blk_trace_attr_store(struct device *dev, · 1895 unmodified lines | ||
| 1896 | 1896 | } |
| 1897 | 1897 | |
| 1898 | 1898 | ret = 0; |
| 1899 | − if (bt == NULL) | |
| 1899 | + if (bt == NULL) { | |
| 1900 | 1900 | ret = blk_trace_setup_queue(q, bdev); |
| 1901 | + bt = rcu_dereference_protected(q->blk_trace, | |
| 1902 | + lockdep_is_held(&q->blk_trace_mutex)); | |
| 1903 | + } | |
| 1901 | 1904 | |
| 1902 | 1905 | if (ret == 0) { |
| 1903 | 1906 | if (attr == &dev_attr_act_mask) |