diff options
| author | Omar Sandoval <osandov@fb.com> | 2017-01-31 14:53:19 -0800 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2017-02-02 10:20:16 -0700 |
| commit | a428d314ebcf65842fd64ad850c02c280586e74d (patch) | |
| tree | fa7418aca3b2ca52b4083c112813acaf9b533e8e | |
| parent | 03796c149a99e14506db9de3adba710c26f83ba9 (diff) | |
| download | blackbird-op-linux-a428d314ebcf65842fd64ad850c02c280586e74d.tar.gz blackbird-op-linux-a428d314ebcf65842fd64ad850c02c280586e74d.zip | |
blktrace: make do_blk_trace_setup() static
This isn't used outside of blktrace.c anymore.
Fixes: 62c2a7d969f3 ("block: push BKL into blktrace ioctls")
Signed-off-by: Omar Sandoval <osandov@fb.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
| -rw-r--r-- | include/linux/blktrace_api.h | 4 | ||||
| -rw-r--r-- | kernel/trace/blktrace.c | 6 |
2 files changed, 3 insertions, 7 deletions
diff --git a/include/linux/blktrace_api.h b/include/linux/blktrace_api.h index 341f9418bd68..d2e908586e3d 100644 --- a/include/linux/blktrace_api.h +++ b/include/linux/blktrace_api.h @@ -30,9 +30,6 @@ struct blk_trace { extern int blk_trace_ioctl(struct block_device *, unsigned, char __user *); extern void blk_trace_shutdown(struct request_queue *); -extern int do_blk_trace_setup(struct request_queue *q, char *name, - dev_t dev, struct block_device *bdev, - struct blk_user_trace_setup *buts); extern __printf(2, 3) void __trace_note_message(struct blk_trace *, const char *fmt, ...); @@ -80,7 +77,6 @@ extern struct attribute_group blk_trace_attr_group; #else /* !CONFIG_BLK_DEV_IO_TRACE */ # define blk_trace_ioctl(bdev, cmd, arg) (-ENOTTY) # define blk_trace_shutdown(q) do { } while (0) -# define do_blk_trace_setup(q, name, dev, bdev, buts) (-ENOTTY) # define blk_add_driver_data(q, rq, data, len) do {} while (0) # define blk_trace_setup(q, name, dev, bdev, arg) (-ENOTTY) # define blk_trace_startstop(q, start) (-ENOTTY) diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c index e33050e3ea1c..84763e0c83cf 100644 --- a/kernel/trace/blktrace.c +++ b/kernel/trace/blktrace.c @@ -433,9 +433,9 @@ static void blk_trace_setup_lba(struct blk_trace *bt, /* * Setup everything required to start tracing */ -int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev, - struct block_device *bdev, - struct blk_user_trace_setup *buts) +static int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev, + struct block_device *bdev, + struct blk_user_trace_setup *buts) { struct blk_trace *bt = NULL; struct dentry *dir = NULL; |
