[PATCH blktrace v2 13/22] blktrace: pass magic to CHECK_MAGIC macro
From: Johannes Thumshirn <hidden>
Date: 2025-09-25 15:05:29
Also in:
linux-block, lkml
Subsystem:
the rest · Maintainer:
Linus Torvalds
Pass only the magic number itself to the CHECK_MAGIC() macro. This enables support for multiple versions. Signed-off-by: Johannes Thumshirn <redacted> --- blkrawverify.c | 2 +- blktrace.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/blkrawverify.c b/blkrawverify.c
index 9c5d595..cc5b06e 100644
--- a/blkrawverify.c
+++ b/blkrawverify.c@@ -183,7 +183,7 @@ static int process(FILE **fp, char *devname, char *file, unsigned int cpu) trace_to_cpu(bit); - if (!CHECK_MAGIC(bit)) { + if (!CHECK_MAGIC(bit->magic)) { INC_BAD("bad trace"); continue; }
diff --git a/blktrace.h b/blktrace.h
index 3305fa0..81a5b51 100644
--- a/blktrace.h
+++ b/blktrace.h@@ -67,7 +67,7 @@ extern FILE *ofp; extern int data_is_native; extern struct timespec abs_start_time; -#define CHECK_MAGIC(t) (((t)->magic & 0xffffff00) == BLK_IO_TRACE_MAGIC) +#define CHECK_MAGIC(magic) (((magic) & 0xffffff00) == BLK_IO_TRACE_MAGIC) #define SUPPORTED_VERSION (0x07) #define SUPPORTED_VERSION2 (0x08)
@@ -93,7 +93,7 @@ static inline int verify_trace(struct blk_io_trace *t) { u8 version; - if (!CHECK_MAGIC(t)) { + if (!CHECK_MAGIC(t->magic)) { fprintf(stderr, "bad trace magic %x\n", t->magic); return 1; }
--
2.51.0