xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

block: use same block debugfs directory for blk-mq and blktrace

Browse Source 
When I added the blk-mq debugging information to debugfs, I didn't
notice that blktrace also creates a "block" directory in debugfs. Make
them use the same dentry, now created in the core block code. Based on a
patch from Jens.

Signed-off-by: Omar Sandoval <osandov@fb.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
This commit is contained in:
Omar Sandoval
2017-01-31 14:53:20 -08:00
committed by Jens Axboe
parent a428d314eb
commit 18fbda91c6
6 changed files with 21 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
kernel/trace/blktrace.c
View File

@@ -28,6 +28,8 @@
#include <linux/uaccess.h>
#include <linux/list.h>
#include "../../block/blk.h"
#include <trace/events/block.h>
#include "trace_output.h"
@@ -292,9 +294,6 @@ record_it:
local_irq_restore(flags);
}
static struct dentry *blk_tree_root;
static DEFINE_MUTEX(blk_tree_mutex);
static void blk_trace_free(struct blk_trace *bt)
{
debugfs_remove(bt->msg_file);
@@ -468,17 +467,10 @@ static int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev,
ret = -ENOENT;
mutex_lock(&blk_tree_mutex);
if (!blk_tree_root) {
blk_tree_root = debugfs_create_dir("block", NULL);
if (!blk_tree_root) {
mutex_unlock(&blk_tree_mutex);
goto err;
}
}
mutex_unlock(&blk_tree_mutex);
if (!blk_debugfs_root)
goto err;
dir = debugfs_create_dir(buts->name, blk_tree_root);
dir = debugfs_create_dir(buts->name, blk_debugfs_root);
if (!dir)
goto err;