AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

xfs: fix a couple error sequence jumps in xfs_mountfs()

Browse Source 
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>
This commit is contained in:
Brian Foster 2014-07-15 07:41:25 +10:00 committed by Dave Chinner
parent 7f8a058f6d
commit a70a4fa528
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/xfs/xfs_mount.c
View File

@ -855,7 +855,7 @@ xfs_mountfs(
!mp->m_sb.sb_inprogress) { !mp->m_sb.sb_inprogress) {
error = xfs_initialize_perag_data(mp, sbp->sb_agcount); error = xfs_initialize_perag_data(mp, sbp->sb_agcount);
if (error) if (error)
goto out_fail_wait; goto out_log_dealloc;;
} }
/* /*
@ -927,7 +927,7 @@ xfs_mountfs(
xfs_notice(mp, "resetting quota flags"); xfs_notice(mp, "resetting quota flags");
error = xfs_mount_reset_sbqflags(mp); error = xfs_mount_reset_sbqflags(mp);
if (error) if (error)
return error; goto out_rtunmount;
} }
} }