Skip to content

Commit

Permalink
[XFS] kill calls to xfs_binval in the mount error path
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Christoph Hellwig authored and Niv Sardi committed Jul 28, 2008
1 parent c962fb7 commit 95db4e2
Showing 1 changed file with 2 additions and 8 deletions.
10 changes: 2 additions & 8 deletions fs/xfs/linux-2.6/xfs_super.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 95db4e2

Please sign in to comment.