Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
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 1/2] f2fs: fix some format WARNING in debug.c and sysfs.c
Date:   Tue, 29 Nov 2022 12:15:23 +0800
Message-Id: <20221129041524.81235-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?urowANbL9KSd1Dhbe2niM/wMeeCF0wWktToqKV7+bYY0V10HRm+qWxF3YBnr?=
 =?us-ascii?Q?frX1RKBibthpT9iKVeg0Afh8Oux3tCSLtVrvjAqyd4I37khdYN8Sm9aqvvBH?=
 =?us-ascii?Q?C2nvQG1iM1O4d/eid5/pS968VYanvqHZY8QB5cDgL3PVyQQ+FPYyND+JJgMA?=
 =?us-ascii?Q?aPtXrj7GpVtky4oWOobPMIhpysYzk4EpyTitbWht0/QYVcILXiVaciITvQBT?=
 =?us-ascii?Q?8mjtDZ+/pA3tAMch+ZZaGn2fLIH3yS81cCyEBFruUQ6hdSJUr5Mb325zVj/B?=
 =?us-ascii?Q?1A9F6ZE/XxMmdeGhFlq+oFB6yAqkXR9bwuBabgTkgrwwG7RLPDa3yj76bnX0?=
 =?us-ascii?Q?Vymrb/AINRWS0aJ4Yzy/zwHdyjkF6IdI1B/5FEFjvrCgZKQrvFJ6X40COLbs?=
 =?us-ascii?Q?/jSltm62rLrBAl6mrZ/c+GZKWpeWEBYZqdE+56xlSzO20p6//RyCatqJJupo?=
 =?us-ascii?Q?DtRnxrLzwa9p12KW5Mn94A5scc/ACGD+aGwbNv3TQlvrapLviz4zaGpN+V+7?=
 =?us-ascii?Q?n+pNX1ETRi3f3bwxsyTZpOopc0CyLkSBVqKQQelY3QwbaMukQ4sFOZioj1pX?=
 =?us-ascii?Q?D5krLXpVX0xudXvwKHsf5BP3pRfjAOmPt9RiOKeUerTE5HnGdtVtZ+tGZDB4?=
 =?us-ascii?Q?R/pX0gMRv2oMyaE6KyGYPF9VWv3CM4kyi7gsAiYDkCahouUG7eOR+iQVlaJb?=
 =?us-ascii?Q?+ThUD7oV2GvMbDNB91Q84WXq6wX2qrL/FQUVx9vfZFNu9+wuCQ+K5G0tUOL0?=
 =?us-ascii?Q?uZ+Wj65Je9Gjv2sqnW0+vYKp/BS9iGIlx6qL5lNI++lnixItFEC3XfXoK5h/?=
 =?us-ascii?Q?tSlwKUZxjhDTiRv8qmwG/l/xoy2W7gWFGqLuPfILhWohyn9MU/dYxWQBMfV1?=
 =?us-ascii?Q?Qiw92zclPujaGQzIXajZEj97VUGc+UTAHEfymVoSpEhLBKm1S9BXTzGZ1CpX?=
 =?us-ascii?Q?l5GDiIl49LyqEAyX42YthO5Xp55KP3qHRtK8NukzBbu/W/fhdgleUe1M5v4d?=
 =?us-ascii?Q?Udz4muiZv9GhzMSYHAWXe0/fQiHqJckiSNMXTiXS1SGddztVGKHK5tmOcA8Q?=
 =?us-ascii?Q?Kjz1e3YARY+OOGHquoUJa0OHkrWIEjXMBPMnm5Xy5FRb3Zg8kdEN96hUGFv8?=
 =?us-ascii?Q?hhohOzuGQjbSt6sZ4xUSr4Zk46w9AtOxjClwNI4cu+Zn33bxej+O3siGb2XL?=
 =?us-ascii?Q?aFKG0HSgnvlX3W7mgE41wncDU2DT7+ImPmA8noPFSb2Ia9X1hHMNT7ukRbpF?=
 =?us-ascii?Q?EsEboBbtc9n/0LR9FY37PU77hqJdQeRG5NZaGicUwtd0cQPOSSKBnlycc3gn?=
 =?us-ascii?Q?BDd7a+E12CDLUfnKvql2OxFblSxbgOaqzpKTiAvMO+A/EdfH3FL3AVecg+Ne?=
 =?us-ascii?Q?e0EwJf7kQfAY6ehq5mfYDZdZsAI2DjZZvvRsEg49fYXNxcy4rQOiBdEor/SH?=
 =?us-ascii?Q?DyNkiW74Ne+Bmpdvwxpjgql/xCZgj44pLvrnwwDuzKkx4J9OPtX6UIt3Qi1F?=
 =?us-ascii?Q?PD/0sePRLfO1EhbAzHruAu3BFnzketFpBWn2B/NHkPYjRV28a3a5c1vFfw8D?=
 =?us-ascii?Q?fQigDOLgAcQwtSdV0sjKfH3mrL+qheU0+ZTpoqcS?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: ee1abe3a-a49b-403d-5335-08dad1c05dfc
