diff options
-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 { | |||
30 | 30 | ||
31 | extern int blk_trace_ioctl(struct block_device *, unsigned, char __user *); | 31 | extern int blk_trace_ioctl(struct block_device *, unsigned, char __user *); |
32 | extern void blk_trace_shutdown(struct request_queue *); | 32 | extern void blk_trace_shutdown(struct request_queue *); |
33 | extern int do_blk_trace_setup(struct request_queue *q, char *name, | ||
34 | dev_t dev, struct block_device *bdev, | ||
35 | struct blk_user_trace_setup *buts); | ||
36 | extern __printf(2, 3) | 33 | extern __printf(2, 3) |
37 | void __trace_note_message(struct blk_trace *, const char *fmt, ...); | 34 | void __trace_note_message(struct blk_trace *, const char *fmt, ...); |
38 | 35 | ||
@@ -80,7 +77,6 @@ extern struct attribute_group blk_trace_attr_group; | |||
80 | #else /* !CONFIG_BLK_DEV_IO_TRACE */ | 77 | #else /* !CONFIG_BLK_DEV_IO_TRACE */ |
81 | # define blk_trace_ioctl(bdev, cmd, arg) (-ENOTTY) | 78 | # define blk_trace_ioctl(bdev, cmd, arg) (-ENOTTY) |
82 | # define blk_trace_shutdown(q) do { } while (0) | 79 | # define blk_trace_shutdown(q) do { } while (0) |
83 | # define do_blk_trace_setup(q, name, dev, bdev, buts) (-ENOTTY) | ||
84 | # define blk_add_driver_data(q, rq, data, len) do {} while (0) | 80 | # define blk_add_driver_data(q, rq, data, len) do {} while (0) |
85 | # define blk_trace_setup(q, name, dev, bdev, arg) (-ENOTTY) | 81 | # define blk_trace_setup(q, name, dev, bdev, arg) (-ENOTTY) |
86 | # define blk_trace_startstop(q, start) (-ENOTTY) | 82 | # 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, | |||
433 | /* | 433 | /* |
434 | * Setup everything required to start tracing | 434 | * Setup everything required to start tracing |
435 | */ | 435 | */ |
436 | int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev, | 436 | static int do_blk_trace_setup(struct request_queue *q, char *name, dev_t dev, |
437 | struct block_device *bdev, | 437 | struct block_device *bdev, |
438 | struct blk_user_trace_setup *buts) | 438 | struct blk_user_trace_setup *buts) |
439 | { | 439 | { |
440 | struct blk_trace *bt = NULL; | 440 | struct blk_trace *bt = NULL; |
441 | struct dentry *dir = NULL; | 441 | struct dentry *dir = NULL; |