[Ocfs2-commits] mfasheh commits r852 - in trunk/src: . inc
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Mon Apr 19 14:07:20 CDT 2004
Author: mfasheh
Date: 2004-04-19 13:07:19 -0500 (Mon, 19 Apr 2004)
New Revision: 852
Modified:
trunk/src/inc/ocfs.h
trunk/src/super.c
Log:
* get rid of the ocfs2_oin slab as it's no longer needed
* get rid of lockres->oin as it's not referenced and isn't really legal anyways
* get rid of ocfs_allocate_oin() as it's no longer needed
Modified: trunk/src/inc/ocfs.h
===================================================================
--- trunk/src/inc/ocfs.h 2004-04-19 17:56:04 UTC (rev 851)
+++ trunk/src/inc/ocfs.h 2004-04-19 18:07:19 UTC (rev 852)
@@ -944,31 +944,6 @@
} while (0)
#endif
-#if 0
-/* oin macros - currently the release is handled separately */
-#ifdef OCFS_MEM_DBG
-#define ocfs_allocate_oin() ((ocfs_inode *)({ \
- ocfs_inode *oin = NULL; \
- oin = ocfs_dbg_slab_alloc (OcfsGlobalCtxt.oin_cache, __FILE__, __LINE__); \
- if (oin != NULL) { \
- memset (oin, 0, sizeof (ocfs_inode)); \
- oin->obj_id.type = OCFS_TYPE_OIN; \
- oin->obj_id.size = sizeof (ocfs_inode); \
- } \
- oin; }))
-#else /* !OCFS_MEM_DBG */
-#define ocfs_allocate_oin() ((ocfs_inode *)({ \
- ocfs_inode *oin = NULL; \
- oin = kmem_cache_alloc (OcfsGlobalCtxt.oin_cache, GFP_NOFS); \
- if (oin != NULL) { \
- memset (oin, 0, sizeof (ocfs_inode)); \
- oin->obj_id.type = OCFS_TYPE_OIN; \
- oin->obj_id.size = sizeof (ocfs_inode); \
- } \
- oin; }))
-#endif
-#endif
-
#define hashsize(n) ((__u32)1<<(n))
#define hashmask(n) (hashsize(n)-1)
@@ -1740,7 +1715,6 @@
__u8 lock_type;
int thread_id; // XXX
atomic_t lr_ref_cnt; /* When 0, freed */ // XXX
- ocfs_inode *oin; // XXX
spinlock_t lock_mutex; // XXX
__u32 readonly_node;
__u64 readonly_map;
Modified: trunk/src/super.c
===================================================================
--- trunk/src/super.c 2004-04-19 17:56:04 UTC (rev 851)
+++ trunk/src/super.c 2004-04-19 18:07:19 UTC (rev 852)
@@ -725,10 +725,6 @@
sizeof(ocfs_inode_private), 0, SLAB_NO_REAP | SLAB_HWCACHE_ALIGN,
NULL, NULL);
- OcfsGlobalCtxt.oin_cache = kmem_cache_create ("ocfs2_oin",
- sizeof (ocfs_inode) + OCFS_POINTER_SIZE, 0, SLAB_NO_REAP | SLAB_HWCACHE_ALIGN,
- NULL, NULL);
-
OcfsGlobalCtxt.ofile_cache = kmem_cache_create ("ocfs2_ofile",
sizeof (ocfs_file) + OCFS_POINTER_SIZE, 0, SLAB_NO_REAP | SLAB_HWCACHE_ALIGN,
NULL, NULL);
More information about the Ocfs2-commits
mailing list