Merge remote-tracking branch 'lsk/v3.10/topic/big.LITTLE' into linux-linaro-lsk

[firefly-linux-kernel-4.4.55.git] / fs / ocfs2 / resize.c

diff --git a/fs/ocfs2/resize.c b/fs/ocfs2/resize.c
index dacd553d861769a4c3c0aab53b462b3a444fc872..ec55add7604a0e964447efa954e4424bf1a39016 100644 (file)
--- a/fs/ocfs2/resize.c
+++ b/fs/ocfs2/resize.c
@@ -27,7 +27,6 @@
 #include <linux/fs.h>
 #include <linux/types.h>
 
-#define MLOG_MASK_PREFIX ML_DISK_ALLOC
 #include <cluster/masklog.h>
 
 #include "ocfs2.h"
@@ -39,6 +38,7 @@
 #include "super.h"
 #include "sysfile.h"
 #include "uptodate.h"
+#include "ocfs2_trace.h"
 
 #include "buffer_head_io.h"
 #include "suballoc.h"
@@ -82,7 +82,6 @@ static u16 ocfs2_calc_new_backup_super(struct inode *inode,
                backups++;
        }
 
-       mlog_exit_void();
        return backups;
 }
 
@@ -103,8 +102,8 @@ static int ocfs2_update_last_group_and_inode(handle_t *handle,
        u16 cl_bpc = le16_to_cpu(cl->cl_bpc);
        u16 cl_cpg = le16_to_cpu(cl->cl_cpg);
 
-       mlog_entry("(new_clusters=%d, first_new_cluster = %u)\n",
-                  new_clusters, first_new_cluster);
+       trace_ocfs2_update_last_group_and_inode(new_clusters,
+                                               first_new_cluster);
 
        ret = ocfs2_journal_access_gd(handle, INODE_CACHE(bm_inode),
                                      group_bh, OCFS2_JOURNAL_ACCESS_WRITE);
@@ -176,7 +175,8 @@ out_rollback:
                le16_add_cpu(&group->bg_free_bits_count, -1 * num_bits);
        }
 out:
-       mlog_exit(ret);
+       if (ret)
+               mlog_errno(ret);
        return ret;
 }
 
@@ -281,8 +281,6 @@ int ocfs2_group_extend(struct inode * inode, int new_clusters)
        u32 first_new_cluster;
        u64 lgd_blkno;
 
-       mlog_entry_void();
-
        if (ocfs2_is_hard_readonly(osb) || ocfs2_is_soft_readonly(osb))
                return -EROFS;
 
@@ -342,7 +340,8 @@ int ocfs2_group_extend(struct inode * inode, int new_clusters)
                goto out_unlock;
        }
 
-       mlog(0, "extend the last group at %llu, new clusters = %d\n",
+
+       trace_ocfs2_group_extend(
             (unsigned long long)le64_to_cpu(group->bg_blkno), new_clusters);
 
        handle = ocfs2_start_trans(osb, OCFS2_GROUP_EXTEND_CREDITS);
@@ -377,7 +376,6 @@ out_mutex:
        iput(main_bm_inode);
 
 out:
-       mlog_exit_void();
        return ret;
 }
 
@@ -472,8 +470,6 @@ int ocfs2_group_add(struct inode *inode, struct ocfs2_new_group_input *input)
        struct ocfs2_chain_rec *cr;
        u16 cl_bpc;
 
-       mlog_entry_void();
-
        if (ocfs2_is_hard_readonly(osb) || ocfs2_is_soft_readonly(osb))
                return -EROFS;
 
@@ -520,8 +516,8 @@ int ocfs2_group_add(struct inode *inode, struct ocfs2_new_group_input *input)
                goto out_unlock;
        }
 
-       mlog(0, "Add a new group  %llu in chain = %u, length = %u\n",
-            (unsigned long long)input->group, input->chain, input->clusters);
+       trace_ocfs2_group_add((unsigned long long)input->group,
+                              input->chain, input->clusters, input->frees);
 
        handle = ocfs2_start_trans(osb, OCFS2_GROUP_ADD_CREDITS);
        if (IS_ERR(handle)) {
@@ -589,6 +585,5 @@ out_mutex:
        iput(main_bm_inode);
 
 out:
-       mlog_exit_void();
        return ret;
 }