From 73e3f25ab195a38943e7f58db21bab6f3ca20b1c Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Fri, 12 Oct 2007 12:50:07 +0200 Subject: [PATCH] --- yaml --- r: 67701 b: refs/heads/master c: 43d28d98bed372649060ef783719b426a91972ed h: refs/heads/master i: 67699: 77bb14d18d8207df1af0219d1e763838236aac03 v: v3 --- [refs] | 2 +- trunk/include/linux/blktrace_api.h | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index dec9f7a20a97..120fd4d00e4e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2da96acde0318f121ed3f5993ae9324c856ecfd4 +refs/heads/master: 43d28d98bed372649060ef783719b426a91972ed diff --git a/trunk/include/linux/blktrace_api.h b/trunk/include/linux/blktrace_api.h index 2e105a12fe29..7e11d23ac36a 100644 --- a/trunk/include/linux/blktrace_api.h +++ b/trunk/include/linux/blktrace_api.h @@ -290,12 +290,7 @@ static inline void blk_add_trace_remap(struct request_queue *q, struct bio *bio, #define blk_add_trace_generic(q, rq, rw, what) do { } while (0) #define blk_add_trace_pdu_int(q, what, bio, pdu) do { } while (0) #define blk_add_trace_remap(q, bio, dev, f, t) do {} while (0) -static inline int do_blk_trace_setup(struct request_queue *q, - struct block_device *bdev, - struct blk_user_trace_setup *buts) -{ - return 0; -} +#define do_blk_trace_setup(q, bdev, buts) (-ENOTTY) #endif /* CONFIG_BLK_DEV_IO_TRACE */ #endif /* __KERNEL__ */ #endif