[Ocfs2-commits] mfasheh commits r856 - in trunk/src: . inc

[svn-commits at oss.oracle.com]

Author: mfasheh
Date: 2004-04-19 19:40:51 -0500 (Mon, 19 Apr 2004)
New Revision: 856

Modified:
   trunk/src/inc/ocfs.h
   trunk/src/proc.c
   trunk/src/super.c
Log:
* oops, forgot to remove some of the oin_cache stuff. this fixes a crash on umount because of it.



Modified: trunk/src/inc/ocfs.h
===================================================================
--- trunk/src/inc/ocfs.h	2004-04-20 00:22:30 UTC (rev 855)
+++ trunk/src/inc/ocfs.h	2004-04-20 00:40:51 UTC (rev 856)
@@ -2000,7 +2000,6 @@
 	ocfs_sem res;
 	struct list_head osb_next;	/* List of all volumes */
 	kmem_cache_t *inode_cache;
-	kmem_cache_t *oin_cache;
 	kmem_cache_t *ofile_cache;
 	kmem_cache_t *fe_cache;
 	kmem_cache_t *lockres_cache;

Modified: trunk/src/proc.c
===================================================================
--- trunk/src/proc.c	2004-04-20 00:22:30 UTC (rev 855)
+++ trunk/src/proc.c	2004-04-20 00:40:51 UTC (rev 856)
@@ -169,9 +169,7 @@
 		item = list_entry (iter, alloc_item, list);
 		switch (item->type) {
 		    case SLAB_ITEM:
-			if (item->u.slab == OcfsGlobalCtxt.oin_cache)
-				slabname = "oin";
-			else if (item->u.slab == OcfsGlobalCtxt.ofile_cache)
+			if (item->u.slab == OcfsGlobalCtxt.ofile_cache)
 				slabname = "ofile";
 			else if (item->u.slab == OcfsGlobalCtxt.lockres_cache)
 				slabname = "lockres";

Modified: trunk/src/super.c
===================================================================
--- trunk/src/super.c	2004-04-20 00:22:30 UTC (rev 855)
+++ trunk/src/super.c	2004-04-20 00:40:51 UTC (rev 856)
@@ -760,7 +760,6 @@
 static void ocfs_free_mem_lists (void)
 {
 	kmem_cache_destroy (OcfsGlobalCtxt.inode_cache);
-	kmem_cache_destroy (OcfsGlobalCtxt.oin_cache);
 	kmem_cache_destroy (OcfsGlobalCtxt.ofile_cache);
 	kmem_cache_destroy (OcfsGlobalCtxt.fe_cache);
 	kmem_cache_destroy (OcfsGlobalCtxt.lockres_cache);