On Tue, Jul 03, 2007 at 03:25:43PM -0700, Andrew Morton wrote:
> Please prepare the equivalent patch for ext4. Without that, it'd probably
> be better to avoid applying the ext3 patch: there are advantages to keeping
> the two in sync where possible.
Hi Andrew,
here you go. By the way, this one is with generated diffstat. Do you prefer
it that way or is a diffstat for a patch touching a single file too much?
-----
From: Borislav Petkov <bbpetkov@xxxxxxxx>
Fix error handling in ext4_create_journal according to kernel conventions.
Signed-off-by: Borislav Petkov <bbpetkov@xxxxxxxx>
---
linux-2.6.22-rc7/fs/ext4/super.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
Index: linux-2.6.22-rc7/fs/ext4/super.c
===================================================================
--- linux-2.6.22-rc7/fs/ext4/super.c.orig 2007-07-04 21:18:24.000000000 +0200
+++ linux-2.6.22-rc7/fs/ext4/super.c 2007-07-04 21:19:46.000000000 +0200
@@ -2150,6 +2150,7 @@
unsigned int journal_inum)
{
journal_t *journal;
+ int err;
if (sb->s_flags & MS_RDONLY) {
printk(KERN_ERR "EXT4-fs: readonly filesystem when trying to "
@@ -2157,13 +2158,15 @@
return -EROFS;
}
- if (!(journal = ext4_get_journal(sb, journal_inum)))
+ journal = ext4_get_journal(sb, journal_inum);
+ if (!journal)
return -EINVAL;
printk(KERN_INFO "EXT4-fs: creating new journal on inode %u\n",
journal_inum);
- if (jbd2_journal_create(journal)) {
+ err = jbd2_journal_create(journal);
+ if (err) {
printk(KERN_ERR "EXT4-fs: error creating journal.\n");
jbd2_journal_destroy(journal);
return -EIO;
--
Regards/Gruß,
Boris.
-
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
