diff options
-rw-r--r-- | kernel/trace/blktrace.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c index 1ffcbd4ac45b..9af41430ee54 100644 --- a/kernel/trace/blktrace.c +++ b/kernel/trace/blktrace.c | |||
@@ -922,23 +922,24 @@ static void blk_unregister_tracepoints(void) | |||
922 | static void fill_rwbs(char *rwbs, const struct blk_io_trace *t) | 922 | static void fill_rwbs(char *rwbs, const struct blk_io_trace *t) |
923 | { | 923 | { |
924 | int i = 0; | 924 | int i = 0; |
925 | int tc = t->action >> BLK_TC_SHIFT; | ||
925 | 926 | ||
926 | if (t->action & BLK_TC_DISCARD) | 927 | if (tc & BLK_TC_DISCARD) |
927 | rwbs[i++] = 'D'; | 928 | rwbs[i++] = 'D'; |
928 | else if (t->action & BLK_TC_WRITE) | 929 | else if (tc & BLK_TC_WRITE) |
929 | rwbs[i++] = 'W'; | 930 | rwbs[i++] = 'W'; |
930 | else if (t->bytes) | 931 | else if (t->bytes) |
931 | rwbs[i++] = 'R'; | 932 | rwbs[i++] = 'R'; |
932 | else | 933 | else |
933 | rwbs[i++] = 'N'; | 934 | rwbs[i++] = 'N'; |
934 | 935 | ||
935 | if (t->action & BLK_TC_AHEAD) | 936 | if (tc & BLK_TC_AHEAD) |
936 | rwbs[i++] = 'A'; | 937 | rwbs[i++] = 'A'; |
937 | if (t->action & BLK_TC_BARRIER) | 938 | if (tc & BLK_TC_BARRIER) |
938 | rwbs[i++] = 'B'; | 939 | rwbs[i++] = 'B'; |
939 | if (t->action & BLK_TC_SYNC) | 940 | if (tc & BLK_TC_SYNC) |
940 | rwbs[i++] = 'S'; | 941 | rwbs[i++] = 'S'; |
941 | if (t->action & BLK_TC_META) | 942 | if (tc & BLK_TC_META) |
942 | rwbs[i++] = 'M'; | 943 | rwbs[i++] = 'M'; |
943 | 944 | ||
944 | rwbs[i] = '\0'; | 945 | rwbs[i] = '\0'; |