1 files changed, 52 insertions, 69 deletions

diff --git a/fs/ocfs2/dir.c b/fs/ocfs2/dir.c
index f97b6f1c61dd..9fe5b8fd658f 100644
--- a/fs/ocfs2/dir.c
+++ b/fs/ocfs2/dir.c
@@ -43,7 +43,6 @@
 #include <linux/quotaops.h>
 #include <linux/sort.h>
 
-#define MLOG_MASK_PREFIX ML_NAMEI
 #include <cluster/masklog.h>
 
 #include "ocfs2.h"
@@ -61,6 +60,7 @@
 #include "super.h"
 #include "sysfile.h"
 #include "uptodate.h"
+#include "ocfs2_trace.h"
 
 #include "buffer_head_io.h"
 
@@ -322,21 +322,23 @@ static int ocfs2_check_dir_entry(struct inode * dir,
         const char *error_msg = NULL;
         const int rlen = le16_to_cpu(de->rec_len);
 
-        if (rlen < OCFS2_DIR_REC_LEN(1))
+        if (unlikely(rlen < OCFS2_DIR_REC_LEN(1)))
                 error_msg = "rec_len is smaller than minimal";
-        else if (rlen % 4 != 0)
+        else if (unlikely(rlen % 4 != 0))
                 error_msg = "rec_len % 4 != 0";
-        else if (rlen < OCFS2_DIR_REC_LEN(de->name_len))
+        else if (unlikely(rlen < OCFS2_DIR_REC_LEN(de->name_len)))
                 error_msg = "rec_len is too small for name_len";
-        else if (((char *) de - bh->b_data) + rlen > dir->i_sb->s_blocksize)
+        else if (unlikely(
+                 ((char *) de - bh->b_data) + rlen > dir->i_sb->s_blocksize))
                 error_msg = "directory entry across blocks";
 
-        if (error_msg != NULL)
+        if (unlikely(error_msg != NULL))
                 mlog(ML_ERROR, "bad entry in directory #%llu: %s - "
                      "offset=%lu, inode=%llu, rec_len=%d, name_len=%d\n",
                      (unsigned long long)OCFS2_I(dir)->ip_blkno, error_msg,
                      offset, (unsigned long long)le64_to_cpu(de->inode), rlen,
                      de->name_len);
+
         return error_msg == NULL ? 1 : 0;
 }
 
@@ -367,8 +369,6 @@ static inline int ocfs2_search_dirblock(struct buffer_head *bh,
         int de_len;
         int ret = 0;
 
-        mlog_entry_void();
-
         de_buf = first_de;
         dlimit = de_buf + bytes;
 
@@ -402,7 +402,7 @@ static inline int ocfs2_search_dirblock(struct buffer_head *bh,
         }
 
 bail:
-        mlog_exit(ret);
+        trace_ocfs2_search_dirblock(ret);
         return ret;
 }
 
