[XFS] rename error2 goto label in xfs_fs_fill_super

[linux-2.6-omap-h63xx.git] / fs / xfs / linux-2.6 / xfs_super.c

diff --git a/fs/xfs/linux-2.6/xfs_super.c b/fs/xfs/linux-2.6/xfs_super.c
index fe52e9276aad7befa19c6697c95fa64023295428..4c662d63d6262c8d6ad3a1626f137bba918be0cb 100644 (file)
--- a/fs/xfs/linux-2.6/xfs_super.c
+++ b/fs/xfs/linux-2.6/xfs_super.c
@@ -1789,28 +1789,28 @@ xfs_fs_fill_super(
         */
        error = xfs_start_flags(args, mp);
        if (error)
-               goto error1;
+               goto out_destroy_counters;
        error = xfs_readsb(mp, flags);
        if (error)
-               goto error1;
+               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);
 
@@ -1850,15 +1850,8 @@ xfs_fs_fill_super(
        kfree(args);
        return 0;
 
- error2:
-       if (mp->m_sb_bp)
-               xfs_freesb(mp);
- error1:
-       xfs_binval(mp->m_ddev_targp);
-       if (mp->m_logdev_targp && mp->m_logdev_targp != mp->m_ddev_targp)
-               xfs_binval(mp->m_logdev_targp);
-       if (mp->m_rtdev_targp)
-               xfs_binval(mp->m_rtdev_targp);
+ out_free_sb:
+       xfs_freesb(mp);
  out_destroy_counters:
        xfs_icsb_destroy_counters(mp);
        xfs_close_devices(mp);