summaryrefslogtreecommitdiff
path: root/fs/xfs/xfs_log.c
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2011-07-08 14:36:25 +0200
committerChristoph Hellwig <hch@lst.de>2011-07-08 14:36:25 +0200
commitc8da0faf6b07623c473cab42967f943ad4ab7560 (patch)
tree6bfd211ba798c482f592c81bfbe4760758c829e8 /fs/xfs/xfs_log.c
parent0c842ad46a51891ac4420b7285613f4134a65ccd (diff)
downloadlinux-3.10-c8da0faf6b07623c473cab42967f943ad4ab7560.tar.gz
linux-3.10-c8da0faf6b07623c473cab42967f943ad4ab7560.tar.bz2
linux-3.10-c8da0faf6b07623c473cab42967f943ad4ab7560.zip
xfs: return the buffer locked from xfs_buf_get_uncached
All other xfs_buf_get/read-like helpers return the buffer locked, make sure xfs_buf_get_uncached isn't different for no reason. Half of the callers already lock it directly after, and the others probably should also keep it locked if only for consistency and beeing able to use xfs_buf_rele, but I'll leave that for later. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Alex Elder <aelder@sgi.com> Reviewed-by: Dave Chinner <dchinner@redhat.com>
Diffstat (limited to 'fs/xfs/xfs_log.c')
-rw-r--r--fs/xfs/xfs_log.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c
index 68e053ea6e7..44c269b387c 100644
--- a/fs/xfs/xfs_log.c
+++ b/fs/xfs/xfs_log.c
@@ -1090,8 +1090,7 @@ xlog_alloc_log(xfs_mount_t *mp,
log->l_iclog_size, 0);
if (!bp)
goto out_free_iclog;
- if (!xfs_buf_trylock(bp))
- ASSERT(0);
+
XFS_BUF_SET_IODONE_FUNC(bp, xlog_iodone);
XFS_BUF_SET_FSPRIVATE2(bp, (unsigned long)1);
iclog->ic_bp = bp;