Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1f432a88 authored by Dave Chinner's avatar Dave Chinner Committed by Ben Myers
Browse files

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: default avatarDave Chinner <dchinner@redhat.com>
Tested-by: default avatarMike Snitzer <snitzer@redhat.com>
Signed-off-by: default avatarBen Myers <bpm@sgi.com>
parent 9b73bd7b

fs/xfs/xfs_alloc.c

+2 −2
Original line number Diff line number Diff line
@@ -1074,13 +1074,13 @@ xfs_alloc_ag_vextent_near( 
	 * 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;