block: fix blk-mq debugfs vs. blktrace
Get series with b4
b4 am [email protected]Versions newest first
- v1 Latest6 patches 8 repliesIn review
Patches in v1 No applies recorded yet
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/6 | debugfs: add debugfs_lookup()fs/ include/ | +44 | 0 replies | |
| 2/6 | block: fix debugfs config conditional in struct request_queueinclude/ | +1 | 0 replies | |
| 3/6 | blktrace: make do_blk_trace_setup() staticinclude/ kernel/ | +3 | 0 replies | |
| 4/6 | block: use same block debugfs directory for blk-mq and blktraceblock/ block/ block/ +3 more | +21 | 0 replies | |
| 5/6 | blk-mq: move debugfs_remove() of disk dir to blk_release_queue()block/ block/ | +4 | 0 replies | |
| 6/6 | blktrace: use existing disk debugfs directorykernel/ | +8 | 0 replies |
Reviews trailers per patch
None of the 6 patches has a Reviewed-by or Acked-by of their own; the series has one for all of them.
| Patch | Greg Kroah-Hartman |
|---|---|
| Series | A-b |
| 1/6 | |
| 2/6 | |
| 3/6 | |
| 4/6 | |
| 5/6 | |
| 6/6 |
Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.
Cover letter [PATCH 0/6] block: fix blk-mq debugfs vs. blktrace
From: Omar Sandoval <[email protected]>
When I moved the blk-mq debugging information to debugfs, I didn't realize that blktrace also created directories in debugfs that conflicted with the blk-mq directories. This series fixes that.
Patch 1 adds a new debugfs helper needed for patch 6. Greg, could I get an ack on that if it makes sense? Jens and I went back and forth on this for a little while, but patch 6 has more of the rationale on why we decided that this approach was the cleanest.
Patches 2 and 3 are cleanups.
Patch 4 is the first part of the fix, making blk-mq and blktrace use the same top-level "block" directory.
Patches 5 and 6 make blk-mq and blktrace play nicely with each other w.r.t. the debugfs "block/$dev" directories.
I tested this with multiple configurations, so hopefully I didn't mess that up this time.
Applies to for-4.11/block.
Thanks!
Omar Sandoval (6):
debugfs: add debugfs_lookup()
block: fix debugfs config conditional in struct request_queue
blktrace: make do_blk_trace_setup() static
block: use same block debugfs directory for blk-mq and blktrace
blk-mq: move debugfs_remove() of disk dir to blk_release_queue()
blktrace: use existing disk debugfs directory
block/blk-core.c | 9 +++++++++ block/blk-mq-debugfs.c | 12 +++--------- block/blk-mq-sysfs.c | 2 +- block/blk-mq.c | 2 -- block/blk-mq.h | 5 ----- block/blk-sysfs.c | 3 +++ block/blk.h | 4 ++++ fs/debugfs/inode.c | 36 ++++++++++++++++++++++++++++++++++++ include/linux/blkdev.h | 2 +- include/linux/blktrace_api.h | 4 ---- include/linux/debugfs.h | 8 ++++++++ kernel/trace/blktrace.c | 35 +++++++++++++++-------------------- 12 files changed, 80 insertions(+), 42 deletions(-)
Signature · 1 line
2.11.0