aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ocfs2
diff options
context:
space:
mode:
authorChristoph Lameter <clameter@sgi.com>2007-05-06 17:50:16 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-07 15:12:57 -0400
commit50953fe9e00ebbeffa032a565ab2f08312d51a87 (patch)
tree9f95f56f0b51600959a76cd88ce17f6e9c7a98a3 /fs/ocfs2
parent4b1d89290b62bb2db476c94c82cf7442aab440c8 (diff)
slab allocators: Remove SLAB_DEBUG_INITIAL flag
I have never seen a use of SLAB_DEBUG_INITIAL. It is only supported by SLAB. I think its purpose was to have a callback after an object has been freed to verify that the state is the constructor state again? The callback is performed before each freeing of an object. I would think that it is much easier to check the object state manually before the free. That also places the check near the code object manipulation of the object. Also the SLAB_DEBUG_INITIAL callback is only performed if the kernel was compiled with SLAB debugging on. If there would be code in a constructor handling SLAB_DEBUG_INITIAL then it would have to be conditional on SLAB_DEBUG otherwise it would just be dead code. But there is no such code in the kernel. I think SLUB_DEBUG_INITIAL is too problematic to make real use of, difficult to understand and there are easier ways to accomplish the same effect (i.e. add debug code before kfree). There is a related flag SLAB_CTOR_VERIFY that is frequently checked to be clear in fs inode caches. Remove the pointless checks (they would even be pointless without removeal of SLAB_DEBUG_INITIAL) from the fs constructors. This is the last slab flag that SLUB did not support. Remove the check for unimplemented flags from SLUB. Signed-off-by: Christoph Lameter <clameter@sgi.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/ocfs2')
-rw-r--r--fs/ocfs2/dlm/dlmfs.c3
-rw-r--r--fs/ocfs2/super.c3
2 files changed, 2 insertions, 4 deletions
diff --git a/fs/ocfs2/dlm/dlmfs.c b/fs/ocfs2/dlm/dlmfs.c
index de952eba29a9..d4e46d067edd 100644
--- a/fs/ocfs2/dlm/dlmfs.c
+++ b/fs/ocfs2/dlm/dlmfs.c
@@ -263,8 +263,7 @@ static void dlmfs_init_once(void *foo,
263 struct dlmfs_inode_private *ip = 263 struct dlmfs_inode_private *ip =
264 (struct dlmfs_inode_private *) foo; 264 (struct dlmfs_inode_private *) foo;
265 265
266 if ((flags & (SLAB_CTOR_VERIFY|SLAB_CTOR_CONSTRUCTOR)) == 266 if (flags & SLAB_CTOR_CONSTRUCTOR) {
267 SLAB_CTOR_CONSTRUCTOR) {
268 ip->ip_dlm = NULL; 267 ip->ip_dlm = NULL;
269 ip->ip_parent = NULL; 268 ip->ip_parent = NULL;
270 269
diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c
index f5493540d94f..7c5e3f5d6634 100644
--- a/fs/ocfs2/super.c
+++ b/fs/ocfs2/super.c
@@ -937,8 +937,7 @@ static void ocfs2_inode_init_once(void *data,
937{ 937{
938 struct ocfs2_inode_info *oi = data; 938 struct ocfs2_inode_info *oi = data;
939 939
940 if ((flags & (SLAB_CTOR_VERIFY|SLAB_CTOR_CONSTRUCTOR)) == 940 if (flags & SLAB_CTOR_CONSTRUCTOR) {
941 SLAB_CTOR_CONSTRUCTOR) {
942 oi->ip_flags = 0; 941 oi->ip_flags = 0;
943 oi->ip_open_count = 0; 942 oi->ip_open_count = 0;
944 spin_lock_init(&oi->ip_lock); 943 spin_lock_init(&oi->ip_lock);