Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 22d7ea13 authored by Chao Yu's avatar Chao Yu Committed by Jaegeuk Kim
Browse files

Revert "f2fs: use printk_ratelimited for f2fs_msg" 



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

This reverts commit a36c106d.

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

Signed-off-by: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent abde73c7

fs/f2fs/f2fs.h

+3 −3
Original line number Diff line number Diff line
@@ -1307,7 +1307,7 @@ struct f2fs_sb_info { 


#ifdef CONFIG_F2FS_FAULT_INJECTION

#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],			\

		__func__, __builtin_return_address(0))

static inline bool time_to_inject(struct f2fs_sb_info *sbi, int type)

fs/f2fs/segment.c

+3 −3
Original line number Diff line number Diff line
@@ -905,9 +905,9 @@ static void __remove_discard_cmd(struct f2fs_sb_info *sbi, 
		dc->error = 0;



	if (dc->error)

		f2fs_msg(sbi->sb, KERN_INFO,

			"Issue discard(%u, %u, %u) failed, ret: %d",

			dc->lstart, dc->start, dc->len, dc->error);

		printk_ratelimited(

			"%sF2FS-fs: Issue discard(%u, %u, %u) failed, ret: %d",

			KERN_INFO, dc->lstart, dc->start, dc->len, dc->error);

	__detach_discard_cmd(dcc, dc);

}

fs/f2fs/super.c

+1 −1
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ void f2fs_msg(struct super_block *sb, const char *level, const char *fmt, ...) 
	va_start(args, fmt);

	vaf.fmt = fmt;

	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);

}