mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-03 18:20:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "f2fs: use printk_ratelimited for f2fs_msg"

Browse source 
Don't limit printing log, so that we will not miss any key messages.

This reverts commit a36c106dff.

In addition, we use printk_ratelimited to avoid too many log prints.
- error injection
- discard submission failure

Signed-off-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
This commit is contained in:
Chao Yu 2018-08-22 17:17:47 +08:00 committed by Jaegeuk Kim
parent abde73c718
commit 22d7ea1364
3 changed files with 7 additions and 7 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

6
fs/f2fs/f2fs.h
View file

@ -1306,9 +1306,9 @@ struct f2fs_sb_info {
}; };
#ifdef CONFIG_F2FS_FAULT_INJECTION #ifdef CONFIG_F2FS_FAULT_INJECTION
#define f2fs_show_injection_info(type) \ #define f2fs_show_injection_info(type) \
printk("%sF2FS-fs : inject %s in %s of %pF\n", \ printk_ratelimited("%sF2FS-fs : inject %s in %s of %pF\n", \
KERN_INFO, f2fs_fault_name[type], \ KERN_INFO, f2fs_fault_name[type], \
__func__, __builtin_return_address(0)) __func__, __builtin_return_address(0))
static inline bool time_to_inject(struct f2fs_sb_info *sbi, int type) static inline bool time_to_inject(struct f2fs_sb_info *sbi, int type)
{ {

6
fs/f2fs/segment.c
View file

@ -905,9 +905,9 @@ static void __remove_discard_cmd(struct f2fs_sb_info *sbi,
dc->error = 0; dc->error = 0;
if (dc->error) if (dc->error)
f2fs_msg(sbi->sb, KERN_INFO, printk_ratelimited(
"Issue discard(%u, %u, %u) failed, ret: %d", "%sF2FS-fs: Issue discard(%u, %u, %u) failed, ret: %d",
dc->lstart, dc->start, dc->len, dc->error); KERN_INFO, dc->lstart, dc->start, dc->len, dc->error);
__detach_discard_cmd(dcc, dc); __detach_discard_cmd(dcc, dc);
} }

2
fs/f2fs/super.c
View file

@ -207,7 +207,7 @@ void f2fs_msg(struct super_block *sb, const char *level, const char *fmt, ...)
va_start(args, fmt); va_start(args, fmt);
vaf.fmt = fmt; vaf.fmt = fmt;
vaf.va = &args; vaf.va = &args;
printk_ratelimited("%sF2FS-fs (%s): %pV\n", level, sb->s_id, &vaf); printk("%sF2FS-fs (%s): %pV\n", level, sb->s_id, &vaf);
va_end(args); va_end(args);
} }