This patch adds the blktrace extension support where we increase the
size of action mask so that it can store more actions.

Signed-off-by: Chaitanya Kulkarni <[email protected]>
---
 include/linux/blktrace_api.h | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/include/linux/blktrace_api.h b/include/linux/blktrace_api.h
index 7bb2d8de9f30..403d4cfc6a52 100644
--- a/include/linux/blktrace_api.h
+++ b/include/linux/blktrace_api.h
@@ -17,7 +17,11 @@ struct blk_trace {
        struct rchan *rchan;
        unsigned long __percpu *sequence;
        unsigned char __percpu *msg_data;
+#ifdef CONFIG_BLKTRACE_EXT
+       u64 act_mask;
+#else
        u16 act_mask;
+#endif /* CONFIG_BLKTRACE_EXT */
        u64 start_lba;
        u64 end_lba;
        u32 pid;
@@ -101,14 +105,20 @@ static inline int blk_trace_init_sysfs(struct device *dev)
 
 struct compat_blk_user_trace_setup {
        char name[BLKTRACE_BDEV_SIZE];
+#ifdef CONFIG_BLKTRACE_EXT
+       u64 act_mask;
+#else
        u16 act_mask;
+#endif /* CONFIG_BLKTRACE_EXT */
        u32 buf_size;
        u32 buf_nr;
        compat_u64 start_lba;
        compat_u64 end_lba;
        u32 pid;
 };
-#define BLKTRACESETUP32 _IOWR(0x12, 115, struct compat_blk_user_trace_setup)
+
+/* XXX: temp work around for RFC */
+#define BLKTRACESETUP32 _IOWR(0x13, 115, struct compat_blk_user_trace_setup)
 
 #endif
 
-- 
2.19.1

Reply via email to