diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-03-07 21:14:38 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-03-07 21:14:38 +0100 |
| commit | 5dfcc13902bfb6d252b84e234bfc4cdba76c1069 (patch) | |
| tree | a8387dd295c92d7d7b1087cd285d9836898292ce /kernel | |
| parent | Merge tag 'media/v5.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mch... (diff) | |
| parent | block, bfq: fix overwrite of bfq_group pointer in bfq_find_set_group() (diff) | |
| download | linux-5dfcc13902bfb6d252b84e234bfc4cdba76c1069.tar.xz linux-5dfcc13902bfb6d252b84e234bfc4cdba76c1069.zip | |
Merge tag 'block-5.6-2020-03-07' of git://git.kernel.dk/linux-block
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()
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/trace/blktrace.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c index 4560878f0bac..ca39dc3230cb 100644 --- a/kernel/trace/blktrace.c +++ b/kernel/trace/blktrace.c @@ -1896,8 +1896,11 @@ static ssize_t sysfs_blk_trace_attr_store(struct device *dev, } ret = 0; - if (bt == NULL) + if (bt == NULL) { ret = blk_trace_setup_queue(q, bdev); + bt = rcu_dereference_protected(q->blk_trace, + lockdep_is_held(&q->blk_trace_mutex)); + } if (ret == 0) { if (attr == &dev_attr_act_mask) |