On Wed, Jan 13, 2016 at 06:50:52PM +0100, Christoph Hellwig wrote:
> Signed-off-by: Christoph Hellwig <hch@xxxxxx>
> ---
Reviewed-by: Brian Foster <bfoster@xxxxxxxxxx>
> fs/xfs/libxfs/xfs_btree.c | 9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/fs/xfs/libxfs/xfs_btree.c b/fs/xfs/libxfs/xfs_btree.c
> index a0eb18c..3143577 100644
> --- a/fs/xfs/libxfs/xfs_btree.c
> +++ b/fs/xfs/libxfs/xfs_btree.c
> @@ -3209,6 +3209,7 @@ xfs_btree_kill_iroot(
> int level;
> int index;
> int numrecs;
> + int error;
> #ifdef DEBUG
> union xfs_btree_ptr ptr;
> int i;
> @@ -3272,8 +3273,6 @@ xfs_btree_kill_iroot(
> cpp = xfs_btree_ptr_addr(cur, 1, cblock);
> #ifdef DEBUG
> for (i = 0; i < numrecs; i++) {
> - int error;
> -
> error = xfs_btree_check_ptr(cur, cpp, i, level - 1);
> if (error) {
> XFS_BTREE_TRACE_CURSOR(cur, XBT_ERROR);
> @@ -3283,7 +3282,11 @@ xfs_btree_kill_iroot(
> #endif
> xfs_btree_copy_ptrs(cur, pp, cpp, numrecs);
>
> - cur->bc_ops->free_block(cur, cbp);
> + error = cur->bc_ops->free_block(cur, cbp);
> + if (error) {
> + XFS_BTREE_TRACE_CURSOR(cur, XBT_ERROR);
> + return error;
> + }
> XFS_BTREE_STATS_INC(cur, free);
>
> cur->bc_bufs[level - 1] = NULL;
> --
> 1.9.1
>
> _______________________________________________
> xfs mailing list
> xfs@xxxxxxxxxxx
> http://oss.sgi.com/mailman/listinfo/xfs
_______________________________________________
xfs mailing list
xfs@xxxxxxxxxxx
http://oss.sgi.com/mailman/listinfo/xfs
