From: akpm@linux-foundation.org Subject: + ext4-fix-error-handling-in-ext4_create_journal.patch added to -mm tree Date: Thu, 05 Jul 2007 14:26:08 -0700 Message-ID: <200707052126.l65LQ8Rt020569@imap1.linux-foundation.org> Cc: bbpetkov@yahoo.de, linux-ext4@vger.kernel.org To: mm-commits@vger.kernel.org Return-path: Received: from smtp2.linux-foundation.org ([207.189.120.14]:58511 "EHLO smtp2.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757334AbXGEV0P (ORCPT ); Thu, 5 Jul 2007 17:26:15 -0400 Sender: linux-ext4-owner@vger.kernel.org List-Id: linux-ext4.vger.kernel.org The patch titled ext4: fix error handling in ext4_create_journal has been added to the -mm tree. Its filename is ext4-fix-error-handling-in-ext4_create_journal.patch *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: ext4: fix error handling in ext4_create_journal From: Borislav Petkov Fix error handling in ext4_create_journal according to kernel conventions. Signed-off-by: Borislav Petkov Cc: Signed-off-by: Andrew Morton --- fs/ext4/super.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff -puN fs/ext4/super.c~ext4-fix-error-handling-in-ext4_create_journal fs/ext4/super.c --- a/fs/ext4/super.c~ext4-fix-error-handling-in-ext4_create_journal +++ a/fs/ext4/super.c @@ -2158,6 +2158,7 @@ static int ext4_create_journal(struct su 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 " @@ -2165,13 +2166,15 @@ static int ext4_create_journal(struct su 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; _ Patches currently in -mm which might be from bbpetkov@yahoo.de are update-description-in-documentation-filesystems-vfstxt-typo-fixed.patch update-documentation-filesystems-vfstxt-second-part.patch ext3-fix-error-handling-in-ext3_create_journal.patch ext4-fix-error-handling-in-ext4_create_journal.patch