dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

ocfs2: Remove mlog(0) from fs/ocfs2/slot_map.c 

This is the 1st step to remove the debug info of SUPER.

Signed-off-by: Tao Ma <boyu.mt@taobao.com>
This commit is contained in:
Tao Ma 2011-02-22 22:29:08 +08:00
parent a716357c47
commit a8731086ef
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fs/ocfs2/ocfs2_trace.h
View File

@ -1519,6 +1519,17 @@ TRACE_EVENT(ocfs2_read_virt_blocks,
/* End of trace events for fs/ocfs2/extent_map.c. */
/* Trace events for fs/ocfs2/slot_map.c. */
DEFINE_OCFS2_UINT_EVENT(ocfs2_refresh_slot_info);
DEFINE_OCFS2_ULL_UINT_EVENT(ocfs2_map_slot_buffers);
DEFINE_OCFS2_ULL_UINT_EVENT(ocfs2_map_slot_buffers_block);
DEFINE_OCFS2_INT_EVENT(ocfs2_find_slot);
/* End of trace events for fs/ocfs2/slot_map.c. */
#endif /* _TRACE_OCFS2_H */
/* This part must be outside protection */

13
fs/ocfs2/slot_map.c
View File

@ -27,7 +27,6 @@
#include <linux/slab.h>
#include <linux/highmem.h>
#define MLOG_MASK_PREFIX ML_SUPER
#include <cluster/masklog.h>
#include "ocfs2.h"
@ -39,6 +38,7 @@
#include "slot_map.h"
#include "super.h"
#include "sysfile.h"
#include "ocfs2_trace.h"
#include "buffer_head_io.h"
@ -142,8 +142,7 @@ int ocfs2_refresh_slot_info(struct ocfs2_super *osb)
BUG_ON(si->si_blocks == 0);
BUG_ON(si->si_bh == NULL);
mlog(0, "Refreshing slot map, reading %u block(s)\n",
si->si_blocks);
trace_ocfs2_refresh_slot_info(si->si_blocks);
/*
* We pass -1 as blocknr because we expect all of si->si_bh to
@ -381,8 +380,7 @@ static int ocfs2_map_slot_buffers(struct ocfs2_super *osb,
/* The size checks above should ensure this */
BUG_ON((osb->max_slots / si->si_slots_per_block) > blocks);
mlog(0, "Slot map needs %u buffers for %llu bytes\n",
si->si_blocks, bytes);
trace_ocfs2_map_slot_buffers(bytes, si->si_blocks);
si->si_bh = kzalloc(sizeof(struct buffer_head *) * si->si_blocks,
GFP_KERNEL);
@ -400,8 +398,7 @@ static int ocfs2_map_slot_buffers(struct ocfs2_super *osb,
goto bail;
}
mlog(0, "Reading slot map block %u at %llu\n", i,
(unsigned long long)blkno);
trace_ocfs2_map_slot_buffers_block((unsigned long long)blkno, i);
bh = NULL; /* Acquire a fresh bh */
status = ocfs2_read_blocks(INODE_CACHE(si->si_inode), blkno,
@ -503,7 +500,7 @@ int ocfs2_find_slot(struct ocfs2_super *osb)
osb->slot_num = slot;
spin_unlock(&osb->osb_lock);
mlog(0, "taking node slot %d\n", osb->slot_num);
trace_ocfs2_find_slot(osb->slot_num);
status = ocfs2_update_disk_slot(osb, si, osb->slot_num);
if (status < 0)