ocfs2: Remove FILE_IO from masklog.

Change all the "mlog(0," in fs/ocfs2/mmap.c to trace events.
And finally remove masklog FILE_IO.

Signed-off-by: Tao Ma <boyu.mt@taobao.com>

diff --git a/fs/ocfs2/cluster/masklog.c b/fs/ocfs2/cluster/masklog.c
index a961cca125290c1b5a5673929f93ac661ae424c7..036e8b8814f7960f08c63db27ab85eba7b113200 100644 (file)
--- a/fs/ocfs2/cluster/masklog.c
+++ b/fs/ocfs2/cluster/masklog.c
@@ -94,7 +94,6 @@ static struct mlog_attribute mlog_attrs[MLOG_MAX_BITS] = {
        define_mask(AIO),
        define_mask(JOURNAL),
        define_mask(SUPER),
-       define_mask(FILE_IO),
        define_mask(EXTENT_MAP),
        define_mask(DLM_GLUE),
        define_mask(BH_IO),

diff --git a/fs/ocfs2/cluster/masklog.h b/fs/ocfs2/cluster/masklog.h
index 845ea2b02f0b1a42632c3ba7912681ba9f3b7972..d07780ab9f8f9993f900bf512703dd30b60a7585 100644 (file)
--- a/fs/ocfs2/cluster/masklog.h
+++ b/fs/ocfs2/cluster/masklog.h
@@ -96,7 +96,6 @@
 #define ML_AIO         0x0000000000002000ULL /* ocfs2 aio read and write */
 #define ML_JOURNAL     0x0000000000004000ULL /* ocfs2 journalling functions */
 #define ML_SUPER       0x0000000000010000ULL /* ocfs2 mount / umount */
-#define ML_FILE_IO     0x0000000000020000ULL /* ocfs2 file I/O */
 #define ML_EXTENT_MAP  0x0000000000040000ULL /* ocfs2 extent map caching */
 #define ML_DLM_GLUE    0x0000000000080000ULL /* ocfs2 dlm glue layer */
 #define ML_BH_IO       0x0000000000100000ULL /* ocfs2 buffer I/O */

diff --git a/fs/ocfs2/mmap.c b/fs/ocfs2/mmap.c
index 49730b51ae451eaf47758f9e60b1ea5694b81d34..3e9393ca39ebd823772ae910cda1b4516d46fa62 100644 (file)
--- a/fs/ocfs2/mmap.c
+++ b/fs/ocfs2/mmap.c
@@ -31,7 +31,6 @@
 #include <linux/signal.h>
 #include <linux/rbtree.h>
 
-#define MLOG_MASK_PREFIX ML_FILE_IO
 #include <cluster/masklog.h>
 
 #include "ocfs2.h"
@@ -42,6 +41,7 @@
 #include "inode.h"
 #include "mmap.h"
 #include "super.h"
+#include "ocfs2_trace.h"
 
 
 static int ocfs2_fault(struct vm_area_struct *area, struct vm_fault *vmf)
@@ -49,13 +49,12 @@ static int ocfs2_fault(struct vm_area_struct *area, struct vm_fault *vmf)
        sigset_t oldset;
        int ret;
 
-       mlog(0, "(area=%p, page offset=%lu)\n", area, vmf->pgoff);
-
        ocfs2_block_signals(&oldset);
        ret = filemap_fault(area, vmf);
        ocfs2_unblock_signals(&oldset);
 
-       mlog(0, "%p\n", vmf->page);
+       trace_ocfs2_fault(OCFS2_I(area->vm_file->f_mapping->host)->ip_blkno,
+                         area, vmf->page, vmf->pgoff);
        return ret;
 }
 

diff --git a/fs/ocfs2/ocfs2_trace.h b/fs/ocfs2/ocfs2_trace.h
index 5958da57f8ff3561d49ca7c31cb21638aa1d25c1..77148e7a14f8188cae5c7b9628a820f5800534c5 100644 (file)
--- a/fs/ocfs2/ocfs2_trace.h
+++ b/fs/ocfs2/ocfs2_trace.h
@@ -1092,6 +1092,31 @@ TRACE_EVENT(ocfs2_write_end_inline,
 );
 
 /* End of trace events for fs/ocfs2/aops.c. */
+
+/* Trace events for fs/ocfs2/mmap.c. */
+
+TRACE_EVENT(ocfs2_fault,
+       TP_PROTO(unsigned long long ino,
+                void *area, void *page, unsigned long pgoff),
+       TP_ARGS(ino, area, page, pgoff),
+       TP_STRUCT__entry(
+               __field(unsigned long long, ino)
+               __field(void *, area)
+               __field(void *, page)
+               __field(unsigned long, pgoff)
+       ),
+       TP_fast_assign(
+               __entry->ino = ino;
+               __entry->area = area;
+               __entry->page = page;
+               __entry->pgoff = pgoff;
+       ),
+       TP_printk("%llu %p %p %lu",
+                 __entry->ino, __entry->area, __entry->page, __entry->pgoff)
+);
+
+/* End of trace events for fs/ocfs2/mmap.c. */
+
 #endif /* _TRACE_OCFS2_H */
 
 /* This part must be outside protection */