From: Jan Kara Subject: Re: [PATCH UPDATED] jbd: Use printk_ratelimited() in journal_alloc_journal_head() Date: Mon, 4 Oct 2010 12:31:45 +0200 Message-ID: <20101004103145.GG3589@quack.suse.cz> References: <20101004094331.GC3589@quack.suse.cz> <1286187133-12475-1-git-send-email-namhyung@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Jan Kara , Andrew Morton , linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org To: Namhyung Kim Return-path: Received: from cantor2.suse.de ([195.135.220.15]:52763 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751195Ab0JDKcj (ORCPT ); Mon, 4 Oct 2010 06:32:39 -0400 Content-Disposition: inline In-Reply-To: <1286187133-12475-1-git-send-email-namhyung@gmail.com> Sender: linux-ext4-owner@vger.kernel.org List-ID: On Mon 04-10-10 19:12:13, Namhyung Kim wrote: > Use printk_ratelimited() instead of doing it manually. Thanks. I've merged the patch into my tree. Honza > > Signed-off-by: Namhyung Kim > --- > fs/jbd/journal.c | 9 +++------ > 1 files changed, 3 insertions(+), 6 deletions(-) > > diff --git a/fs/jbd/journal.c b/fs/jbd/journal.c > index 6f20a75..f79767d 100644 > --- a/fs/jbd/journal.c > +++ b/fs/jbd/journal.c > @@ -1718,7 +1718,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); > @@ -1726,11 +1725,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", > - __func__); > - last_warning = jiffies; > - } > + printk_ratelimited(KERN_NOTICE "ENOMEM in %s, retrying.\n", > + __func__); > + > while (ret == NULL) { > yield(); > ret = kmem_cache_alloc(journal_head_cache, GFP_NOFS); > -- > 1.7.0.4 > -- Jan Kara SUSE Labs, CR