Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit a8731086eff053b430cddbf5783654dfd700ea06

Authored by Tao Ma
1 parent a716357c47
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

ocfs2: Remove mlog(0) from fs/ocfs2/slot_map.c 

This is the 1st step to remove the debug info of SUPER.

Signed-off-by: Tao Ma <boyu.mt@taobao.com>

Showing 2 changed files with 16 additions and 8 deletions Side-by-side Diff

fs/ocfs2/ocfs2_trace.h
Diff comments   View file @ a873108
... ... @@ -1519,6 +1519,17 @@
1519 1519  
1520 1520 /* End of trace events for fs/ocfs2/extent_map.c. */
1521 1521  
  1522 +/* Trace events for fs/ocfs2/slot_map.c. */
  1523 +
  1524 +DEFINE_OCFS2_UINT_EVENT(ocfs2_refresh_slot_info);
  1525 +
  1526 +DEFINE_OCFS2_ULL_UINT_EVENT(ocfs2_map_slot_buffers);
  1527 +
  1528 +DEFINE_OCFS2_ULL_UINT_EVENT(ocfs2_map_slot_buffers_block);
  1529 +
  1530 +DEFINE_OCFS2_INT_EVENT(ocfs2_find_slot);
  1531 +
  1532 +/* End of trace events for fs/ocfs2/slot_map.c. */
1522 1533 #endif /* _TRACE_OCFS2_H */
1523 1534  
1524 1535 /* This part must be outside protection */
... ... @@ -27,7 +27,6 @@
27 27 #include <linux/slab.h>
28 28 #include <linux/highmem.h>
29 29  
30   -#define MLOG_MASK_PREFIX ML_SUPER
31 30 #include <cluster/masklog.h>
32 31  
33 32 #include "ocfs2.h"
... ... @@ -39,6 +38,7 @@
39 38 #include "slot_map.h"
40 39 #include "super.h"
41 40 #include "sysfile.h"
  41 +#include "ocfs2_trace.h"
42 42  
43 43 #include "buffer_head_io.h"
44 44  
... ... @@ -142,8 +142,7 @@
142 142 BUG_ON(si->si_blocks == 0);
143 143 BUG_ON(si->si_bh == NULL);
144 144  
145   - mlog(0, "Refreshing slot map, reading %u block(s)\n",
146   - si->si_blocks);
  145 + trace_ocfs2_refresh_slot_info(si->si_blocks);
147 146  
148 147 /*
149 148 * We pass -1 as blocknr because we expect all of si->si_bh to
... ... @@ -381,8 +380,7 @@
381 380 /* The size checks above should ensure this */
382 381 BUG_ON((osb->max_slots / si->si_slots_per_block) > blocks);
383 382  
384   - mlog(0, "Slot map needs %u buffers for %llu bytes\n",
385   - si->si_blocks, bytes);
  383 + trace_ocfs2_map_slot_buffers(bytes, si->si_blocks);
386 384  
387 385 si->si_bh = kzalloc(sizeof(struct buffer_head *) * si->si_blocks,
388 386 GFP_KERNEL);
... ... @@ -400,8 +398,7 @@
400 398 goto bail;
401 399 }
402 400  
403   - mlog(0, "Reading slot map block %u at %llu\n", i,
404   - (unsigned long long)blkno);
  401 + trace_ocfs2_map_slot_buffers_block((unsigned long long)blkno, i);
405 402  
406 403 bh = NULL; /* Acquire a fresh bh */
407 404 status = ocfs2_read_blocks(INODE_CACHE(si->si_inode), blkno,
... ... @@ -503,7 +500,7 @@
503 500 osb->slot_num = slot;
504 501 spin_unlock(&osb->osb_lock);
505 502  
506   - mlog(0, "taking node slot %d\n", osb->slot_num);
  503 + trace_ocfs2_find_slot(osb->slot_num);
507 504  
508 505 status = ocfs2_update_disk_slot(osb, si, osb->slot_num);
509 506 if (status < 0)