aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@infradead.org>2008-05-20 01:11:05 -0400
committerNiv Sardi <xaiki@debian.org>2008-07-28 02:58:31 -0400
commiteffa2eda3ab9c013585349b8afd305dc5decf771 (patch)
tree9d00f5840d9a4660010159d822386154b5425fbb
parent95db4e21b72603217f0bcafa4da9ee01fc1d2389 (diff)
[XFS] rename error2 goto label in xfs_fs_fill_super
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>
-rw-r--r--fs/xfs/linux-2.6/xfs_super.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/fs/xfs/linux-2.6/xfs_super.c b/fs/xfs/linux-2.6/xfs_super.c
index d2155b1de10c..4c662d63d626 100644
--- a/fs/xfs/linux-2.6/xfs_super.c
+++ b/fs/xfs/linux-2.6/xfs_super.c
@@ -1795,22 +1795,22 @@ xfs_fs_fill_super(
1795 goto out_destroy_counters; 1795 goto out_destroy_counters;
1796 error = xfs_finish_flags(args, mp); 1796 error = xfs_finish_flags(args, mp);
1797 if (error) 1797 if (error)
1798 goto error2; 1798 goto out_free_sb;
1799 1799
1800 error = xfs_setup_devices(mp); 1800 error = xfs_setup_devices(mp);
1801 if (error) 1801 if (error)
1802 goto error2; 1802 goto out_free_sb;
1803 1803
1804 if (mp->m_flags & XFS_MOUNT_BARRIER) 1804 if (mp->m_flags & XFS_MOUNT_BARRIER)
1805 xfs_mountfs_check_barriers(mp); 1805 xfs_mountfs_check_barriers(mp);
1806 1806
1807 error = xfs_filestream_mount(mp); 1807 error = xfs_filestream_mount(mp);
1808 if (error) 1808 if (error)
1809 goto error2; 1809 goto out_free_sb;
1810 1810
1811 error = xfs_mountfs(mp, flags); 1811 error = xfs_mountfs(mp, flags);
1812 if (error) 1812 if (error)
1813 goto error2; 1813 goto out_free_sb;
1814 1814
1815 XFS_SEND_MOUNT(mp, DM_RIGHT_NULL, args->mtpt, args->fsname); 1815 XFS_SEND_MOUNT(mp, DM_RIGHT_NULL, args->mtpt, args->fsname);
1816 1816
@@ -1850,9 +1850,8 @@ xfs_fs_fill_super(
1850 kfree(args); 1850 kfree(args);
1851 return 0; 1851 return 0;
1852 1852
1853 error2: 1853 out_free_sb:
1854 if (mp->m_sb_bp) 1854 xfs_freesb(mp);
1855 xfs_freesb(mp);
1856 out_destroy_counters: 1855 out_destroy_counters:
1857 xfs_icsb_destroy_counters(mp); 1856 xfs_icsb_destroy_counters(mp);
1858 xfs_close_devices(mp); 1857 xfs_close_devices(mp);