aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/linux/blktrace_api.h26
1 files changed, 15 insertions, 11 deletions
diff --git a/include/linux/blktrace_api.h b/include/linux/blktrace_api.h
index 07c698621ad0..3395cf7130f5 100644
--- a/include/linux/blktrace_api.h
+++ b/include/linux/blktrace_api.h
@@ -204,17 +204,6 @@ extern int blk_trace_init_sysfs(struct device *dev);
204 204
205extern struct attribute_group blk_trace_attr_group; 205extern struct attribute_group blk_trace_attr_group;
206 206
207struct compat_blk_user_trace_setup {
208 char name[32];
209 u16 act_mask;
210 u32 buf_size;
211 u32 buf_nr;
212 compat_u64 start_lba;
213 compat_u64 end_lba;
214 u32 pid;
215};
216#define BLKTRACESETUP32 _IOWR(0x12, 115, struct compat_blk_user_trace_setup)
217
218#else /* !CONFIG_BLK_DEV_IO_TRACE */ 207#else /* !CONFIG_BLK_DEV_IO_TRACE */
219# define blk_trace_ioctl(bdev, cmd, arg) (-ENOTTY) 208# define blk_trace_ioctl(bdev, cmd, arg) (-ENOTTY)
220# define blk_trace_shutdown(q) do { } while (0) 209# define blk_trace_shutdown(q) do { } while (0)
@@ -232,6 +221,21 @@ static inline int blk_trace_init_sysfs(struct device *dev)
232 221
233#endif /* CONFIG_BLK_DEV_IO_TRACE */ 222#endif /* CONFIG_BLK_DEV_IO_TRACE */
234 223
224#ifdef CONFIG_COMPAT
225
226struct compat_blk_user_trace_setup {
227 char name[32];
228 u16 act_mask;
229 u32 buf_size;
230 u32 buf_nr;
231 compat_u64 start_lba;
232 compat_u64 end_lba;
233 u32 pid;
234};
235#define BLKTRACESETUP32 _IOWR(0x12, 115, struct compat_blk_user_trace_setup)
236
237#endif
238
235#if defined(CONFIG_EVENT_TRACING) && defined(CONFIG_BLOCK) 239#if defined(CONFIG_EVENT_TRACING) && defined(CONFIG_BLOCK)
236 240
237static inline int blk_cmd_buf_len(struct request *rq) 241static inline int blk_cmd_buf_len(struct request *rq)