| Message ID | 20221222081855.81553-1-frank.li@vivo.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | c5f9db2548d0ac988df81aa34cc63f3b2ed374f9 |
| Headers | show |
| Series | [f2fs-dev] f2fs: drop useless initializer and unneeded local variable | expand |
On 2022/12/22 16:18, Yangtao Li wrote: > No need to initialize idx twice. BTW, remove the unnecessary cnt variable. > > Signed-off-by: Yangtao Li <frank.li@vivo.com> > --- > fs/f2fs/iostat.c | 10 ++++------ > 1 file changed, 4 insertions(+), 6 deletions(-) > > diff --git a/fs/f2fs/iostat.c b/fs/f2fs/iostat.c > index 3166a8939ed4..335b055ffe7d 100644 > --- a/fs/f2fs/iostat.c > +++ b/fs/f2fs/iostat.c > @@ -97,8 +97,7 @@ int __maybe_unused iostat_info_seq_show(struct seq_file *seq, void *offset) > > static inline void __record_iostat_latency(struct f2fs_sb_info *sbi) > { > - int io, idx = 0; > - unsigned int cnt; > + int io, idx; > struct f2fs_iostat_latency iostat_lat[MAX_IO_TYPE][NR_PAGE_TYPE]; > struct iostat_lat_info *io_lat = sbi->iostat_io_lat; > unsigned long flags; > @@ -106,12 +105,11 @@ static inline void __record_iostat_latency(struct f2fs_sb_info *sbi) > spin_lock_irqsave(&sbi->iostat_lat_lock, flags); > for (idx = 0; idx < MAX_IO_TYPE; idx++) { > for (io = 0; io < NR_PAGE_TYPE; io++) { > - cnt = io_lat->bio_cnt[idx][io]; > iostat_lat[idx][io].peak_lat = > jiffies_to_msecs(io_lat->peak_lat[idx][io]); > - iostat_lat[idx][io].cnt = cnt; > - iostat_lat[idx][io].avg_lat = cnt ? > - jiffies_to_msecs(io_lat->sum_lat[idx][io]) / cnt : 0; > + iostat_lat[idx][io].cnt = io_lat->bio_cnt[idx][io]; > + iostat_lat[idx][io].avg_lat = iostat_lat[idx][io].cnt ? > + jiffies_to_msecs(io_lat->sum_lat[idx][io]) / iostat_lat[idx][io].cnt : 0; exceed 80 column? Thanks, > io_lat->sum_lat[idx][io] = 0; > io_lat->peak_lat[idx][io] = 0; > io_lat->bio_cnt[idx][io] = 0;
> exceed 80 column?
I use the checkpatch.pl script to check that there are no errors.
Earlier, the default line length was 80 columns.
Commit bdc48fa11e46 (“checkpatch/coding-style: deprecate 80-column warning”) increased the limit to 100 columns.
$ ./scripts/checkpatch.pl 0001-f2fs-drop-useless-initializer-and-unneeded-local-var.patch
total: 0 errors, 0 warnings, 24 lines checked
0001-f2fs-drop-useless-initializer-and-unneeded-local-var.patch has no obvious style problems and is ready for submission.
Thx,
Yangtao
Hello: This patch was applied to jaegeuk/f2fs.git (dev) by Jaegeuk Kim <jaegeuk@kernel.org>: On Thu, 22 Dec 2022 16:18:55 +0800 you wrote: > No need to initialize idx twice. BTW, remove the unnecessary cnt variable. > > Signed-off-by: Yangtao Li <frank.li@vivo.com> > --- > fs/f2fs/iostat.c | 10 ++++------ > 1 file changed, 4 insertions(+), 6 deletions(-) Here is the summary with links: - [f2fs-dev] f2fs: drop useless initializer and unneeded local variable https://git.kernel.org/jaegeuk/f2fs/c/c5f9db2548d0 You are awesome, thank you!
diff --git a/fs/f2fs/iostat.c b/fs/f2fs/iostat.c index 3166a8939ed4..335b055ffe7d 100644 --- a/fs/f2fs/iostat.c +++ b/fs/f2fs/iostat.c @@ -97,8 +97,7 @@ int __maybe_unused iostat_info_seq_show(struct seq_file *seq, void *offset) static inline void __record_iostat_latency(struct f2fs_sb_info *sbi) { - int io, idx = 0; - unsigned int cnt; + int io, idx; struct f2fs_iostat_latency iostat_lat[MAX_IO_TYPE][NR_PAGE_TYPE]; struct iostat_lat_info *io_lat = sbi->iostat_io_lat; unsigned long flags; @@ -106,12 +105,11 @@ static inline void __record_iostat_latency(struct f2fs_sb_info *sbi) spin_lock_irqsave(&sbi->iostat_lat_lock, flags); for (idx = 0; idx < MAX_IO_TYPE; idx++) { for (io = 0; io < NR_PAGE_TYPE; io++) { - cnt = io_lat->bio_cnt[idx][io]; iostat_lat[idx][io].peak_lat = jiffies_to_msecs(io_lat->peak_lat[idx][io]); - iostat_lat[idx][io].cnt = cnt; - iostat_lat[idx][io].avg_lat = cnt ? - jiffies_to_msecs(io_lat->sum_lat[idx][io]) / cnt : 0; + iostat_lat[idx][io].cnt = io_lat->bio_cnt[idx][io]; + iostat_lat[idx][io].avg_lat = iostat_lat[idx][io].cnt ? + jiffies_to_msecs(io_lat->sum_lat[idx][io]) / iostat_lat[idx][io].cnt : 0; io_lat->sum_lat[idx][io] = 0; io_lat->peak_lat[idx][io] = 0; io_lat->bio_cnt[idx][io] = 0;
No need to initialize idx twice. BTW, remove the unnecessary cnt variable. Signed-off-by: Yangtao Li <frank.li@vivo.com> --- fs/f2fs/iostat.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)