From be0d93f0aa5682a24a2a9ec0dd26fffaad608cce Mon Sep 17 00:00:00 2001 From: Al Viro Date: Sun, 12 Feb 2012 21:46:49 -0500 Subject: [PATCH] ... and the same failure exits cleanup for ocfs2 Signed-off-by: Al Viro --- fs/ocfs2/super.c | 10 ++++------ 1 file 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); -- 2.34.1