Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

[linux-2.6-block.git] / fs / f2fs / trace.c

diff --git a/fs/f2fs/trace.c b/fs/f2fs/trace.c
index 145fb659ad445893e24c8078cf6999ed45bc3da8..562ce0821559f5e8483117032a645dd96d9e8335 100644 (file)
--- a/fs/f2fs/trace.c
+++ b/fs/f2fs/trace.c
@@ -29,7 +29,8 @@ static inline void __print_last_io(void)
                        last_io.major, last_io.minor,
                        last_io.pid, "----------------",
                        last_io.type,
-                       last_io.fio.rw, last_io.fio.blk_addr,
+                       last_io.fio.rw,
+                       last_io.fio.new_blkaddr,
                        last_io.len);
        memset(&last_io, 0, sizeof(last_io));
 }
@@ -101,7 +102,8 @@ void f2fs_trace_ios(struct f2fs_io_info *fio, int flush)
                        last_io.pid == pid &&
                        last_io.type == __file_type(inode, pid) &&
                        last_io.fio.rw == fio->rw &&
-                       last_io.fio.blk_addr + last_io.len == fio->blk_addr) {
+                       last_io.fio.new_blkaddr + last_io.len ==
+                                                       fio->new_blkaddr) {
                last_io.len++;
                return;
        }