xfs: make xfs_buf_get_map return an error code
Convert xfs_buf_get_map() to return numeric error codes like most everywhere else in xfs. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Dave Chinner <dchinner@redhat.com>
This commit is contained in:
@@ -685,53 +685,39 @@ xfs_buf_incore(
|
||||
* cache hits, as metadata intensive workloads will see 3 orders of magnitude
|
||||
* more hits than misses.
|
||||
*/
|
||||
struct xfs_buf *
|
||||
int
|
||||
xfs_buf_get_map(
|
||||
struct xfs_buftarg *target,
|
||||
struct xfs_buf_map *map,
|
||||
int nmaps,
|
||||
xfs_buf_flags_t flags)
|
||||
xfs_buf_flags_t flags,
|
||||
struct xfs_buf **bpp)
|
||||
{
|
||||
struct xfs_buf *bp;
|
||||
struct xfs_buf *new_bp;
|
||||
int error = 0;
|
||||
|
||||
*bpp = NULL;
|
||||
error = xfs_buf_find(target, map, nmaps, flags, NULL, &bp);
|
||||
|
||||
switch (error) {
|
||||
case 0:
|
||||
/* cache hit */
|
||||
if (!error)
|
||||
goto found;
|
||||
case -EAGAIN:
|
||||
/* cache hit, trylock failure, caller handles failure */
|
||||
ASSERT(flags & XBF_TRYLOCK);
|
||||
return NULL;
|
||||
case -ENOENT:
|
||||
/* cache miss, go for insert */
|
||||
break;
|
||||
case -EFSCORRUPTED:
|
||||
default:
|
||||
/*
|
||||
* None of the higher layers understand failure types
|
||||
* yet, so return NULL to signal a fatal lookup error.
|
||||
*/
|
||||
return NULL;
|
||||
}
|
||||
if (error != -ENOENT)
|
||||
return error;
|
||||
|
||||
error = _xfs_buf_alloc(target, map, nmaps, flags, &new_bp);
|
||||
if (error)
|
||||
return NULL;
|
||||
return error;
|
||||
|
||||
error = xfs_buf_allocate_memory(new_bp, flags);
|
||||
if (error) {
|
||||
xfs_buf_free(new_bp);
|
||||
return NULL;
|
||||
return error;
|
||||
}
|
||||
|
||||
error = xfs_buf_find(target, map, nmaps, flags, new_bp, &bp);
|
||||
if (error) {
|
||||
xfs_buf_free(new_bp);
|
||||
return NULL;
|
||||
return error;
|
||||
}
|
||||
|
||||
if (bp != new_bp)
|
||||
@@ -744,7 +730,7 @@ found:
|
||||
xfs_warn(target->bt_mount,
|
||||
"%s: failed to map pagesn", __func__);
|
||||
xfs_buf_relse(bp);
|
||||
return NULL;
|
||||
return error;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -757,7 +743,8 @@ found:
|
||||
|
||||
XFS_STATS_INC(target->bt_mount, xb_get);
|
||||
trace_xfs_buf_get(bp, flags, _RET_IP_);
|
||||
return bp;
|
||||
*bpp = bp;
|
||||
return 0;
|
||||
}
|
||||
|
||||
STATIC int
|
||||
@@ -818,11 +805,12 @@ xfs_buf_read_map(
|
||||
const struct xfs_buf_ops *ops)
|
||||
{
|
||||
struct xfs_buf *bp;
|
||||
int error;
|
||||
|
||||
flags |= XBF_READ;
|
||||
|
||||
bp = xfs_buf_get_map(target, map, nmaps, flags);
|
||||
if (!bp)
|
||||
error = xfs_buf_get_map(target, map, nmaps, flags, &bp);
|
||||
if (error)
|
||||
return NULL;
|
||||
|
||||
trace_xfs_buf_read(bp, flags, _RET_IP_);
|
||||
|
Reference in New Issue
Block a user