fs/f2fs: Use the enum req_op and blk_opf_t types

[linux-block.git] / include / trace / events / f2fs.h

diff --git a/include/trace/events/f2fs.h b/include/trace/events/f2fs.h
index 513e889ef8aa5153dd69d04d7bed5f38565d1a33..f1e922237736807d8d4f03357c9d4a3bcbc89309 100644 (file)
--- a/include/trace/events/f2fs.h
+++ b/include/trace/events/f2fs.h
@@ -66,7 +66,7 @@ TRACE_DEFINE_ENUM(CP_RESIZE);
 
 #define F2FS_OP_FLAGS (REQ_RAHEAD | REQ_SYNC | REQ_META | REQ_PRIO |   \
                        REQ_PREFLUSH | REQ_FUA)
-#define F2FS_BIO_FLAG_MASK(t)  (t & F2FS_OP_FLAGS)
+#define F2FS_BIO_FLAG_MASK(t) (__force u32)((t) & F2FS_OP_FLAGS)
 
 #define show_bio_type(op,op_flags)     show_bio_op(op),                \
                                                show_bio_op_flags(op_flags)
@@ -75,12 +75,12 @@ TRACE_DEFINE_ENUM(CP_RESIZE);
 
 #define show_bio_op_flags(flags)                                       \
        __print_flags(F2FS_BIO_FLAG_MASK(flags), "|",                   \
-               { REQ_RAHEAD,           "R" },                          \
-               { REQ_SYNC,             "S" },                          \
-               { REQ_META,             "M" },                          \
-               { REQ_PRIO,             "P" },                          \
-               { REQ_PREFLUSH,         "PF" },                         \
-               { REQ_FUA,              "FUA" })
+               { (__force u32)REQ_RAHEAD,      "R" },                  \
+               { (__force u32)REQ_SYNC,        "S" },                  \
+               { (__force u32)REQ_META,        "M" },                  \
+               { (__force u32)REQ_PRIO,        "P" },                  \
+               { (__force u32)REQ_PREFLUSH,    "PF" },                 \
+               { (__force u32)REQ_FUA,         "FUA" })
 
 #define show_data_type(type)                                           \
        __print_symbolic(type,                                          \
@@ -1036,8 +1036,8 @@ DECLARE_EVENT_CLASS(f2fs__submit_page_bio,
                __field(pgoff_t, index)
                __field(block_t, old_blkaddr)
                __field(block_t, new_blkaddr)
-               __field(int, op)
-               __field(int, op_flags)
+               __field(enum req_op, op)
+               __field(blk_opf_t, op_flags)
                __field(int, temp)
                __field(int, type)
        ),
@@ -1092,8 +1092,8 @@ DECLARE_EVENT_CLASS(f2fs__bio,
        TP_STRUCT__entry(
                __field(dev_t,  dev)
                __field(dev_t,  target)
-               __field(int,    op)
-               __field(int,    op_flags)
+               __field(enum req_op,    op)
+               __field(blk_opf_t,      op_flags)
                __field(int,    type)
                __field(sector_t,       sector)
                __field(unsigned int,   size)