Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef6b689b authored by Tao Ma's avatar Tao Ma
Browse files

ocfs2: Remove ENTRY from masklog. 



ENTRY is used to record the entry of a function.
But because it is added in so many functions, if we enable it,
the system logs get filled up quickly and cause too much I/O.
So actually no one can open it for a production system or even
for a test.

So for mlog_entry_void, we just remove it.
for mlog_entry(...), we replace it with mlog(0,...), and they
will be replace by trace event later.

Signed-off-by: default avatarTao Ma <boyu.mt@taobao.com>
parent 422e6c4b

fs/ocfs2/alloc.c

+2 −26
Original line number Diff line number Diff line
@@ -965,8 +965,6 @@ int ocfs2_num_free_extents(struct ocfs2_super *osb, 
	struct buffer_head *eb_bh = NULL;

	u64 last_eb_blk = 0;



	mlog_entry_void();



	el = et->et_root_el;

	last_eb_blk = ocfs2_et_get_last_eb_blk(et);
@@ -1010,8 +1008,6 @@ static int ocfs2_create_new_meta_bhs(handle_t *handle, 
		OCFS2_SB(ocfs2_metadata_cache_get_super(et->et_ci));

	struct ocfs2_extent_block *eb;



	mlog_entry_void();



	count = 0;

	while (count < wanted) {

		status = ocfs2_claim_metadata(handle,
@@ -1173,8 +1169,6 @@ static int ocfs2_add_branch(handle_t *handle, 
	struct ocfs2_extent_list  *el;

	u32 new_cpos, root_end;



	mlog_entry_void();



	BUG_ON(!last_eb_bh || !*last_eb_bh);



	if (eb_bh) {
@@ -1353,8 +1347,6 @@ static int ocfs2_shift_tree_depth(handle_t *handle, 
	struct ocfs2_extent_list  *root_el;

	struct ocfs2_extent_list  *eb_el;



	mlog_entry_void();



	status = ocfs2_create_new_meta_bhs(handle, et, 1, meta_ac,

					   &new_eb_bh);

	if (status < 0) {
@@ -1446,8 +1438,6 @@ static int ocfs2_find_branch_target(struct ocfs2_extent_tree *et, 
	struct buffer_head *bh = NULL;

	struct buffer_head *lowest_bh = NULL;



	mlog_entry_void();



	*target_bh = NULL;



	el = et->et_root_el;
@@ -5795,7 +5785,7 @@ int ocfs2_truncate_log_append(struct ocfs2_super *osb, 
	struct ocfs2_dinode *di;

	struct ocfs2_truncate_log *tl;



	mlog_entry("start_blk = %llu, num_clusters = %u\n",

	mlog(0, "start_blk = %llu, num_clusters = %u\n",

	     (unsigned long long)start_blk, num_clusters);



	BUG_ON(mutex_trylock(&tl_inode->i_mutex));
@@ -5878,8 +5868,6 @@ static int ocfs2_replay_truncate_records(struct ocfs2_super *osb, 
	struct inode *tl_inode = osb->osb_tl_inode;

	struct buffer_head *tl_bh = osb->osb_tl_bh;



	mlog_entry_void();



	di = (struct ocfs2_dinode *) tl_bh->b_data;

	tl = &di->id2.i_dealloc;

	i = le16_to_cpu(tl->tl_used) - 1;
@@ -5949,8 +5937,6 @@ int __ocfs2_flush_truncate_log(struct ocfs2_super *osb) 
	struct ocfs2_dinode *di;

	struct ocfs2_truncate_log *tl;



	mlog_entry_void();



	BUG_ON(mutex_trylock(&tl_inode->i_mutex));



	di = (struct ocfs2_dinode *) tl_bh->b_data;
@@ -6032,8 +6018,6 @@ static void ocfs2_truncate_log_worker(struct work_struct *work) 
		container_of(work, struct ocfs2_super,

			     osb_truncate_log_wq.work);



	mlog_entry_void();



	status = ocfs2_flush_truncate_log(osb);

	if (status < 0)

		mlog_errno(status);
@@ -6174,8 +6158,6 @@ int ocfs2_complete_truncate_log_recovery(struct ocfs2_super *osb, 
	struct inode *tl_inode = osb->osb_tl_inode;

	struct ocfs2_truncate_log *tl;



	mlog_entry_void();



	if (OCFS2_I(tl_inode)->ip_blkno == le64_to_cpu(tl_copy->i_blkno)) {

		mlog(ML_ERROR, "Asked to recover my own truncate log!\n");

		return -EINVAL;
@@ -6228,8 +6210,6 @@ void ocfs2_truncate_log_shutdown(struct ocfs2_super *osb) 
	int status;

	struct inode *tl_inode = osb->osb_tl_inode;



	mlog_entry_void();



	if (tl_inode) {

		cancel_delayed_work(&osb->osb_truncate_log_wq);

		flush_workqueue(ocfs2_wq);
@@ -6251,8 +6231,6 @@ int ocfs2_truncate_log_init(struct ocfs2_super *osb) 
	struct inode *tl_inode = NULL;

	struct buffer_head *tl_bh = NULL;



	mlog_entry_void();



	status = ocfs2_get_truncate_log_info(osb,

					     osb->slot_num,

					     &tl_inode,
@@ -7005,8 +6983,6 @@ int ocfs2_commit_truncate(struct ocfs2_super *osb, 
	struct ocfs2_extent_tree et;

	struct ocfs2_cached_dealloc_ctxt dealloc;



	mlog_entry_void();



	ocfs2_init_dinode_extent_tree(&et, INODE_CACHE(inode), di_bh);

	ocfs2_init_dealloc_ctxt(&dealloc);

fs/ocfs2/aops.c

+7 −9
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ static int ocfs2_symlink_get_block(struct inode *inode, sector_t iblock, 
	struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);

	void *kaddr;



	mlog_entry("(0x%p, %llu, 0x%p, %d)\n", inode,

	mlog(0, "(0x%p, %llu, 0x%p, %d)\n", inode,

	     (unsigned long long)iblock, bh_result, create);



	BUG_ON(ocfs2_inode_is_fast_symlink(inode));
@@ -136,7 +136,7 @@ int ocfs2_get_block(struct inode *inode, sector_t iblock, 
	u64 p_blkno, count, past_eof;

	struct ocfs2_super *osb = OCFS2_SB(inode->i_sb);



	mlog_entry("(0x%p, %llu, 0x%p, %d)\n", inode,

	mlog(0, "(0x%p, %llu, 0x%p, %d)\n", inode,

	     (unsigned long long)iblock, bh_result, create);



	if (OCFS2_I(inode)->ip_flags & OCFS2_INODE_SYSTEM_FILE)
@@ -278,7 +278,7 @@ static int ocfs2_readpage(struct file *file, struct page *page) 
	loff_t start = (loff_t)page->index << PAGE_CACHE_SHIFT;

	int ret, unlock = 1;



	mlog_entry("(0x%p, %lu)\n", file, (page ? page->index : 0));

	mlog(0, "(0x%p, %lu)\n", file, (page ? page->index : 0));



	ret = ocfs2_inode_lock_with_page(inode, NULL, 0, page);

	if (ret != 0) {
@@ -398,7 +398,7 @@ static int ocfs2_writepage(struct page *page, struct writeback_control *wbc) 
{

	int ret;



	mlog_entry("(0x%p)\n", page);

	mlog(0, "(0x%p)\n", page);



	ret = block_write_full_page(page, ocfs2_get_block, wbc);
@@ -450,7 +450,7 @@ static sector_t ocfs2_bmap(struct address_space *mapping, sector_t block) 
	int err = 0;

	struct inode *inode = mapping->host;



	mlog_entry("(block = %llu)\n", (unsigned long long)block);

	mlog(0, "(block = %llu)\n", (unsigned long long)block);



	/* We don't need to lock journal system files, since they aren't

	 * accessed concurrently from multiple nodes.
@@ -618,8 +618,6 @@ static ssize_t ocfs2_direct_IO(int rw, 
	struct inode *inode = file->f_path.dentry->d_inode->i_mapping->host;

	int ret;



	mlog_entry_void();



	/*

	 * Fallback to buffered I/O if we see an inode without

	 * extents.

fs/ocfs2/buffer_head_io.c

+4 −6
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ int ocfs2_write_block(struct ocfs2_super *osb, struct buffer_head *bh, 
{

	int ret = 0;



	mlog_entry("(bh->b_blocknr = %llu, ci=%p)\n",

	mlog(0, "(bh->b_blocknr = %llu, ci=%p)\n",

	     (unsigned long long)bh->b_blocknr, ci);



	BUG_ON(bh->b_blocknr < OCFS2_SUPER_BLOCK_BLKNO);
@@ -186,7 +186,7 @@ int ocfs2_read_blocks(struct ocfs2_caching_info *ci, u64 block, int nr, 
	struct buffer_head *bh;

	struct super_block *sb = ocfs2_metadata_cache_get_super(ci);



	mlog_entry("(ci=%p, block=(%llu), nr=(%d), flags=%d)\n",

	mlog(0, "(ci=%p, block=(%llu), nr=(%d), flags=%d)\n",

	     ci, (unsigned long long)block, nr, flags);



	BUG_ON(!ci);
@@ -408,8 +408,6 @@ int ocfs2_write_super_or_backup(struct ocfs2_super *osb, 
	int ret = 0;

	struct ocfs2_dinode *di = (struct ocfs2_dinode *)bh->b_data;



	mlog_entry_void();



	BUG_ON(buffer_jbd(bh));

	ocfs2_check_super_or_backup(osb->sb, bh->b_blocknr);

fs/ocfs2/cluster/heartbeat.c

+0 −2
Original line number Diff line number Diff line
@@ -1658,8 +1658,6 @@ static int o2hb_populate_slot_data(struct o2hb_region *reg) 
	struct o2hb_disk_slot *slot;

	struct o2hb_disk_heartbeat_block *hb_block;



	mlog_entry_void();



	ret = o2hb_read_slots(reg, reg->hr_blocks);

	if (ret) {

		mlog_errno(ret);

fs/ocfs2/cluster/masklog.c

+0 −1
Original line number Diff line number Diff line
@@ -80,7 +80,6 @@ struct mlog_attribute { 
}



static struct mlog_attribute mlog_attrs[MLOG_MAX_BITS] = {

	define_mask(ENTRY),

	define_mask(EXIT),

	define_mask(TCP),

	define_mask(MSG),