Merge branch 'docs/docbook/drm' of git://github.com/mfwitten/linux into docs-move

[pandora-kernel.git] / fs / ocfs2 / extent_map.c

diff --git a/fs/ocfs2/extent_map.c b/fs/ocfs2/extent_map.c
index ed9916a..23457b4 100644 (file)
--- a/fs/ocfs2/extent_map.c
+++ b/fs/ocfs2/extent_map.c
@@ -28,7 +28,6 @@
 #include <linux/types.h>
 #include <linux/fiemap.h>
 
-#define MLOG_MASK_PREFIX ML_EXTENT_MAP
 #include <cluster/masklog.h>
 
 #include "ocfs2.h"
@@ -39,6 +38,7 @@
 #include "inode.h"
 #include "super.h"
 #include "symlink.h"
+#include "ocfs2_trace.h"
 
 #include "buffer_head_io.h"
 
@@ -841,8 +841,7 @@ int ocfs2_read_virt_blocks(struct inode *inode, u64 v_block, int nr,
        u64 p_block, p_count;
        int i, count, done = 0;
 
-       mlog(0, "(inode = %p, v_block = %llu, nr = %d, bhs = %p, "
-            "flags = %x, validate = %p)\n",
+       trace_ocfs2_read_virt_blocks(
             inode, (unsigned long long)v_block, nr, bhs, flags,
             validate);
 
@@ -897,7 +896,6 @@ int ocfs2_read_virt_blocks(struct inode *inode, u64 v_block, int nr,
        }
 
 out:
-       mlog_exit(rc);
        return rc;
 }