diff options
| author | Borislav Petkov <bbpetkov@yahoo.de> | 2007-07-15 23:41:45 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-16 09:05:51 -0700 |
| commit | 6c675bd43ccc36927c855d53d2e0042cdd1074ab (patch) | |
| tree | 530e4def493610d8bcab042bddce4b7ea376d43b /fs/ext4 | |
| parent | 952d9de116ad87261de106464a9eeec038c4cd14 (diff) | |
| download | op-kernel-dev-6c675bd43ccc36927c855d53d2e0042cdd1074ab.zip op-kernel-dev-6c675bd43ccc36927c855d53d2e0042cdd1074ab.tar.gz | |
ext4: fix error handling in ext4_create_journal
Fix error handling in ext4_create_journal according to kernel conventions.
Signed-off-by: Borislav Petkov <bbpetkov@yahoo.de>
Cc: <linux-ext4@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/ext4')
| -rw-r--r-- | fs/ext4/super.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index bd9aff9..adcbfad 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -2158,6 +2158,7 @@ static int ext4_create_journal(struct super_block * sb, 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 super_block * sb, 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; |
