Home » Mailing list archives » linux-kernel » 2007 » October » 4

[PATCH] jbd/jbd2: Journal initialization doesn't need __GFP_NOFAIL

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Theodore Ts'o <tytso@...>
To: <linux-kernel@...>
Cc: <linux-ext4@...>, Aneesh Kumar K.V <aneesh.kumar@...>, Mingming Cao <cmm@...>, Theodore Ts'o <tytso@...>
Subject: [PATCH] jbd/jbd2: Journal initialization doesn't need __GFP_NOFAIL
Date: Thursday, October 4, 2007 - 1:50 am

From: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>

Signed-off-by: Mingming Cao <cmm@us.ibm.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
---
 fs/jbd/journal.c  |    2 +-
 fs/jbd2/journal.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/jbd/journal.c b/fs/jbd/journal.c
index ae2c25d..8d6d475 100644
--- a/fs/jbd/journal.c
+++ b/fs/jbd/journal.c
@@ -653,7 +653,7 @@ static journal_t * journal_init_common (void)
 	journal_t *journal;
 	int err;
 
-	journal = kmalloc(sizeof(*journal), GFP_KERNEL|__GFP_NOFAIL);
+	journal = kmalloc(sizeof(*journal), GFP_KERNEL);
 	if (!journal)
 		goto fail;
 	memset(journal, 0, sizeof(*journal));
diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
index 4281244..0e329a3 100644
--- a/fs/jbd2/journal.c
+++ b/fs/jbd2/journal.c
@@ -654,7 +654,7 @@ static journal_t * journal_init_common (void)
 	journal_t *journal;
 	int err;
 
-	journal = kmalloc(sizeof(*journal), GFP_KERNEL|__GFP_NOFAIL);
+	journal = kmalloc(sizeof(*journal), GFP_KERNEL);
 	if (!journal)
 		goto fail;
 	memset(journal, 0, sizeof(*journal));
-- 
1.5.3.2.81.g17ed

-
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCH, RFC] Ext4 patches planned for submission upstream, Theodore Ts'o, (Thu Oct 4, 1:50 am)
[PATCH] jbd/jbd2: JBD memory allocation cleanups, Theodore Ts'o, (Thu Oct 4, 1:50 am)
Re: [PATCH] jbd/jbd2: JBD memory allocation cleanups, Christoph Hellwig, (Thu Oct 4, 2:52 am)
[PATCH] jbd2: JBD replace jbd2_kmalloc with kmalloc, Mingming Cao, (Fri Oct 5, 6:39 pm)
Re: [PATCH] jbd2: JBD replace jbd2_kmalloc with kmalloc, Christoph Lameter, (Mon Oct 8, 2:37 pm)
[PATCH] jbd: JBD replace jbd_kmalloc with kmalloc, Mingming Cao, (Fri Oct 5, 6:38 pm)
Re: [PATCH] jbd: JBD replace jbd_kmalloc with kmalloc, Christoph Lameter, (Mon Oct 8, 1:46 pm)
Re: [PATCH] jbd: JBD replace jbd_kmalloc with kmalloc, Mingming Cao, (Mon Oct 8, 2:26 pm)
Re: [PATCH] jbd: JBD replace jbd_kmalloc with kmalloc, Christoph Lameter, (Mon Oct 8, 2:34 pm)
[PATCH] jbd2: JBD2 slab allocation cleanups, Mingming Cao, (Fri Oct 5, 6:36 pm)
[PATCH] jbd: JBD slab allocation cleanups, Mingming Cao, (Fri Oct 5, 6:35 pm)
Re: [PATCH] jbd/jbd2: JBD memory allocation cleanups, Mingming Cao, (Fri Oct 5, 6:33 pm)
[PATCH] jbd/jbd2: Journal initialization doesn't need __GFP_..., Theodore Ts'o, (Thu Oct 4, 1:50 am)
[PATCH] JBD2/Ext4: Convert kmalloc to kzalloc in jbd2/ext4, Theodore Ts'o, (Thu Oct 4, 1:50 am)