Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a428d314 authored by Omar Sandoval's avatar Omar Sandoval Committed by Jens Axboe
Browse files

blktrace: make do_blk_trace_setup() static 



This isn't used outside of blktrace.c anymore.

Fixes: 62c2a7d9 ("block: push BKL into blktrace ioctls")
Signed-off-by: default avatarOmar Sandoval <osandov@fb.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 03796c14

include/linux/blktrace_api.h

+0 −4
Original line number Diff line number Diff line
@@ -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)

kernel/trace/blktrace.c

+3 −3
Original line number Diff line number Diff line
@@ -433,7 +433,7 @@ 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,

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)

{