Commit dda7d77b authored by Yangtao Li's avatar Yangtao Li Committed by Jaegeuk Kim
Browse files

f2fs: replace si->sbi w/ sbi in stat_show() 



For each loop add a local f2fs_sb_info pointer insted of looking it up.

Signed-off-by: default avatarYangtao Li <frank.li@vivo.com>
Reviewed-by: default avatarChao Yu <chao@kernel.org>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent f2e35789

fs/f2fs/debug.c

+23 −21
Original line number Diff line number Diff line
@@ -373,16 +373,18 @@ static int stat_show(struct seq_file *s, void *v) 


	raw_spin_lock_irqsave(&f2fs_stat_lock, flags);

	list_for_each_entry(si, &f2fs_stat_list, stat_list) {

		update_general_status(si->sbi);

		struct f2fs_sb_info *sbi = si->sbi;



		update_general_status(sbi);



		seq_printf(s, "\n=====[ partition info(%pg). #%d, %s, CP: %s]=====\n",

			si->sbi->sb->s_bdev, i++,

			f2fs_readonly(si->sbi->sb) ? "RO" : "RW",

			is_set_ckpt_flags(si->sbi, CP_DISABLED_FLAG) ?

			"Disabled" : (f2fs_cp_error(si->sbi) ? "Error" : "Good"));

		if (si->sbi->s_flag) {

			sbi->sb->s_bdev, i++,

			f2fs_readonly(sbi->sb) ? "RO" : "RW",

			is_set_ckpt_flags(sbi, CP_DISABLED_FLAG) ?

			"Disabled" : (f2fs_cp_error(sbi) ? "Error" : "Good"));

		if (sbi->s_flag) {

			seq_puts(s, "[SBI:");

			for_each_set_bit(j, &si->sbi->s_flag, 32)

			for_each_set_bit(j, &sbi->s_flag, 32)

				seq_puts(s, s_flag[j]);

			seq_puts(s, "]\n");

		}
@@ -394,21 +396,21 @@ static int stat_show(struct seq_file *s, void *v) 
			   si->overp_segs, si->rsvd_segs);

		seq_printf(s, "Current Time Sec: %llu / Mounted Time Sec: %llu\n\n",

					ktime_get_boottime_seconds(),

					SIT_I(si->sbi)->mounted_time);

					SIT_I(sbi)->mounted_time);



		seq_puts(s, "Policy:\n");

		seq_puts(s, "  - IPU: [");

		if (IS_F2FS_IPU_DISABLE(si->sbi)) {

		if (IS_F2FS_IPU_DISABLE(sbi)) {

			seq_puts(s, " DISABLE");

		} else {

			unsigned long policy = SM_I(si->sbi)->ipu_policy;

			unsigned long policy = SM_I(sbi)->ipu_policy;



			for_each_set_bit(j, &policy, F2FS_IPU_MAX)

				seq_printf(s, " %s", ipu_mode_names[j]);

		}

		seq_puts(s, " ]\n\n");



		if (test_opt(si->sbi, DISCARD))

		if (test_opt(sbi, DISCARD))

			seq_printf(s, "Utilization: %u%% (%u valid blocks, %u discard blocks)\n",

				si->utilization, si->valid_count, si->discard_blks);

		else
@@ -515,15 +517,15 @@ static int stat_show(struct seq_file *s, void *v) 
		seq_printf(s, "  - node segments : %d (%d)\n",

				si->node_segs, si->bg_node_segs);

		seq_puts(s, "  - Reclaimed segs :\n");

		seq_printf(s, "    - Normal : %d\n", si->sbi->gc_reclaimed_segs[GC_NORMAL]);

		seq_printf(s, "    - Idle CB : %d\n", si->sbi->gc_reclaimed_segs[GC_IDLE_CB]);

		seq_printf(s, "    - Normal : %d\n", sbi->gc_reclaimed_segs[GC_NORMAL]);

		seq_printf(s, "    - Idle CB : %d\n", sbi->gc_reclaimed_segs[GC_IDLE_CB]);

		seq_printf(s, "    - Idle Greedy : %d\n",

				si->sbi->gc_reclaimed_segs[GC_IDLE_GREEDY]);

		seq_printf(s, "    - Idle AT : %d\n", si->sbi->gc_reclaimed_segs[GC_IDLE_AT]);

				sbi->gc_reclaimed_segs[GC_IDLE_GREEDY]);

		seq_printf(s, "    - Idle AT : %d\n", sbi->gc_reclaimed_segs[GC_IDLE_AT]);

		seq_printf(s, "    - Urgent High : %d\n",

				si->sbi->gc_reclaimed_segs[GC_URGENT_HIGH]);

		seq_printf(s, "    - Urgent Mid : %d\n", si->sbi->gc_reclaimed_segs[GC_URGENT_MID]);

		seq_printf(s, "    - Urgent Low : %d\n", si->sbi->gc_reclaimed_segs[GC_URGENT_LOW]);

				sbi->gc_reclaimed_segs[GC_URGENT_HIGH]);

		seq_printf(s, "    - Urgent Mid : %d\n", sbi->gc_reclaimed_segs[GC_URGENT_MID]);

		seq_printf(s, "    - Urgent Low : %d\n", sbi->gc_reclaimed_segs[GC_URGENT_LOW]);

		seq_printf(s, "Try to move %d blocks (BG: %d)\n", si->tot_blks,

				si->bg_data_blks + si->bg_node_blks);

		seq_printf(s, "  - data blocks : %d (%d)\n", si->data_blks,
@@ -589,7 +591,7 @@ static int stat_show(struct seq_file *s, void *v) 
			   si->ndirty_imeta);

		seq_printf(s, "  - fsync mark: %4lld\n",

			   percpu_counter_sum_positive(

					&si->sbi->rf_node_block_count));

					&sbi->rf_node_block_count));

		seq_printf(s, "  - NATs: %9d/%9d\n  - SITs: %9d/%9d\n",

			   si->dirty_nats, si->nats, si->dirty_sits, si->sits);

		seq_printf(s, "  - free_nids: %9d/%9d\n  - alloc_nids: %9d\n",
@@ -616,12 +618,12 @@ static int stat_show(struct seq_file *s, void *v) 
			   si->block_count[LFS], si->segment_count[LFS]);



		/* segment usage info */

		f2fs_update_sit_info(si->sbi);

		f2fs_update_sit_info(sbi);

		seq_printf(s, "\nBDF: %u, avg. vblocks: %u\n",

			   si->bimodal, si->avg_vblocks);



		/* memory footprint */

		update_mem_info(si->sbi);

		update_mem_info(sbi);

		seq_printf(s, "\nMemory: %llu KB\n",

			(si->base_mem + si->cache_mem + si->page_mem) >> 10);

		seq_printf(s, "  - static: %llu KB\n",