diff options
author | Tao Ma <boyu.mt@taobao.com> | 2011-02-23 09:12:48 -0500 |
---|---|---|
committer | Tao Ma <boyu.mt@taobao.com> | 2011-02-23 09:12:48 -0500 |
commit | 38877a43795d3a834fad827f3d6532ff649e5c45 (patch) | |
tree | 14eb9e3e6c53e80fd4667832e9d092dc53e44557 | |
parent | 2661836e0ca07f57505563ec31aeee20b1758987 (diff) |
ocfs2: Remove mlog(0) from quota_local.c.
Remove mlog(0) from fs/ocfs2/quota_local.c.
Signed-off-by: Tao Ma <boyu.mt@taobao.com>
-rw-r--r-- | fs/ocfs2/ocfs2_trace.h | 10 | ||||
-rw-r--r-- | fs/ocfs2/quota_local.c | 13 |
2 files changed, 17 insertions, 6 deletions
diff --git a/fs/ocfs2/ocfs2_trace.h b/fs/ocfs2/ocfs2_trace.h index 1c040fcbd6e7..dbd1812f5161 100644 --- a/fs/ocfs2/ocfs2_trace.h +++ b/fs/ocfs2/ocfs2_trace.h | |||
@@ -1925,6 +1925,16 @@ TRACE_EVENT(ocfs2_resmap_claimed_bits_end, | |||
1925 | ); | 1925 | ); |
1926 | 1926 | ||
1927 | /* End of trace events for fs/ocfs2/reservations.c. */ | 1927 | /* End of trace events for fs/ocfs2/reservations.c. */ |
1928 | |||
1929 | /* Trace events for fs/ocfs2/quota_local.c. */ | ||
1930 | |||
1931 | DEFINE_OCFS2_ULL_UINT_EVENT(ocfs2_recover_local_quota_file); | ||
1932 | |||
1933 | DEFINE_OCFS2_INT_EVENT(ocfs2_finish_quota_recovery); | ||
1934 | |||
1935 | DEFINE_OCFS2_ULL_ULL_UINT_EVENT(olq_set_dquot); | ||
1936 | |||
1937 | /* End of trace events for fs/ocfs2/quota_local.c. */ | ||
1928 | #endif /* _TRACE_OCFS2_H */ | 1938 | #endif /* _TRACE_OCFS2_H */ |
1929 | 1939 | ||
1930 | /* This part must be outside protection */ | 1940 | /* This part must be outside protection */ |
diff --git a/fs/ocfs2/quota_local.c b/fs/ocfs2/quota_local.c index 88ec4516637b..dc8007fc9247 100644 --- a/fs/ocfs2/quota_local.c +++ b/fs/ocfs2/quota_local.c | |||
@@ -8,7 +8,6 @@ | |||
8 | #include <linux/quotaops.h> | 8 | #include <linux/quotaops.h> |
9 | #include <linux/module.h> | 9 | #include <linux/module.h> |
10 | 10 | ||
11 | #define MLOG_MASK_PREFIX ML_QUOTA | ||
12 | #include <cluster/masklog.h> | 11 | #include <cluster/masklog.h> |
13 | 12 | ||
14 | #include "ocfs2_fs.h" | 13 | #include "ocfs2_fs.h" |
@@ -23,6 +22,7 @@ | |||
23 | #include "quota.h" | 22 | #include "quota.h" |
24 | #include "uptodate.h" | 23 | #include "uptodate.h" |
25 | #include "super.h" | 24 | #include "super.h" |
25 | #include "ocfs2_trace.h" | ||
26 | 26 | ||
27 | /* Number of local quota structures per block */ | 27 | /* Number of local quota structures per block */ |
28 | static inline unsigned int ol_quota_entries_per_block(struct super_block *sb) | 28 | static inline unsigned int ol_quota_entries_per_block(struct super_block *sb) |
@@ -475,7 +475,7 @@ static int ocfs2_recover_local_quota_file(struct inode *lqinode, | |||
475 | struct ocfs2_recovery_chunk *rchunk, *next; | 475 | struct ocfs2_recovery_chunk *rchunk, *next; |
476 | qsize_t spacechange, inodechange; | 476 | qsize_t spacechange, inodechange; |
477 | 477 | ||
478 | mlog(0, "ino=%lu type=%u", (unsigned long)lqinode->i_ino, type); | 478 | trace_ocfs2_recover_local_quota_file((unsigned long)lqinode->i_ino, type); |
479 | 479 | ||
480 | list_for_each_entry_safe(rchunk, next, &(rec->r_list[type]), rc_list) { | 480 | list_for_each_entry_safe(rchunk, next, &(rec->r_list[type]), rc_list) { |
481 | chunk = rchunk->rc_chunk; | 481 | chunk = rchunk->rc_chunk; |
@@ -601,7 +601,7 @@ int ocfs2_finish_quota_recovery(struct ocfs2_super *osb, | |||
601 | for (type = 0; type < MAXQUOTAS; type++) { | 601 | for (type = 0; type < MAXQUOTAS; type++) { |
602 | if (list_empty(&(rec->r_list[type]))) | 602 | if (list_empty(&(rec->r_list[type]))) |
603 | continue; | 603 | continue; |
604 | mlog(0, "Recovering quota in slot %d\n", slot_num); | 604 | trace_ocfs2_finish_quota_recovery(slot_num); |
605 | lqinode = ocfs2_get_system_file_inode(osb, ino[type], slot_num); | 605 | lqinode = ocfs2_get_system_file_inode(osb, ino[type], slot_num); |
606 | if (!lqinode) { | 606 | if (!lqinode) { |
607 | status = -ENOENT; | 607 | status = -ENOENT; |
@@ -883,9 +883,10 @@ static void olq_set_dquot(struct buffer_head *bh, void *private) | |||
883 | dqblk->dqb_inodemod = cpu_to_le64(od->dq_dquot.dq_dqb.dqb_curinodes - | 883 | dqblk->dqb_inodemod = cpu_to_le64(od->dq_dquot.dq_dqb.dqb_curinodes - |
884 | od->dq_originodes); | 884 | od->dq_originodes); |
885 | spin_unlock(&dq_data_lock); | 885 | spin_unlock(&dq_data_lock); |
886 | mlog(0, "Writing local dquot %u space %lld inodes %lld\n", | 886 | trace_olq_set_dquot( |
887 | od->dq_dquot.dq_id, (long long)le64_to_cpu(dqblk->dqb_spacemod), | 887 | (unsigned long long)le64_to_cpu(dqblk->dqb_spacemod), |
888 | (long long)le64_to_cpu(dqblk->dqb_inodemod)); | 888 | (unsigned long long)le64_to_cpu(dqblk->dqb_inodemod), |
889 | od->dq_dquot.dq_id); | ||
889 | } | 890 | } |
890 | 891 | ||
891 | /* Write dquot to local quota file */ | 892 | /* Write dquot to local quota file */ |