@@ -447,8 +447,7 @@ static int ocfs2_validate_dir_block(struct super_block *sb,
          * We don't validate dirents here, that's handled
          * in-place when the code walks them.
          */
-        mlog(0, "Validating dirblock %llu\n",
-             (unsigned long long)bh->b_blocknr);
+        trace_ocfs2_validate_dir_block((unsigned long long)bh->b_blocknr);
 
         BUG_ON(!buffer_uptodate(bh));
 
@@ -706,8 +705,6 @@ static struct buffer_head *ocfs2_find_entry_el(const char *name, int namelen,
         int num = 0;
         int nblocks, i, err;
 
-        mlog_entry_void();
-
         sb = dir->i_sb;
 
         nblocks = i_size_read(dir) >> sb->s_blocksize_bits;
@@ -788,7 +785,7 @@ cleanup_and_exit:
         for (; ra_ptr < ra_max; ra_ptr++)
                 brelse(bh_use[ra_ptr]);
 
-        mlog_exit_ptr(ret);
+        trace_ocfs2_find_entry_el(ret);
         return ret;
 }
 
@@ -950,11 +947,9 @@ static int ocfs2_dx_dir_search(const char *name, int namelen,
                 goto out;
         }
 
-        mlog(0, "Dir %llu: name: \"%.*s\", lookup of hash: %u.0x%x "
-             "returns: %llu\n",
-             (unsigned long long)OCFS2_I(dir)->ip_blkno,
-             namelen, name, hinfo->major_hash, hinfo->minor_hash,
-             (unsigned long long)phys);
+        trace_ocfs2_dx_dir_search((unsigned long long)OCFS2_I(dir)->ip_blkno,
+                                  namelen, name, hinfo->major_hash,
+                                  hinfo->minor_hash, (unsigned long long)phys);
 
         ret = ocfs2_read_dx_leaf(dir, phys, &dx_leaf_bh);
         if (ret) {
@@ -964,9 +959,9 @@ static int ocfs2_dx_dir_search(const char *name, int namelen,
 
         dx_leaf = (struct ocfs2_dx_leaf *) dx_leaf_bh->b_data;
 
-        mlog(0, "leaf info: num_used: %d, count: %d\n",
-             le16_to_cpu(dx_leaf->dl_list.de_num_used),
-             le16_to_cpu(dx_leaf->dl_list.de_count));
+        trace_ocfs2_dx_dir_search_leaf_info(
+                        le16_to_cpu(dx_leaf->dl_list.de_num_used),
+                        le16_to_cpu(dx_leaf->dl_list.de_count));
 
         entry_list = &dx_leaf->dl_list;
 
@@ -1166,8 +1161,6 @@ static int __ocfs2_delete_entry(handle_t *handle, struct inode *dir,
         int i, status = -ENOENT;
         ocfs2_journal_access_func access = ocfs2_journal_access_db;
 
-        mlog_entry("(0x%p, 0x%p, 0x%p, 0x%p)\n", handle, dir, de_del, bh);
-
         if (OCFS2_I(dir)->ip_dyn_features & OCFS2_INLINE_DATA_FL)
                 access = ocfs2_journal_access_di;
 
@@ -1202,7 +1195,6 @@ static int __ocfs2_delete_entry(handle_t *handle, struct inode *dir,
                 de = (struct ocfs2_dir_entry *)((char *)de + le16_to_cpu(de->rec_len));
         }
 bail:
-        mlog_exit(status);
         return status;
 }
 
@@ -1348,8 +1340,8 @@ static int ocfs2_delete_entry_dx(handle_t *handle, struct inode *dir,
                 }
         }
 
-        mlog(0, "Dir %llu: delete entry at index: %d\n",
-             (unsigned long long)OCFS2_I(dir)->ip_blkno, index);
+        trace_ocfs2_delete_entry_dx((unsigned long long)OCFS2_I(dir)->ip_blkno,
+                                    index);
 
         ret = __ocfs2_delete_entry(handle, dir, lookup->dl_entry,
                                    leaf_bh, leaf_bh->b_data, leaf_bh->b_size);
@@ -1632,8 +1624,6 @@ int __ocfs2_add_entry(handle_t *handle,
         struct buffer_head *insert_bh = lookup->dl_leaf_bh;
         char *data_start = insert_bh->b_data;
 
-        mlog_entry_void();
-
         if (!namelen)
                 return -EINVAL;
 
@@ -1765,8 +1755,9 @@ int __ocfs2_add_entry(handle_t *handle,
          * from ever getting here. */
         retval = -ENOSPC;
 bail:
+        if (retval)
+                mlog_errno(retval);
 
-        mlog_exit(retval);
         return retval;
 }
 
@@ -2028,8 +2019,7 @@ int ocfs2_readdir(struct file * filp, void * dirent, filldir_t filldir)
         struct inode *inode = filp->f_path.dentry->d_inode;
         int lock_level = 0;
 
-        mlog_entry("dirino=%llu\n",
-                   (unsigned long long)OCFS2_I(inode)->ip_blkno);
+        trace_ocfs2_readdir((unsigned long long)OCFS2_I(inode)->ip_blkno);
 
         error = ocfs2_inode_lock_atime(inode, filp->f_vfsmnt, &lock_level);
         if (lock_level && error >= 0) {
@@ -2051,9 +2041,10 @@ int ocfs2_readdir(struct file * filp, void * dirent, filldir_t filldir)
                                       dirent, filldir, NULL);
 
         ocfs2_inode_unlock(inode, lock_level);
+        if (error)
+                mlog_errno(error);
 
 bail_nolock:
-        mlog_exit(error);
 
         return error;
 }
@@ -2069,8 +2060,8 @@ int ocfs2_find_files_on_disk(const char *name,
 {
         int status = -ENOENT;
 
-        mlog(0, "name=%.*s, blkno=%p, inode=%llu\n", namelen, name, blkno,
-             (unsigned long long)OCFS2_I(inode)->ip_blkno);
+        trace_ocfs2_find_files_on_disk(namelen, name, blkno,
+                                (unsigned long long)OCFS2_I(inode)->ip_blkno);
 
         status = ocfs2_find_entry(name, namelen, inode, lookup);
         if (status)
@@ -2114,8 +2105,8 @@ int ocfs2_check_dir_for_entry(struct inode *dir,
         int ret;
         struct ocfs2_dir_lookup_result lookup = { NULL, };
 
-        mlog_entry("dir %llu, name '%.*s'\n",
-                   (unsigned long long)OCFS2_I(dir)->ip_blkno, namelen, name);
+        trace_ocfs2_check_dir_for_entry(
+                (unsigned long long)OCFS2_I(dir)->ip_blkno, namelen, name);
 
         ret = -EEXIST;
         if (ocfs2_find_entry(name, namelen, dir, &lookup) == 0)
@@ -2125,7 +2116,8 @@ int ocfs2_check_dir_for_entry(struct inode *dir,
 bail:
         ocfs2_free_dir_lookup_result(&lookup);
 
-        mlog_exit(ret);
+        if (ret)
+                mlog_errno(ret);
         return ret;
 }
 
@@ -2324,8 +2316,6 @@ static int ocfs2_fill_new_dir_el(struct ocfs2_super *osb,
         struct buffer_head *new_bh = NULL;
         struct ocfs2_dir_entry *de;
 
-        mlog_entry_void();
-
         if (ocfs2_new_dir_wants_trailer(inode))
                 size = ocfs2_dir_trailer_blk_off(parent->i_sb);
 
@@ -2380,7 +2370,6 @@ static int ocfs2_fill_new_dir_el(struct ocfs2_super *osb,
 bail:
         brelse(new_bh);
 
-        mlog_exit(status);
         return status;
 }
 
@@ -2409,9 +2398,9 @@ static int ocfs2_dx_dir_attach_index(struct ocfs2_super *osb,
                 goto out;
         }
 
-        mlog(0, "Dir %llu, attach new index block: %llu\n",
-             (unsigned long long)OCFS2_I(dir)->ip_blkno,
-             (unsigned long long)dr_blkno);
+        trace_ocfs2_dx_dir_attach_index(
+                                (unsigned long long)OCFS2_I(dir)->ip_blkno,
+                                (unsigned long long)dr_blkno);
 
         dx_root_bh = sb_getblk(osb->sb, dr_blkno);
         if (dx_root_bh == NULL) {
@@ -2511,11 +2500,10 @@ static int ocfs2_dx_dir_format_cluster(struct ocfs2_super *osb,
                 dx_leaf->dl_list.de_count =
                         cpu_to_le16(ocfs2_dx_entries_per_leaf(osb->sb));
 
-                mlog(0,
-                     "Dir %llu, format dx_leaf: %llu, entry count: %u\n",
-                     (unsigned long long)OCFS2_I(dir)->ip_blkno,
-                     (unsigned long long)bh->b_blocknr,
-                     le16_to_cpu(dx_leaf->dl_list.de_count));
+                trace_ocfs2_dx_dir_format_cluster(
+                                (unsigned long long)OCFS2_I(dir)->ip_blkno,
+                                (unsigned long long)bh->b_blocknr,
+                                le16_to_cpu(dx_leaf->dl_list.de_count));
 
                 ocfs2_journal_dirty(handle, bh);
         }
@@ -2759,12 +2747,11 @@ static void ocfs2_dx_dir_index_root_block(struct inode *dir,
 
                 ocfs2_dx_dir_name_hash(dir, de->name, de->name_len, &hinfo);
 
-                mlog(0,
-                     "dir: %llu, major: 0x%x minor: 0x%x, index: %u, name: %.*s\n",
-                     (unsigned long long)dir->i_ino, hinfo.major_hash,
-                     hinfo.minor_hash,
-                     le16_to_cpu(dx_root->dr_entries.de_num_used),
-                     de->name_len, de->name);
+                trace_ocfs2_dx_dir_index_root_block(
+                                (unsigned long long)dir->i_ino,
+                                hinfo.major_hash, hinfo.minor_hash,
+                                de->name_len, de->name,
+                                le16_to_cpu(dx_root->dr_entries.de_num_used));
 
                 ocfs2_dx_entry_list_insert(&dx_root->dr_entries, &hinfo,
                                            dirent_blk);
@@ -3235,7 +3222,6 @@ static int ocfs2_do_extend_dir(struct super_block *sb,
 bail:
         if (did_quota && status < 0)
                 dquot_free_space_nodirty(dir, ocfs2_clusters_to_bytes(sb, 1));
-        mlog_exit(status);
         return status;
 }
 
@@ -3270,8 +3256,6 @@ static int ocfs2_extend_dir(struct ocfs2_super *osb,
         struct ocfs2_extent_tree et;
         struct buffer_head *dx_root_bh = lookup->dl_dx_root_bh;
 
-        mlog_entry_void();
-
         if (OCFS2_I(dir)->ip_dyn_features & OCFS2_INLINE_DATA_FL) {
                 /*
                  * This would be a code error as an inline directory should
@@ -3320,8 +3304,8 @@ static int ocfs2_extend_dir(struct ocfs2_super *osb,
         down_write(&OCFS2_I(dir)->ip_alloc_sem);
         drop_alloc_sem = 1;
         dir_i_size = i_size_read(dir);
-        mlog(0, "extending dir %llu (i_size = %lld)\n",
-             (unsigned long long)OCFS2_I(dir)->ip_blkno, dir_i_size);
+        trace_ocfs2_extend_dir((unsigned long long)OCFS2_I(dir)->ip_blkno,
+                               dir_i_size);
 
         /* dir->i_size is always block aligned. */
         spin_lock(&OCFS2_I(dir)->ip_lock);
@@ -3436,7 +3420,6 @@ bail:
 
         brelse(new_bh);
 
-        mlog_exit(status);
         return status;
 }
 
@@ -3583,8 +3566,9 @@ next:
         status = 0;
 bail:
         brelse(bh);
+        if (status)
+                mlog_errno(status);
 
-        mlog_exit(status);
         return status;
 }
 
@@ -3815,9 +3799,9 @@ static int ocfs2_dx_dir_rebalance(struct ocfs2_super *osb, struct inode *dir,
         struct ocfs2_dx_root_block *dx_root;
         struct ocfs2_dx_leaf *tmp_dx_leaf = NULL;
 
-        mlog(0, "DX Dir: %llu, rebalance leaf leaf_blkno: %llu insert: %u\n",
-             (unsigned long long)OCFS2_I(dir)->ip_blkno,
-             (unsigned long long)leaf_blkno, insert_hash);
+        trace_ocfs2_dx_dir_rebalance((unsigned long long)OCFS2_I(dir)->ip_blkno,
+                                     (unsigned long long)leaf_blkno,
+                                     insert_hash);
 
         ocfs2_init_dx_root_extent_tree(&et, INODE_CACHE(dir), dx_root_bh);
 
@@ -3897,8 +3881,7 @@ static int ocfs2_dx_dir_rebalance(struct ocfs2_super *osb, struct inode *dir,
                 goto  out_commit;
         }
 
-        mlog(0, "Split leaf (%u) at %u, insert major hash is %u\n",
-             leaf_cpos, split_hash, insert_hash);
+        trace_ocfs2_dx_dir_rebalance_split(leaf_cpos, split_hash, insert_hash);
 
         /*
          * We have to carefully order operations here. There are items
@@ -4355,8 +4338,8 @@ int ocfs2_prepare_dir_for_insert(struct ocfs2_super *osb,
         unsigned int blocks_wanted = 1;
         struct buffer_head *bh = NULL;
 
-        mlog(0, "getting ready to insert namelen %d into dir %llu\n",
-             namelen, (unsigned long long)OCFS2_I(dir)->ip_blkno);
+        trace_ocfs2_prepare_dir_for_insert(
+                (unsigned long long)OCFS2_I(dir)->ip_blkno, namelen);
 
         if (!namelen) {
                 ret = -EINVAL;