iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[XFS] rename error2 goto label in xfs_fs_fill_super

Browse Source 
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>
This commit is contained in:
Christoph Hellwig 2008-05-20 15:11:05 +10:00 committed by Niv Sardi
parent 95db4e21b7
commit effa2eda3a
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fs/xfs/linux-2.6/xfs_super.c
View File

@ -1795,22 +1795,22 @@ xfs_fs_fill_super(
goto out_destroy_counters; goto out_destroy_counters;
error = xfs_finish_flags(args, mp); error = xfs_finish_flags(args, mp);
if (error) if (error)
goto error2; goto out_free_sb;
error = xfs_setup_devices(mp); error = xfs_setup_devices(mp);
if (error) if (error)
goto error2; goto out_free_sb;
if (mp->m_flags & XFS_MOUNT_BARRIER) if (mp->m_flags & XFS_MOUNT_BARRIER)
xfs_mountfs_check_barriers(mp); xfs_mountfs_check_barriers(mp);
error = xfs_filestream_mount(mp); error = xfs_filestream_mount(mp);
if (error) if (error)
goto error2; goto out_free_sb;
error = xfs_mountfs(mp, flags); error = xfs_mountfs(mp, flags);
if (error) if (error)
goto error2; goto out_free_sb;
XFS_SEND_MOUNT(mp, DM_RIGHT_NULL, args->mtpt, args->fsname); XFS_SEND_MOUNT(mp, DM_RIGHT_NULL, args->mtpt, args->fsname);
@ -1850,9 +1850,8 @@ xfs_fs_fill_super(
kfree(args); kfree(args);
return 0; return 0;
error2: out_free_sb:
if (mp->m_sb_bp) xfs_freesb(mp);
xfs_freesb(mp);
out_destroy_counters: out_destroy_counters:
xfs_icsb_destroy_counters(mp); xfs_icsb_destroy_counters(mp);
xfs_close_devices(mp); xfs_close_devices(mp);