From: "Theodore Ts'o" <tytso@mit.edu>
To: linux-ext4@vger.kernel.org
Subject: The jbd_GFP_NORFAIL patch caused the jbd_kmalloc_kzalloc.patch fail
Date: Mon, 24 Sep 2007 10:14:33 -0400 [thread overview]
Message-ID: <E1IZohl-0002K5-CT@tinytim.thunk.org> (raw)
While putting together 2.6.23-rc7-ext4-1 patchset, I noticed that the
jbd_GFP_NOFAIL patch caused a patch conflict with the kmalloc/kzalloc
patch. I also fixed up the patch comments to make the git log look
prettier.
- Ted
Fix up jbd k[mz]alloc patch so it applies and fix up GFP_NOFAIL comments
diff --git a/jbd_GFP_NOFAIL_flag_cleanup.patch b/jbd_GFP_NOFAIL_flag_cleanup.patch
index 8dec157..da02815 100644
--- a/jbd_GFP_NOFAIL_flag_cleanup.patch
+++ b/jbd_GFP_NOFAIL_flag_cleanup.patch
@@ -1,3 +1,8 @@
+jbd/jbd2: Journal initialization doesn't need __GFP_NOFAIL
+
+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 +-
diff --git a/jbd_kmalloc_kzalloc.patch b/jbd_kmalloc_kzalloc.patch
index a426d0e..8ca0469 100644
--- a/jbd_kmalloc_kzalloc.patch
+++ b/jbd_kmalloc_kzalloc.patch
@@ -22,7 +22,7 @@ Index: linux-2.6.23-rc6/fs/jbd/journal.c
journal_t *journal;
int err;
-- journal = kmalloc(sizeof(*journal), GFP_KERNEL|__GFP_NOFAIL);
+- journal = kmalloc(sizeof(*journal), GFP_KERNEL);
+ journal = kzalloc(sizeof(*journal), GFP_KERNEL|__GFP_NOFAIL);
if (!journal)
goto fail;
@@ -51,7 +51,7 @@ Index: linux-2.6.23-rc6/fs/jbd2/journal.c
journal_t *journal;
int err;
-- journal = kmalloc(sizeof(*journal), GFP_KERNEL|__GFP_NOFAIL);
+- journal = kmalloc(sizeof(*journal), GFP_KERNEL);
+ journal = kzalloc(sizeof(*journal), GFP_KERNEL|__GFP_NOFAIL);
if (!journal)
goto fail;
reply other threads:[~2007-09-24 14:14 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=E1IZohl-0002K5-CT@tinytim.thunk.org \
--to=tytso@mit.edu \
--cc=linux-ext4@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).