From: Luis Chamberlain <mcgrof@kernel.org>
To: axboe@kernel.dk, viro@zeniv.linux.org.uk, bvanassche@acm.org,
gregkh@linuxfoundation.org, rostedt@goodmis.org,
mingo@redhat.com, jack@suse.cz, ming.lei@redhat.com,
nstange@suse.de, akpm@linux-foundation.org
Cc: mhocko@suse.com, yukuai3@huawei.com, linux-block@vger.kernel.org,
linux-fsdevel@vger.kernel.org, linux-mm@kvack.org,
linux-kernel@vger.kernel.org,
Luis Chamberlain <mcgrof@kernel.org>
Subject: [PATCH v3 3/6] blktrace: move blktrace debugfs creation to helper function
Date: Wed, 29 Apr 2020 07:46:24 +0000 [thread overview]
Message-ID: <20200429074627.5955-4-mcgrof@kernel.org> (raw)
In-Reply-To: <20200429074627.5955-1-mcgrof@kernel.org>
Move the work to create the debugfs directory used into a helper.
It will make further checks easier to read. This commit introduces
no functional changes.
Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
---
kernel/trace/blktrace.c | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
index ca39dc3230cb..2c6e6c386ace 100644
--- a/kernel/trace/blktrace.c
+++ b/kernel/trace/blktrace.c
@@ -468,6 +468,18 @@ static void blk_trace_setup_lba(struct blk_trace *bt,
}
}
+static struct dentry *blk_trace_debugfs_dir(struct blk_user_trace_setup *buts,
+ struct blk_trace *bt)
+{
+ struct dentry *dir = NULL;
+
+ dir = debugfs_lookup(buts->name, blk_debugfs_root);
+ if (!dir)
+ bt->dir = dir = debugfs_create_dir(buts->name, blk_debugfs_root);
+
+ return dir;
+}
+
/*
* Setup everything required to start tracing
*/
@@ -509,9 +521,7 @@ static int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev,
ret = -ENOENT;
- dir = debugfs_lookup(buts->name, blk_debugfs_root);
- if (!dir)
- bt->dir = dir = debugfs_create_dir(buts->name, blk_debugfs_root);
+ dir = blk_trace_debugfs_dir(buts, bt);
bt->dev = dev;
atomic_set(&bt->dropped, 0);
--
2.25.1
next prev parent reply other threads:[~2020-04-29 7:46 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-29 7:46 [PATCH v3 0/6] block: fix blktrace debugfs use after free Luis Chamberlain
2020-04-29 7:46 ` [PATCH v3 1/6] block: revert back to synchronous request_queue removal Luis Chamberlain
2020-04-29 11:15 ` Christoph Hellwig
2020-05-02 0:22 ` Bart Van Assche
2020-05-03 10:32 ` Matthew Wilcox
2020-05-04 16:18 ` Luis Chamberlain
2020-05-04 16:16 ` Luis Chamberlain
2020-04-29 7:46 ` [PATCH v3 2/6] block: move main block debugfs initialization to its own file Luis Chamberlain
2020-04-29 11:15 ` Christoph Hellwig
2020-04-29 7:46 ` Luis Chamberlain [this message]
2020-04-29 11:20 ` [PATCH v3 3/6] blktrace: move blktrace debugfs creation to helper function Christoph Hellwig
2020-05-02 0:25 ` Bart Van Assche
2020-04-29 7:46 ` [PATCH v3 4/6] blktrace: fix debugfs use after free Luis Chamberlain
2020-04-29 9:47 ` Greg KH
2020-04-29 11:26 ` Christoph Hellwig
2020-04-29 11:45 ` Luis Chamberlain
2020-04-29 11:50 ` Christoph Hellwig
2020-04-29 12:02 ` Luis Chamberlain
2020-04-29 12:04 ` Christoph Hellwig
2020-04-29 12:21 ` Luis Chamberlain
2020-04-29 12:57 ` Greg KH
2020-05-01 15:24 ` Luis Chamberlain
2020-05-07 11:30 ` [blktrace] d106a3fdba: BUG:kernel_NULL_pointer_dereference,address kernel test robot
2020-04-29 7:46 ` [PATCH v3 5/6] blktrace: break out of blktrace setup on concurrent calls Luis Chamberlain
2020-04-29 9:49 ` Greg KH
2020-05-01 15:06 ` Luis Chamberlain
2020-05-01 15:34 ` Christoph Hellwig
2020-05-01 15:40 ` Luis Chamberlain
2020-05-01 15:50 ` Luis Chamberlain
2020-05-01 16:51 ` Greg KH
2020-04-29 7:46 ` [PATCH v3 6/6] loop: be paranoid on exit and prevent new additions / removals Luis Chamberlain
2020-04-29 9:50 ` Greg KH
2020-05-03 9:09 ` Luis Chamberlain
2020-04-29 14:05 ` Ming Lei
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200429074627.5955-4-mcgrof@kernel.org \
--to=mcgrof@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=axboe@kernel.dk \
--cc=bvanassche@acm.org \
--cc=gregkh@linuxfoundation.org \
--cc=jack@suse.cz \
--cc=linux-block@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=mhocko@suse.com \
--cc=ming.lei@redhat.com \
--cc=mingo@redhat.com \
--cc=nstange@suse.de \
--cc=rostedt@goodmis.org \
--cc=viro@zeniv.linux.org.uk \
--cc=yukuai3@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).