The jbd_GFP_NORFAIL patch caused the jbd_kmalloc_kzalloc.patch fail
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
jbd_GFP_NOFAIL_flag_cleanup.patch +5 -0
@@ -1,3 +1,8 @@ +jbd/jbd2: Journal initialization doesn't need __GFP_NOFAIL + +Signed-off-by: Mingming Cao <[email protected]> +Signed-off-by: "Theodore Ts'o" <[email protected]> + --- fs/jbd/journal.c | 2 +- fs/jbd2/journal.c | 2 +-
jbd_kmalloc_kzalloc.patch +2 -2
@@ -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;