xfs: let xfs_bwrite callers handle the xfs_buf_relse

Remove the xfs_buf_relse from xfs_bwrite and let the caller handle it to
mirror the delwri and read paths.

Also remove the mount pointer passed to xfs_bwrite, which is superflous now
that we have a mount pointer in the buftarg.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Alex Elder <aelder@sgi.com>

1 files changed, 7 insertions, 4 deletions

diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c
index 22946949bf5e..be173852b2ca 100644
--- a/fs/xfs/xfs_log_recover.c
+++ b/fs/xfs/xfs_log_recover.c
@@ -268,9 +268,12 @@ xlog_bwrite(
         xfs_buf_lock(bp);
         XFS_BUF_SET_COUNT(bp, BBTOB(nbblks));
 
-        if ((error = xfs_bwrite(log->l_mp, bp)))
+        error = xfs_bwrite(bp);
+        if (error) {
                 xfs_ioerror_alert("xlog_bwrite", log->l_mp,
                                   bp, XFS_BUF_ADDR(bp));
+        }
+        xfs_buf_relse(bp);
         return error;
 }
 
@@ -2172,15 +2175,15 @@ xlog_recover_buffer_pass2(
             (XFS_BUF_COUNT(bp) != MAX(log->l_mp->m_sb.sb_blocksize,
                         (__uint32_t)XFS_INODE_CLUSTER_SIZE(log->l_mp)))) {
                 XFS_BUF_STALE(bp);
-                error = xfs_bwrite(mp, bp);
+                error = xfs_bwrite(bp);
         } else {
                 ASSERT(bp->b_target->bt_mount == mp);
                 bp->b_iodone = xlog_recover_iodone;
                 xfs_buf_delwri_queue(bp);
-                xfs_buf_relse(bp);
         }
 
-        return (error);
+        xfs_buf_relse(bp);
+        return error;
 }
 
 STATIC int