tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

ocfs2: Remove masklog ML_EXTENT_MAP.

Remove mlog(0) from fs/ocfs2/extent_map.c and the masklog EXTENT_MAP.

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

Tao Ma a716357c 64f3b269

+31 -5
-1
fs/ocfs2/cluster/masklog.c
··· 94 94 define_mask(AIO), 95 95 define_mask(JOURNAL), 96 96 define_mask(SUPER), 97 - define_mask(EXTENT_MAP), 98 97 define_mask(DLM_GLUE), 99 98 define_mask(BH_IO), 100 99 define_mask(UPTODATE),
-1
fs/ocfs2/cluster/masklog.h
··· 96 96 #define ML_AIO 0x0000000000002000ULL /* ocfs2 aio read and write */ 97 97 #define ML_JOURNAL 0x0000000000004000ULL /* ocfs2 journalling functions */ 98 98 #define ML_SUPER 0x0000000000010000ULL /* ocfs2 mount / umount */ 99 - #define ML_EXTENT_MAP 0x0000000000040000ULL /* ocfs2 extent map caching */ 100 99 #define ML_DLM_GLUE 0x0000000000080000ULL /* ocfs2 dlm glue layer */ 101 100 #define ML_BH_IO 0x0000000000100000ULL /* ocfs2 buffer I/O */ 102 101 #define ML_UPTODATE 0x0000000000200000ULL /* ocfs2 caching sequence #'s */
+2 -3
fs/ocfs2/extent_map.c
··· 28 28 #include <linux/types.h> 29 29 #include <linux/fiemap.h> 30 30 31 - #define MLOG_MASK_PREFIX ML_EXTENT_MAP 32 31 #include <cluster/masklog.h> 33 32 34 33 #include "ocfs2.h" ··· 38 39 #include "inode.h" 39 40 #include "super.h" 40 41 #include "symlink.h" 42 + #include "ocfs2_trace.h" 41 43 42 44 #include "buffer_head_io.h" 43 45 ··· 841 841 u64 p_block, p_count; 842 842 int i, count, done = 0; 843 843 844 - mlog(0, "(inode = %p, v_block = %llu, nr = %d, bhs = %p, " 845 - "flags = %x, validate = %p)\n", 844 + trace_ocfs2_read_virt_blocks( 846 845 inode, (unsigned long long)v_block, nr, bhs, flags, 847 846 validate); 848 847
+29
fs/ocfs2/ocfs2_trace.h
··· 1490 1490 DEFINE_OCFS2_ULL_EVENT(ocfs2_mark_inode_dirty); 1491 1491 1492 1492 /* End of trace events for fs/ocfs2/inode.c. */ 1493 + 1494 + /* Trace events for fs/ocfs2/extent_map.c. */ 1495 + 1496 + TRACE_EVENT(ocfs2_read_virt_blocks, 1497 + TP_PROTO(void *inode, unsigned long long vblock, int nr, 1498 + void *bhs, unsigned int flags, void *validate), 1499 + TP_ARGS(inode, vblock, nr, bhs, flags, validate), 1500 + TP_STRUCT__entry( 1501 + __field(void *, inode) 1502 + __field(unsigned long long, vblock) 1503 + __field(int, nr) 1504 + __field(void *, bhs) 1505 + __field(unsigned int, flags) 1506 + __field(void *, validate) 1507 + ), 1508 + TP_fast_assign( 1509 + __entry->inode = inode; 1510 + __entry->vblock = vblock; 1511 + __entry->nr = nr; 1512 + __entry->bhs = bhs; 1513 + __entry->flags = flags; 1514 + __entry->validate = validate; 1515 + ), 1516 + TP_printk("%p %llu %d %p %x %p", __entry->inode, __entry->vblock, 1517 + __entry->nr, __entry->bhs, __entry->flags, __entry->validate) 1518 + ); 1519 + 1520 + /* End of trace events for fs/ocfs2/extent_map.c. */ 1521 + 1493 1522 #endif /* _TRACE_OCFS2_H */ 1494 1523 1495 1524 /* This part must be outside protection */