From:   Yangtao Li <frank.li@vivo.com>
To:     jaegeuk@kernel.org, chao@kernel.org
Cc:     linux-f2fs-devel@lists.sourceforge.net,
        linux-kernel@vger.kernel.org, Yangtao Li <frank.li@vivo.com>
Subject: [PATCH v3 2/2] f2fs: replace si->sbi w/ sbi in stat_show()
Date:   Mon, 13 Feb 2023 22:18:25 +0800
Message-Id: <20230213141825.22858-2-frank.li@vivo.com>
In-Reply-To: <20230213141825.22858-1-frank.li@vivo.com>
References: <20230213141825.22858-1-frank.li@vivo.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?baeLqoSknjQ3/cKQdyiUh5wxYccAq1r/8ChyyW+SWnQwSjTBR2TRCYmfvjPt?=
 =?us-ascii?Q?q/hG3LQQTorXpF/rurTqrH7pgXNUBS+65gyZL8ISinajf4e5Jkt8M7zogpnu?=
 =?us-ascii?Q?3a59kO086iiGmzlprvHYZ8EuEn100qtQQk8gANL7jhto4H8ImF38aLVzvKRN?=
 =?us-ascii?Q?N0BbUfcwKH0BRQArUkhiB9eRTA3jILjGzVBFYSG2tidjvSo3PPwdDJIcG8cP?=
 =?us-ascii?Q?37qP5ZTcgSNlRJzIiXgKX5qulgGBAtF8xyb4SKB3EHEoi+nqDeuvhUwJ3Eu6?=
 =?us-ascii?Q?1dfD+G4G4SiwkXVW0GE21F93wmzbC8nwnlmwXTySfh84tPmktpXDcSVVXpcj?=
 =?us-ascii?Q?mmc2eNAzFGJPcnu0M4JeHnbcRIL1TixDjHF/yxf4ERR40wP0vO/e90GieEbI?=
 =?us-ascii?Q?d+KYvIU/rTOWi4ieacLCkT2yrVXTNZDXNQLmsRmqHz8mbbcpc4iBAPsnWI8n?=
 =?us-ascii?Q?Z6HOOjJmEBiQSHlJm4+afD86keV72zGVGNI8S6yEOFuXcVh0wQjH1h5URfcf?=
 =?us-ascii?Q?l9VuwbSar65FuUkIrh9YBnwVqPrmHJzsfpCLqiZ/zO0BJc5o56466SSTlbhe?=
 =?us-ascii?Q?AMDIlsvp/LXDBpnBbRXHZ6WZrwPTr96Xmz32cIkZPtEtiwKC3jrLF0lRQogL?=
 =?us-ascii?Q?5tbNSTpqzwDfA9FqLAAe8x5S0IOUg/DaIR7VeBVRRNfRYe88Eg4EZBXc1Ms4?=
 =?us-ascii?Q?R2b71C9wzx+fDEJT2HMLs6gu9VV+zRDtc+lDTUXpoUGZPs3uewo843IGMvVi?=
 =?us-ascii?Q?3C7ihfaUz2dwRyKoX+U52tw35SYrEwYV+Jw5XDUtV2jgdU7Qs3PbsftDG6xR?=
 =?us-ascii?Q?PF/xDR/BEPyvWBCCur2Knn1efZMg26PYe+6k4UQMQHV6qoNANgGH3fUNsxpm?=
 =?us-ascii?Q?6m/yC0QahJbL+dezYk7UWYEZiz4MLU+6fduAjXc0qaiTK4FZLtgSb3HZPe4Q?=
 =?us-ascii?Q?22SlCQOO8KF/5oAaHjzeTJB5VNw6ic/Tsn/Y0BJ70Mg3/2lhkr/xHVLtotTR?=
 =?us-ascii?Q?G0HTq9lfsC9V2gTcu5x+QYIXOEm8am1tvbXKizbamn/7t4nhDdAsuxeTLfYh?=
 =?us-ascii?Q?w/Y3u/H1a4mA1U+VSmABes6V9KvgNik3BvWrerCdfXZ4nQjl77+vM2rUYcUc?=
 =?us-ascii?Q?P98yhVKLZo6cwSaF5z8mHJjSm/C3InbNChipdz0Zghq2ysYgk99yhkrQ96mb?=
 =?us-ascii?Q?fpDrmKxLSEjvwTjpWyidPU0A7SvFoLmrS11pcxVLP5htoMYLhT1AhNVCXOok?=
 =?us-ascii?Q?tUEoyGQ2/MR8LpARX78MmqwR6JHl9LJu2FMwYM9P4cBuD5ReEc8QNjTWbx5/?=
 =?us-ascii?Q?IL7aboYl+JhlDJ3WlOUrskHZAUOiKd+rWPxEVPHAyabBCMdy5XTvGrlgargC?=
 =?us-ascii?Q?HduSm7JxcIsWVQp3KGiA/3UNQlxgsJ1/4zaAm52S1melarj5sZmCrtcqQ5s9?=
 =?us-ascii?Q?NrE/5uJJQA6yi/8+aPmwObfpepBkWmRXyQgDzrTSvGPpRteVtQ6/UVHKgLeT?=
 =?us-ascii?Q?+a40FWxfV0YGcAtv1OOPCh52b2BEF7tgF9BspV7dGo8vg5kk4vzuYvXH04d6?=
 =?us-ascii?Q?vV+RB78DY/ZCzVsDXOZN9PGKBoDfcSh0BbtzZpYM?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 012688d4-8801-4d34-636e-08db0dcd360b
X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5269.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Feb 2023 14:18:43.0635
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: na72zl2CaW6f21weVUkuR256T7ErR5MN4eXrC5ZHZWFCPIT64g7kqP8g8+jbxl1nRavYnF6KqI/OLvHPfzNSYw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SI2PR06MB4233
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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

Signed-off-by: Yangtao Li <frank.li@vivo.com>
---
 fs/f2fs/debug.c | 44 +++++++++++++++++++++++---------------------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/fs/f2fs/debug.c b/fs/f2fs/debug.c
index ff5995cb9560..30a77936e3c5 100644
--- a/fs/f2fs/debug.c
+++ b/fs/f2fs/debug.c
@@ -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",
-- 
2.25.1