xfs: really fix the cursor leak in xfs_alloc_ag_vextent_near
The current cursor is reallocated when retrying the allocation, so the existing cursor needs to be destroyed in both the restart and the failure cases. Signed-off-by: Dave Chinner <dchinner@redhat.com> Tested-by: Mike Snitzer <snitzer@redhat.com> Signed-off-by: Ben Myers <bpm@sgi.com>
This commit is contained in:
parent
f7bdf03a99
commit
e3a746f5aa
|
@ -1074,13 +1074,13 @@ restart:
|
||||||
* If we couldn't get anything, give up.
|
* If we couldn't get anything, give up.
|
||||||
*/
|
*/
|
||||||
if (bno_cur_lt == NULL && bno_cur_gt == NULL) {
|
if (bno_cur_lt == NULL && bno_cur_gt == NULL) {
|
||||||
|
xfs_btree_del_cursor(cnt_cur, XFS_BTREE_NOERROR);
|
||||||
|
|
||||||
if (!forced++) {
|
if (!forced++) {
|
||||||
trace_xfs_alloc_near_busy(args);
|
trace_xfs_alloc_near_busy(args);
|
||||||
xfs_log_force(args->mp, XFS_LOG_SYNC);
|
xfs_log_force(args->mp, XFS_LOG_SYNC);
|
||||||
goto restart;
|
goto restart;
|
||||||
}
|
}
|
||||||
|
|
||||||
xfs_btree_del_cursor(cnt_cur, XFS_BTREE_NOERROR);
|
|
||||||
trace_xfs_alloc_size_neither(args);
|
trace_xfs_alloc_size_neither(args);
|
||||||
args->agbno = NULLAGBLOCK;
|
args->agbno = NULLAGBLOCK;
|
||||||
return 0;
|
return 0;
|
||||||
|
|
Loading…
Reference in a new issue