]> err.no Git - linux-2.6/commitdiff
[XFS] kill calls to xfs_binval in the mount error path
authorChristoph Hellwig <hch@infradead.org>
Tue, 20 May 2008 05:10:58 +0000 (15:10 +1000)
committerNiv Sardi <xaiki@debian.org>
Mon, 28 Jul 2008 06:58:30 +0000 (16:58 +1000)
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>
fs/xfs/linux-2.6/xfs_super.c

index fe52e9276aad7befa19c6697c95fa64023295428..d2155b1de10c837130d958b001d61e430de72d33 100644 (file)
@@ -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);