summaryrefslogtreecommitdiff
path: root/fs/xfs/xfs_inode.c
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@infradead.org>2011-08-23 08:28:07 +0000
committerAlex Elder <aelder@sgi.com>2011-10-11 21:15:00 -0500
commitc2b006c1da1602551def200e4661535f02b82488 (patch)
tree6801f459bb218ed062d30e31eb92d3867ce8166a /fs/xfs/xfs_inode.c
parent61551f1ee536289084a4a8f1c4f187e2f371c440 (diff)
downloadlinux-3.10-c2b006c1da1602551def200e4661535f02b82488.tar.gz
linux-3.10-c2b006c1da1602551def200e4661535f02b82488.tar.bz2
linux-3.10-c2b006c1da1602551def200e4661535f02b82488.zip
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>
Diffstat (limited to 'fs/xfs/xfs_inode.c')
-rw-r--r--fs/xfs/xfs_inode.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c
index f8fe1c66d42..7f237ba3c29 100644
--- a/fs/xfs/xfs_inode.c
+++ b/fs/xfs/xfs_inode.c
@@ -2597,11 +2597,11 @@ xfs_iflush(
goto cluster_corrupt_out;
if (flags & SYNC_WAIT)
- error = xfs_bwrite(mp, bp);
- else {
+ error = xfs_bwrite(bp);
+ else
xfs_buf_delwri_queue(bp);
- xfs_buf_relse(bp);
- }
+
+ xfs_buf_relse(bp);
return error;
corrupt_out: