xfs: really fix the cursor leak in xfs_alloc_ag_vextent_near
authorDave Chinner <dchinner@redhat.com>
Wed, 11 Jul 2012 21:40:42 +0000 (07:40 +1000)
committerBen Myers <bpm@sgi.com>
Fri, 13 Jul 2012 18:09:18 +0000 (13:09 -0500)
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>
fs/xfs/xfs_alloc.c

index 9d1aeb7e273492f67e97c3f43108a57000cd7c0f..f654f51b0c673a12bb928de3773873bbfdf22aad 100644 (file)
@@ -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;