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: Tao Ma <boyu.mt@taobao.com>

1 files changed, 2 insertions, 26 deletions

diff --git a/fs/ocfs2/alloc.c b/fs/ocfs2/alloc.c
index e4984e259cb6..47a6ce84e67f 100644
--- a/fs/ocfs2/alloc.c
+++ b/fs/ocfs2/alloc.c
@@ -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,8 +5785,8 @@ 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",
-                   (unsigned long long)start_blk, num_clusters);
+        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);