X-MS-Exchange-CrossTenant-AuthSource: SEZPR06MB5269.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Nov 2022 04:15:36.8183
 (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: EMgb40yo2mBWq+XFie5PAM0foDTfrzyOWIdY4M1bevTNH/Ez0xEH5+Psfruku+u88KQ5Zod5hH5tOwPckONaOQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY0PR06MB5657
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

To fix:

WARNING: function definition argument 'struct f2fs_attr *' should also have an identifier name
+       ssize_t (*show)(struct f2fs_attr *, struct f2fs_sb_info *, char *);

WARNING: return sysfs_emit(...) formats should include a terminating newline
+       return sysfs_emit(buf, "(none)");

WARNING: Prefer 'unsigned int' to bare use of 'unsigned'
+               unsigned npages = NODE_MAPPING(sbi)->nrpages;

WARNING: Missing a blank line after declarations
+               unsigned npages = COMPRESS_MAPPING(sbi)->nrpages;
+               si->page_mem += (unsigned long long)npages << PAGE_SHIFT;

WARNING: quoted string split across lines
+               seq_printf(s, "CP merge (Queued: %4d, Issued: %4d, Total: %4d, "
+                               "Cur time: %4d(ms), Peak time: %4d(ms))\n",

Signed-off-by: Yangtao Li <frank.li@vivo.com>
---
 fs/f2fs/debug.c | 45 +++++++++++++++++++++++----------------------
 fs/f2fs/sysfs.c | 10 +++++-----
 2 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/fs/f2fs/debug.c b/fs/f2fs/debug.c
index a216dcdf6941..733b1bd37404 100644
--- a/fs/f2fs/debug.c
+++ b/fs/f2fs/debug.c
@@ -301,18 +301,19 @@ static void update_mem_info(struct f2fs_sb_info *sbi)
 
 	si->page_mem = 0;
 	if (sbi->node_inode) {
-		unsigned npages = NODE_MAPPING(sbi)->nrpages;
+		unsigned long npages = NODE_MAPPING(sbi)->nrpages;
 
 		si->page_mem += (unsigned long long)npages << PAGE_SHIFT;
 	}
 	if (sbi->meta_inode) {
-		unsigned npages = META_MAPPING(sbi)->nrpages;
+		unsigned long npages = META_MAPPING(sbi)->nrpages;
 
 		si->page_mem += (unsigned long long)npages << PAGE_SHIFT;
 	}
 #ifdef CONFIG_F2FS_FS_COMPRESSION
 	if (sbi->compress_inode) {
-		unsigned npages = COMPRESS_MAPPING(sbi)->nrpages;
+		unsigned long npages = COMPRESS_MAPPING(sbi)->nrpages;
+
 		si->page_mem += (unsigned long long)npages << PAGE_SHIFT;
 	}
 #endif
@@ -460,28 +461,28 @@ static int stat_show(struct seq_file *s, void *v)
 				si->meta_count[META_NAT]);
 		seq_printf(s, "  - ssa blocks : %u\n",
 				si->meta_count[META_SSA]);
-		seq_printf(s, "CP merge (Queued: %4d, Issued: %4d, Total: %4d, "
-				"Cur time: %4d(ms), Peak time: %4d(ms))\n",
-				si->nr_queued_ckpt, si->nr_issued_ckpt,
-				si->nr_total_ckpt, si->cur_ckpt_time,
-				si->peak_ckpt_time);
+		seq_puts(s, "CP merge:\n");
+		seq_printf(s, "  - Queued : %4d\n", si->nr_queued_ckpt);
+		seq_printf(s, "  - Issued : %4d\n", si->nr_issued_ckpt);
+		seq_printf(s, "  - Total : %4d\n", si->nr_total_ckpt);
+		seq_printf(s, "  - Cur time : %4d(ms)\n", si->cur_ckpt_time);
+		seq_printf(s, "  - Peak time : %4d(ms)\n", si->peak_ckpt_time);
 		seq_printf(s, "GC calls: %d (BG: %d)\n",
 			   si->call_count, si->bg_gc);
 		seq_printf(s, "  - data segments : %d (%d)\n",
 				si->data_segs, si->bg_data_segs);
 		seq_printf(s, "  - node segments : %d (%d)\n",
 				si->node_segs, si->bg_node_segs);
-		seq_printf(s, "  - Reclaimed segs : Normal (%d), Idle CB (%d), "
-				"Idle Greedy (%d), Idle AT (%d), "
-				"Urgent High (%d), Urgent Mid (%d), "
-				"Urgent Low (%d)\n",
-				si->sbi->gc_reclaimed_segs[GC_NORMAL],
-				si->sbi->gc_reclaimed_segs[GC_IDLE_CB],
-				si->sbi->gc_reclaimed_segs[GC_IDLE_GREEDY],
-				si->sbi->gc_reclaimed_segs[GC_IDLE_AT],
-				si->sbi->gc_reclaimed_segs[GC_URGENT_HIGH],
-				si->sbi->gc_reclaimed_segs[GC_URGENT_MID],
-				si->sbi->gc_reclaimed_segs[GC_URGENT_LOW]);
+		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, "    - 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]);
+		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]);
 		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,
