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

Commit f81e3d45 authored by Namhyung Kim's avatar Namhyung Kim Committed by Jan Kara
Browse files

jbd: Use printk_ratelimited() in journal_alloc_journal_head() 



Use printk_ratelimited() instead of doing it manually.

Signed-off-by: default avatarNamhyung Kim <namhyung@gmail.com>
Signed-off-by: default avatarJan Kara <jack@suse.cz>
parent c5639bef

fs/jbd/journal.c

+4 −6
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#include <linux/poison.h>

#include <linux/proc_fs.h>

#include <linux/debugfs.h>

#include <linux/ratelimit.h>



#include <asm/uaccess.h>

#include <asm/page.h>
@@ -1719,7 +1720,6 @@ static void journal_destroy_journal_head_cache(void) 
static struct journal_head *journal_alloc_journal_head(void)

{

	struct journal_head *ret;

	static unsigned long last_warning;



#ifdef CONFIG_JBD_DEBUG

	atomic_inc(&nr_journal_heads);
@@ -1727,11 +1727,9 @@ static struct journal_head *journal_alloc_journal_head(void) 
	ret = kmem_cache_alloc(journal_head_cache, GFP_NOFS);

	if (ret == NULL) {

		jbd_debug(1, "out of memory for journal_head\n");

		if (time_after(jiffies, last_warning + 5*HZ)) {

			printk(KERN_NOTICE "ENOMEM in %s, retrying.\n",

		printk_ratelimited(KERN_NOTICE "ENOMEM in %s, retrying.\n",

				   __func__);

			last_warning = jiffies;

		}



		while (ret == NULL) {

			yield();

			ret = kmem_cache_alloc(journal_head_cache, GFP_NOFS);