summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarrick J. Wong <darrick.wong@oracle.com>2016-10-10 17:23:07 +1100
committerDave Chinner <david@fromorbit.com>2016-10-10 17:23:07 +1100
commit6f97077ff6ef28e0f3b361b6ba9c95a222ef384b (patch)
treec541a0d113af184d0d45e3eddb3f89d434fdad58
parent1987fd743415564e8c67f2f7ec0ae3c18a6b11cd (diff)
xfs: rework refcount cow recovery error handling
The error handling in xfs_refcount_recover_cow_leftovers is confused and can potentially leak memory, so rework it to release resources correctly on error. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Reported-by: Brian Foster <bfoster@redhat.com> Reviewed-by: Dave Chinner <dchinner@redhat.com> Signed-off-by: Dave Chinner <david@fromorbit.com>
-rw-r--r--fs/xfs/libxfs/xfs_refcount.c20
1 files changed, 9 insertions, 11 deletions
diff --git a/fs/xfs/libxfs/xfs_refcount.c b/fs/xfs/libxfs/xfs_refcount.c
index 56bfef116423..b177ef33cd4c 100644
--- a/fs/xfs/libxfs/xfs_refcount.c
+++ b/fs/xfs/libxfs/xfs_refcount.c
@@ -1643,7 +1643,7 @@ xfs_refcount_recover_cow_leftovers(
error = xfs_btree_query_range(cur, &low, &high,
xfs_refcount_recover_extent, &debris);
if (error)
- goto out_error;
+ goto out_cursor;
xfs_btree_del_cursor(cur, XFS_BTREE_NOERROR);
xfs_buf_relse(agbp);
@@ -1675,14 +1675,8 @@ xfs_refcount_recover_cow_leftovers(
error = xfs_trans_commit(tp);
if (error)
- goto out_cancel;
+ goto out_free;
}
- goto out_free;
-
-out_defer:
- xfs_defer_cancel(&dfops);
-out_cancel:
- xfs_trans_cancel(tp);
out_free:
/* Free the leftover list */
@@ -1690,11 +1684,15 @@ out_free:
list_del(&rr->rr_list);
kmem_free(rr);
}
-
return error;
-out_error:
+out_cursor:
xfs_btree_del_cursor(cur, XFS_BTREE_ERROR);
xfs_buf_relse(agbp);
- return error;
+ goto out_free;
+
+out_defer:
+ xfs_defer_cancel(&dfops);
+ xfs_trans_cancel(tp);
+ goto out_free;
}