summaryrefslogtreecommitdiff
path: root/fs/xfs
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@infradead.org>2008-05-20 15:10:58 +1000
committerNiv Sardi <xaiki@debian.org>2008-07-28 16:58:30 +1000
commit95db4e21b72603217f0bcafa4da9ee01fc1d2389 (patch)
tree17dc61e78350400431fb154b3e2e200b5910b76e /fs/xfs
parentc962fb7902669a48a2c613649c1f03865c0ffd1e (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.c10
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(
*/
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;
@@ -1853,12 +1853,6 @@ xfs_fs_fill_super(
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_destroy_counters:
xfs_icsb_destroy_counters(mp);
xfs_close_devices(mp);