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

Commit 3b826386 authored by Eric Sandeen's avatar Eric Sandeen Committed by hch@lst.de
Browse files

xfs: free temporary cursor in xfs_dialloc 



Commit bd169565 seems
to have a slight regression where this code path:

    if (!--searchdistance) {
        /*
         * Not in range - save last search
         * location and allocate a new inode
         */
        ...
        goto newino;
    }

doesn't free the temporary cursor (tcur) that got dup'd in
this function.

This leaks an item in the xfs_btree_cur zone, and it's caught
on module unload:

===========================================================
BUG xfs_btree_cur: Objects remaining on kmem_cache_close()
-----------------------------------------------------------

It seems like maybe a single free at the end of the function might
be cleaner, but for now put a del_cursor right in this code block
similar to the handling in the rest of the function.

Signed-off-by: default avatarEric Sandeen <sandeen@sandeen.net>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent ba313e68

fs/xfs/xfs_ialloc.c

+1 −0
Original line number Diff line number Diff line
@@ -880,6 +880,7 @@ nextag: 
				 * Not in range - save last search

				 * location and allocate a new inode

				 */

				xfs_btree_del_cursor(tcur, XFS_BTREE_NOERROR);

				pag->pagl_leftrec = trec.ir_startino;

				pag->pagl_rightrec = rec.ir_startino;

				pag->pagl_pagino = pagino;