diff options
| author | Christoph Lameter <clameter@sgi.com> | 2007-05-06 17:50:16 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-07 15:12:57 -0400 |
| commit | 50953fe9e00ebbeffa032a565ab2f08312d51a87 (patch) | |
| tree | 9f95f56f0b51600959a76cd88ce17f6e9c7a98a3 | |
| parent | 4b1d89290b62bb2db476c94c82cf7442aab440c8 (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>
55 files changed, 55 insertions, 136 deletions
diff --git a/arch/powerpc/platforms/cell/spufs/inode.c b/arch/powerpc/platforms/cell/spufs/inode.c index 13e4f70ec8c0..a93f328a7317 100644 --- a/arch/powerpc/platforms/cell/spufs/inode.c +++ b/arch/powerpc/platforms/cell/spufs/inode.c | |||
| @@ -71,8 +71,7 @@ spufs_init_once(void *p, struct kmem_cache * cachep, unsigned long flags) | |||
| 71 | { | 71 | { |
| 72 | struct spufs_inode_info *ei = p; | 72 | struct spufs_inode_info *ei = p; |
| 73 | 73 | ||
| 74 | if ((flags & (SLAB_CTOR_VERIFY|SLAB_CTOR_CONSTRUCTOR)) == | 74 | if (flags & SLAB_CTOR_CONSTRUCTOR) { |
| 75 | SLAB_CTOR_CONSTRUCTOR) { | ||
| 76 | inode_init_once(&ei->vfs_inode); | 75 | inode_init_once(&ei->vfs_inode); |
| 77 | } | 76 | } |
| 78 | } | 77 | } |
diff --git a/drivers/mtd/ubi/eba.c b/drivers/mtd/ubi/eba.c index d847ee1da3d9..3dba5733ed1f 100644 --- a/drivers/mtd/ubi/eba.c +++ b/drivers/mtd/ubi/eba.c | |||
| @@ -940,8 +940,7 @@ static void ltree_entry_ctor(void *obj, struct kmem_cache *cache, | |||
| 940 | { | 940 | { |
| 941 | struct ltree_entry *le = obj; | 941 | struct ltree_entry *le = obj; |
| 942 | 942 | ||
| 943 | if ((flags & (SLAB_CTOR_VERIFY | SLAB_CTOR_CONSTRUCTOR)) != | 943 | if (flags & SLAB_CTOR_CONSTRUCTOR) |
| 944 | SLAB_CTOR_CONSTRUCTOR) | ||
| 945 | return; | 944 | return; |
| 946 | 945 | ||
| 947 | le->users = 0; | 946 | le->users = 0; |
diff --git a/fs/adfs/super.c b/fs/adfs/super.c index 2e5f2c8371ee..30c296508497 100644 --- a/fs/adfs/super.c +++ b/fs/adfs/super.c | |||
| @@ -232,8 +232,7 @@ static void init_once(void * foo, struct kmem_cache * cachep, unsigned long flag | |||
| 232 | { | 232 | { |
| 233 | struct adfs_inode_info *ei = (struct adfs_inode_info *) foo; | 233 | struct adfs_inode_info *ei = (struct adfs_inode_info *) foo; |
| 234 | 234 | ||
| 235 | if ((flags & (SLAB_CTOR_VERIFY|SLAB_CTOR_CONSTRUCTOR)) == | 235 | if (flags & SLAB_CTOR_CONSTRUCTOR) |
| 236 | SLAB_CTOR_CONSTRUCTOR) | ||
| 237 | inode_init_once(&ei->vfs_inode); | 236 | inode_init_once(&ei->vfs_inode); |
| 238 | } | 237 | } |
| 239 | 238 | ||
diff --git a/fs/affs/super.c b/fs/affs/super.c index c3986a1911b0..beff7d21e6e2 100644 --- a/fs/affs/super.c +++ b/fs/affs/super.c | |||
| @@ -87,8 +87,7 @@ static void init_once(void * foo, struct kmem_cache * cachep, unsigned long flag | |||
| 87 | { | 87 | { |
| 88 | struct affs_inode_info *ei = (struct affs_inode_info *) foo; | 88 | struct affs_inode_info *ei = (struct affs_inode_info *) foo; |
| 89 | 89 | ||
| 90 | if ((flags & (SLAB_CTOR_VERIFY|SLAB_CTOR_CONSTRUCTOR)) == | 90 | if (flags & SLAB_CTOR_CONSTRUCTOR) { |
| 91 | SLAB_CTOR_CONSTRUCTOR) { | ||
| 92 | init_MUTEX(&ei->i_link_lock); | 91 | init_MUTEX(&ei->i_link_lock); |
| 93 | init_MUTEX(&ei->i_ext_lock); | 92 | init_MUTEX(&ei->i_ext_lock); |
| 94 | inode_init_once(&ei->vfs_inode); | 93 | inode_init_once(&ei->vfs_inode); |
diff --git a/fs/afs/super.c b/fs/afs/super.c index 41173f81ac47..7030d76155fc 100644 --- a/fs/afs/super.c +++ b/fs/afs/super.c | |||
| @@ -453,8 +453,7 @@ static void afs_i_init_once(void *_vnode, struct kmem_cache *cachep, | |||
| 453 | { | 453 | { |
| 454 | struct afs_vnode *vnode = _vnode; | 454 | struct afs_vnode *vnode = _vnode; |
| 455 | 455 | ||
| 456 | if ((flags & (SLAB_CTOR_VERIFY|SLAB_CTOR_CONSTRUCTOR)) == | 456 | if (flags & SLAB_CTOR_CONSTRUCTOR) { |
| 457 | SLAB_CTOR_CONSTRUCTOR) { | ||
| 458 | memset(vnode, 0, sizeof(*vnode)); | 457 | memset(vnode, 0, sizeof(*vnode)); |
| 459 | inode_init_once(&vnode->vfs_inode); | 458 | inode_init_once(&vnode->vfs_inode); |
| 460 | init_waitqueue_head(&vnode->update_waitq); | 459 | init_waitqueue_head(&vnode->update_waitq); |
diff --git a/fs/befs/linuxvfs.c b/fs/befs/linuxvfs.c index cc6cc8ed2e39..fe96108a788d 100644 --- a/fs/befs/linuxvfs.c +++ b/fs/befs/linuxvfs.c | |||
| @@ -293,8 +293,7 @@ static void init_once(void * foo, struct kmem_cache * cachep, unsigned long flag | |||
| 293 | { | 293 | { |
| 294 | struct befs_inode_info *bi = (struct befs_inode_info *) foo; | 294 | struct befs_inode_info *bi = (struct befs_inode_info *) foo; |
| 295 | 295 | ||
| 296 | if ((flags & (SLAB_CTOR_VERIFY|SLAB_CTOR_CONSTRUCTOR)) == | 296 | if (flags & SLAB_CTOR_CONSTRUCTOR) { |
| 297 | SLAB_CTOR_CONSTRUCTOR) { | ||
| 298 | inode_init_once(&bi->vfs_inode); | 297 | inode_init_once(&bi->vfs_inode); |
| 299 | } | 298 | } |
| 300 | } | 299 | } |
diff --git a/fs/bfs/inode.c b/fs/bfs/inode.c index 93d6219243ad..edc08d89aabc 100644 --- a/fs/bfs/inode.c +++ b/fs/bfs/inode.c | |||
| @@ -248,8 +248,7 @@ static void init_once(void * foo, struct kmem_cache * cachep, unsigned long flag | |||
| 248 | { | 248 | { |
| 249 | struct bfs_inode_info *bi = foo; | 249 | struct bfs_inode_info *bi = foo; |
| 250 | 250 | ||
| 251 | if ((flags & (SLAB_CTOR_VERIFY|SLAB_CTOR_CONSTRUCTOR)) == | 251 | if (flags & SLAB_CTOR_CONSTRUCTOR) |
| 252 | SLAB_CTOR_CONSTRUCTOR) | ||
| 253 | inode_init_once(&bi->vfs_inode); | 252 | inode_init_once(&bi->vfs_inode); |
| 254 | } | 253 | } |
| 255 | 254 | ||
diff --git a/fs/block_dev.c b/fs/block_dev.c index 6fe49b9349ea..f02b7bdd9864 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c | |||
| @@ -457,9 +457,7 @@ static void init_once(void * foo, struct kmem_cache * cachep, unsigned long flag | |||
| 457 | struct bdev_inode *ei = (struct bdev_inode *) foo; | 457 | struct bdev_inode *ei = (struct bdev_inode *) foo; |
| 458 | struct block_device *bdev = &ei->bdev; | 458 | struct block_device *bdev = &ei->bdev; |
| 459 | 459 | ||
