Skip to contentSkip to conversation

free temporary cursor in xfs_dialloc

PATCH Superseded Eric Sandeen 2 participants 3 messages Oct 14, 2009 XFS filesystem

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 free temporary cursor in xfs_dialloc

Commit bd169565993b39b9b4b102cdac8b13e0a259ce2f 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.

---

fs/xfs/xfs_ialloc.c +0 -0
index ab64f3e..0785797 100644
@@ -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;

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

#1 lore raw

PATCH v2 1/1 free temporary cursor in xfs_dialloc

Commit bd169565993b39b9b4b102cdac8b13e0a259ce2f 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.

---

(V2 w/o whitespace mangling, ugh)

fs/xfs/xfs_ialloc.c +0 -0
index ab64f3e..0785797 100644
@@ -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;

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs