diff options
| author | Mike Christie <mchristi@redhat.com> | 2016-06-05 14:31:55 -0500 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2016-06-07 13:41:38 -0600 |
| commit | 04d328defd06257bf386d58f359013e0ef329226 (patch) | |
| tree | b257cfcdf8d5e592a6577d123eb0f3babacbf7bc /fs/f2fs/trace.c | |
| parent | 81a75f6781deb7a3b5274b4c683e327e5cb5b883 (diff) | |
| download | linux-stable-04d328defd06257bf386d58f359013e0ef329226.tar.gz linux-stable-04d328defd06257bf386d58f359013e0ef329226.tar.bz2 linux-stable-04d328defd06257bf386d58f359013e0ef329226.zip | |
f2fs: use bio op accessors
Separate the op from the rq_flag_bits and have f2fs
set/get the bio using bio_set_op_attrs/bio_op.
Signed-off-by: Mike Christie <mchristi@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'fs/f2fs/trace.c')
| -rw-r--r-- | fs/f2fs/trace.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/f2fs/trace.c b/fs/f2fs/trace.c index 562ce0821559..73b4e1d1912a 100644 --- a/fs/f2fs/trace.c +++ b/fs/f2fs/trace.c @@ -25,11 +25,11 @@ static inline void __print_last_io(void) if (!last_io.len) return; - trace_printk("%3x:%3x %4x %-16s %2x %5x %12x %4x\n", + trace_printk("%3x:%3x %4x %-16s %2x %5x %5x %12x %4x\n", last_io.major, last_io.minor, last_io.pid, "----------------", last_io.type, - last_io.fio.rw, + last_io.fio.op, last_io.fio.op_flags, last_io.fio.new_blkaddr, last_io.len); memset(&last_io, 0, sizeof(last_io)); @@ -101,7 +101,8 @@ void f2fs_trace_ios(struct f2fs_io_info *fio, int flush) if (last_io.major == major && last_io.minor == minor && last_io.pid == pid && last_io.type == __file_type(inode, pid) && - last_io.fio.rw == fio->rw && + last_io.fio.op == fio->op && + last_io.fio.op_flags == fio->op_flags && last_io.fio.new_blkaddr + last_io.len == fio->new_blkaddr) { last_io.len++; |