diff options
| author | Christoph Hellwig <hch@lst.de> | 2011-07-08 14:36:25 +0200 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2011-07-08 14:36:25 +0200 |
| commit | c8da0faf6b07623c473cab42967f943ad4ab7560 (patch) | |
| tree | 6bfd211ba798c482f592c81bfbe4760758c829e8 /fs/xfs/xfs_log_recover.c | |
| parent | 0c842ad46a51891ac4420b7285613f4134a65ccd (diff) | |
| download | linux-stable-c8da0faf6b07623c473cab42967f943ad4ab7560.tar.gz linux-stable-c8da0faf6b07623c473cab42967f943ad4ab7560.tar.bz2 linux-stable-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_recover.c')
| -rw-r--r-- | fs/xfs/xfs_log_recover.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c index a74e26408343..40c9742aa478 100644 --- a/fs/xfs/xfs_log_recover.c +++ b/fs/xfs/xfs_log_recover.c @@ -91,6 +91,8 @@ xlog_get_bp( xlog_t *log, int nbblks) { + struct xfs_buf *bp; + if (!xlog_buf_bbcount_valid(log, nbblks)) { xfs_warn(log->l_mp, "Invalid block length (0x%x) for buffer", nbblks); @@ -118,8 +120,10 @@ xlog_get_bp( nbblks += log->l_sectBBsize; nbblks = round_up(nbblks, log->l_sectBBsize); - return xfs_buf_get_uncached(log->l_mp->m_logdev_targp, - BBTOB(nbblks), 0); + bp = xfs_buf_get_uncached(log->l_mp->m_logdev_targp, BBTOB(nbblks), 0); + if (bp) + xfs_buf_unlock(bp); + return bp; } STATIC void |