diff options
author | Christoph Hellwig <hch@infradead.org> | 2008-05-20 01:10:58 -0400 |
---|---|---|
committer | Niv Sardi <xaiki@debian.org> | 2008-07-28 02:58:30 -0400 |
commit | 95db4e21b72603217f0bcafa4da9ee01fc1d2389 (patch) | |
tree | 17dc61e78350400431fb154b3e2e200b5910b76e /fs/xfs | |
parent | c962fb7902669a48a2c613649c1f03865c0ffd1e (diff) |
[XFS] kill calls to xfs_binval in the mount error path
xfs_binval aka xfs_flush_buftarg is the first thing done in
xfs_free_buftarg, so there is no need to have duplicated calls just before
xfs_free_buftarg in the mount failure path.
SGI-PV: 981951
SGI-Modid: xfs-linux-melb:xfs-kern:31197a
Signed-off-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: David Chinner <dgc@sgi.com>
Signed-off-by: Lachlan McIlroy <lachlan@sgi.com>
Diffstat (limited to 'fs/xfs')
-rw-r--r-- | fs/xfs/linux-2.6/xfs_super.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/fs/xfs/linux-2.6/xfs_super.c b/fs/xfs/linux-2.6/xfs_super.c index fe52e9276aad..d2155b1de10c 100644 --- a/fs/xfs/linux-2.6/xfs_super.c +++ b/fs/xfs/linux-2.6/xfs_super.c | |||
@@ -1789,10 +1789,10 @@ xfs_fs_fill_super( | |||
1789 | */ | 1789 | */ |
1790 | error = xfs_start_flags(args, mp); | 1790 | error = xfs_start_flags(args, mp); |
1791 | if (error) | 1791 | if (error) |
1792 | goto error1; | 1792 | goto out_destroy_counters; |
1793 | error = xfs_readsb(mp, flags); | 1793 | error = xfs_readsb(mp, flags); |
1794 | if (error) | 1794 | if (error) |
1795 | goto error1; | 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 error2; |
@@ -1853,12 +1853,6 @@ xfs_fs_fill_super( | |||
1853 | error2: | 1853 | error2: |
1854 | if (mp->m_sb_bp) | 1854 | if (mp->m_sb_bp) |
1855 | xfs_freesb(mp); | 1855 | xfs_freesb(mp); |
1856 | error1: | ||
1857 | xfs_binval(mp->m_ddev_targp); | ||
1858 | if (mp->m_logdev_targp && mp->m_logdev_targp != mp->m_ddev_targp) | ||
1859 | xfs_binval(mp->m_logdev_targp); | ||
1860 | if (mp->m_rtdev_targp) | ||
1861 | xfs_binval(mp->m_rtdev_targp); | ||
1862 | out_destroy_counters: | 1856 | out_destroy_counters: |
1863 | xfs_icsb_destroy_counters(mp); | 1857 | xfs_icsb_destroy_counters(mp); |
1864 | xfs_close_devices(mp); | 1858 | xfs_close_devices(mp); |