@@ -505,11 +506,11 @@ static int stat_show(struct seq_file *s, void *v)
 			   si->nr_dio_read, si->nr_dio_write);
 		seq_printf(s, "  - IO_R (Data: %4d, Node: %4d, Meta: %4d\n",
 			   si->nr_rd_data, si->nr_rd_node, si->nr_rd_meta);
-		seq_printf(s, "  - IO_W (CP: %4d, Data: %4d, Flush: (%4d %4d %4d), "
-			"Discard: (%4d %4d)) cmd: %4d undiscard:%4u\n",
+		seq_printf(s, "  - IO_W (CP: %4d, Data: %4d, Flush: (%4d %4d %4d), ",
 			   si->nr_wb_cp_data, si->nr_wb_data,
 			   si->nr_flushing, si->nr_flushed,
-			   si->flush_list_empty,
+			   si->flush_list_empty);
+		seq_printf(s, "Discard: (%4d %4d)) cmd: %4d undiscard:%4u\n",
 			   si->nr_discarding, si->nr_discarded,
 			   si->nr_discard_cmd, si->undiscard_blks);
 		seq_printf(s, "  - atomic IO: %4d (Max. %4d)\n",
diff --git a/fs/f2fs/sysfs.c b/fs/f2fs/sysfs.c
index a4745d596310..024346f0e9ce 100644
--- a/fs/f2fs/sysfs.c
+++ b/fs/f2fs/sysfs.c
@@ -53,9 +53,9 @@ static const char *gc_mode_names[MAX_GC_MODE] = {
 
 struct f2fs_attr {
 	struct attribute attr;
-	ssize_t (*show)(struct f2fs_attr *, struct f2fs_sb_info *, char *);
-	ssize_t (*store)(struct f2fs_attr *, struct f2fs_sb_info *,
-			 const char *, size_t);
+	ssize_t (*show)(struct f2fs_attr *a, struct f2fs_sb_info *sbi, char *buf);
+	ssize_t (*store)(struct f2fs_attr *a, struct f2fs_sb_info *sbi,
+			 const char *buf, size_t len);
 	int struct_type;
 	int offset;
 	int id;
@@ -232,13 +232,13 @@ static ssize_t encoding_show(struct f2fs_attr *a,
 			(sb->s_encoding->version >> 8) & 0xff,
 			sb->s_encoding->version & 0xff);
 #endif
-	return sysfs_emit(buf, "(none)");
+	return sysfs_emit(buf, "(none)\n");
 }
 
 static ssize_t mounted_time_sec_show(struct f2fs_attr *a,
 		struct f2fs_sb_info *sbi, char *buf)
 {
-	return sysfs_emit(buf, "%llu", SIT_I(sbi)->mounted_time);
+	return sysfs_emit(buf, "%llu\n", SIT_I(sbi)->mounted_time);
 }
 
 #ifdef CONFIG_F2FS_STAT_FS
-- 
2.25.1