Merge tag 'jfs-4.10' of git://github.com/kleikamp/linux-shaggy

[karo-tx-linux.git] / kernel / trace / blktrace.c

diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c
index dbafc5df03f3f04705ff5739c2c0f51aed8ca6ee..95cecbf67f5ca0903d582b0ed45ef4b409fa3c99 100644 (file)
--- a/kernel/trace/blktrace.c
+++ b/kernel/trace/blktrace.c
@@ -1777,14 +1777,14 @@ void blk_dump_cmd(char *buf, struct request *rq)
        }
 }
 
-void blk_fill_rwbs(char *rwbs, int op, u32 rw, int bytes)
+void blk_fill_rwbs(char *rwbs, unsigned int op, int bytes)
 {
        int i = 0;
 
-       if (rw & REQ_PREFLUSH)
+       if (op & REQ_PREFLUSH)
                rwbs[i++] = 'F';
 
-       switch (op) {
+       switch (op & REQ_OP_MASK) {
        case REQ_OP_WRITE:
        case REQ_OP_WRITE_SAME:
                rwbs[i++] = 'W';
@@ -1806,13 +1806,13 @@ void blk_fill_rwbs(char *rwbs, int op, u32 rw, int bytes)
                rwbs[i++] = 'N';
        }
 
-       if (rw & REQ_FUA)
+       if (op & REQ_FUA)
                rwbs[i++] = 'F';
-       if (rw & REQ_RAHEAD)
+       if (op & REQ_RAHEAD)
                rwbs[i++] = 'A';
-       if (rw & REQ_SYNC)
+       if (op & REQ_SYNC)
                rwbs[i++] = 'S';
-       if (rw & REQ_META)
+       if (op & REQ_META)
                rwbs[i++] = 'M';
 
        rwbs[i] = '\0';