diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2012-02-12 21:46:49 -0500 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-03-20 21:29:34 -0400 |
| commit | be0d93f0aa5682a24a2a9ec0dd26fffaad608cce (patch) | |
| tree | fc35e184e39ffe630dfa62e881cb8dbd5d6db22c /fs/ocfs2 | |
| parent | f56b0fbc6477e50303a503ee1453ed94e20f154a (diff) | |
| download | linux-stable-be0d93f0aa5682a24a2a9ec0dd26fffaad608cce.tar.gz linux-stable-be0d93f0aa5682a24a2a9ec0dd26fffaad608cce.tar.bz2 linux-stable-be0d93f0aa5682a24a2a9ec0dd26fffaad608cce.zip | |
... and the same failure exits cleanup for ocfs2
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/ocfs2')
| -rw-r--r-- | fs/ocfs2/super.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c index 604e12c4e979..2b1184f7097f 100644 --- a/fs/ocfs2/super.c +++ b/fs/ocfs2/super.c @@ -1154,12 +1154,12 @@ static int ocfs2_fill_super(struct super_block *sb, void *data, int silent) } status = ocfs2_mount_volume(sb); - if (osb->root_inode) - inode = igrab(osb->root_inode); - if (status < 0) goto read_super_error; + if (osb->root_inode) + inode = igrab(osb->root_inode); + if (!inode) { status = -EIO; mlog_errno(status); @@ -1168,6 +1168,7 @@ static int ocfs2_fill_super(struct super_block *sb, void *data, int silent) root = d_alloc_root(inode); if (!root) { + iput(inode); status = -ENOMEM; mlog_errno(status); goto read_super_error; @@ -1220,9 +1221,6 @@ static int ocfs2_fill_super(struct super_block *sb, void *data, int silent) read_super_error: brelse(bh); - if (inode) - iput(inode); - if (osb) { atomic_set(&osb->vol_state, VOLUME_DISABLED); wake_up(&osb->osb_mount_event); |