Skip to content

Commit

Permalink
[XFS] rename error2 goto label in xfs_fs_fill_super
Browse files Browse the repository at this point in the history
SGI-PV: 981951
SGI-Modid: xfs-linux-melb:xfs-kern:31198a

Signed-off-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: David Chinner <dgc@sgi.com>
Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>
  • Loading branch information
Christoph Hellwig authored and Niv Sardi committed Jul 28, 2008
1 parent 95db4e2 commit effa2ed
Showing 1 changed file with 6 additions and 7 deletions.
13 changes: 6 additions & 7 deletions fs/xfs/linux-2.6/xfs_super.c
Original file line number Diff line number Diff line change
Expand Up @@ -1795,22 +1795,22 @@ xfs_fs_fill_super(
goto out_destroy_counters;
error = xfs_finish_flags(args, mp);
if (error)
goto error2;
goto out_free_sb;

error = xfs_setup_devices(mp);
if (error)
goto error2;
goto out_free_sb;

if (mp->m_flags & XFS_MOUNT_BARRIER)
xfs_mountfs_check_barriers(mp);

error = xfs_filestream_mount(mp);
if (error)
goto error2;
goto out_free_sb;

error = xfs_mountfs(mp, flags);
if (error)
goto error2;
goto out_free_sb;

XFS_SEND_MOUNT(mp, DM_RIGHT_NULL, args->mtpt, args->fsname);

Expand Down Expand Up @@ -1850,9 +1850,8 @@ xfs_fs_fill_super(
kfree(args);
return 0;

error2:
if (mp->m_sb_bp)
xfs_freesb(mp);
out_free_sb:
xfs_freesb(mp);
out_destroy_counters:
xfs_icsb_destroy_counters(mp);
xfs_close_devices(mp);
Expand Down

0 comments on commit effa2ed

Please sign in to comment.