summaryrefslogtreecommitdiffstats
path: root/fs/xfs
diff options
context:
space:
mode:
authorBrian Foster <bfoster@redhat.com>2014-07-15 07:41:25 +1000
committerDave Chinner <david@fromorbit.com>2014-07-15 07:41:25 +1000
commita70a4fa528faf6f22adce9a9067d1f4dfc332ade (patch)
treed7834ed7a2b324faacba3f4446df574a2c5d3176 /fs/xfs
parent7f8a058f6dc52219117bc2469b1fb816f7fa1a4b (diff)
downloadop-kernel-dev-a70a4fa528faf6f22adce9a9067d1f4dfc332ade.zip
op-kernel-dev-a70a4fa528faf6f22adce9a9067d1f4dfc332ade.tar.gz
xfs: fix a couple error sequence jumps in xfs_mountfs()
xfs_mountfs() has a couple failure conditions that do not jump to the correct labels. Specifically: - xfs_initialize_perag_data() failure does not deallocate the log even though it occurs after log initialization - xfs_mount_reset_sbqflags() failure returns the error directly rather than jump to the error sequence Signed-off-by: Brian Foster <bfoster@redhat.com> Reviewed-by: Dave Chinner <dchinner@redhat.com> Signed-off-by: Dave Chinner <david@fromorbit.com>
Diffstat (limited to 'fs/xfs')
-rw-r--r--fs/xfs/xfs_mount.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c
index d5c44a6..4e9dd4a 100644
--- a/fs/xfs/xfs_mount.c
+++ b/fs/xfs/xfs_mount.c
@@ -855,7 +855,7 @@ xfs_mountfs(
!mp->m_sb.sb_inprogress) {
error = xfs_initialize_perag_data(mp, sbp->sb_agcount);
if (error)
- goto out_fail_wait;
+ goto out_log_dealloc;;
}
/*
@@ -927,7 +927,7 @@ xfs_mountfs(
xfs_notice(mp, "resetting quota flags");
error = xfs_mount_reset_sbqflags(mp);
if (error)
- return error;
+ goto out_rtunmount;
}
}
OpenPOWER on IntegriCloud