diff options
| author | Dave Chinner <dchinner@redhat.com> | 2012-07-12 07:40:42 +1000 |
|---|---|---|
| committer | Ben Myers <bpm@sgi.com> | 2012-07-13 12:47:58 -0500 |
| commit | 1f432a887e9a5a5c25be6ac72b5da13652c8bed3 (patch) | |
| tree | 8988bb270ea862ea34315ccbc8698c90bcf236d7 /fs/xfs | |
| parent | 9b73bd7b61f320ffe7bda0126592ccf836d7ef90 (diff) | |
| download | linux-1f432a887e9a5a5c25be6ac72b5da13652c8bed3.tar.bz2 | |
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>
Diffstat (limited to 'fs/xfs')
| -rw-r--r-- | fs/xfs/xfs_alloc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/xfs/xfs_alloc.c b/fs/xfs/xfs_alloc.c index 9d1aeb7e2734..f654f51b0c67 100644 --- a/fs/xfs/xfs_alloc.c +++ b/fs/xfs/xfs_alloc.c @@ -1074,13 +1074,13 @@ restart: * If we couldn't get anything, give up. */ if (bno_cur_lt == NULL && bno_cur_gt == NULL) { + xfs_btree_del_cursor(cnt_cur, XFS_BTREE_NOERROR); + if (!forced++) { trace_xfs_alloc_near_busy(args); xfs_log_force(args->mp, XFS_LOG_SYNC); goto restart; } - - xfs_btree_del_cursor(cnt_cur, XFS_BTREE_NOERROR); trace_xfs_alloc_size_neither(args); args->agbno = NULLAGBLOCK; return 0; |