diff options
| author | Brian Foster <bfoster@redhat.com> | 2014-07-14 23:41:25 +0200 |
|---|---|---|
| committer | Dave Chinner <david@fromorbit.com> | 2014-07-14 23:41:25 +0200 |
| commit | a70a4fa528faf6f22adce9a9067d1f4dfc332ade (patch) | |
| tree | d7834ed7a2b324faacba3f4446df574a2c5d3176 /fs/xfs | |
| parent | Merge branch 'xfs-libxfs-restructure' into for-next (diff) | |
| download | linux-a70a4fa528faf6f22adce9a9067d1f4dfc332ade.tar.xz linux-a70a4fa528faf6f22adce9a9067d1f4dfc332ade.zip | |
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.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c index d5c44a6bdb5b..4e9dd4a9c69a 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; } } |