summaryrefslogtreecommitdiff
path: root/fs/ext3
diff options
context:
space:
mode:
authorBorislav Petkov <bbpetkov@yahoo.de>2007-07-16 10:41:45 +0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-16 20:05:51 +0400
commit952d9de116ad87261de106464a9eeec038c4cd14 (patch)
tree415354669cb3b2ccfe7ea066e0bcf79c0a4305de /fs/ext3
parent1f1f642e2f092e37eb9038060eb0100c44f55a11 (diff)
downloadlinux-952d9de116ad87261de106464a9eeec038c4cd14.tar.xz
ext3: fix error handling in ext3_create_journal()
Fix error handling in ext3_create_journal according to kernel conventions. Signed-off-by: Borislav Petkov <bbpetkov@yahoo.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/ext3')
-rw-r--r--fs/ext3/super.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/fs/ext3/super.c b/fs/ext3/super.c
index 440c35d98993..8b75f73ba3b4 100644
--- a/fs/ext3/super.c
+++ b/fs/ext3/super.c
@@ -2084,6 +2084,7 @@ static int ext3_create_journal(struct super_block * sb,
unsigned int journal_inum)
{
journal_t *journal;
+ int err;
if (sb->s_flags & MS_RDONLY) {
printk(KERN_ERR "EXT3-fs: readonly filesystem when trying to "
@@ -2091,13 +2092,15 @@ static int ext3_create_journal(struct super_block * sb,
return -EROFS;
}
- if (!(journal = ext3_get_journal(sb, journal_inum)))
+ journal = ext3_get_journal(sb, journal_inum);
+ if (!journal)
return -EINVAL;
printk(KERN_INFO "EXT3-fs: creating new journal on inode %u\n",
journal_inum);
- if (journal_create(journal)) {
+ err = journal_create(journal);
+ if (err) {
printk(KERN_ERR "EXT3-fs: error creating journal.\n");
journal_destroy(journal);
return -EIO;