|
@@ -1901,15 +1901,7 @@ static void check_poison_obj(struct kmem_cache *cachep, void *objp)
|
|
#endif
|
|
#endif
|
|
|
|
|
|
#if DEBUG
|
|
#if DEBUG
|
|
-/**
|
|
|
|
- * slab_destroy_objs - destroy a slab and its objects
|
|
|
|
- * @cachep: cache pointer being destroyed
|
|
|
|
- * @slabp: slab pointer being destroyed
|
|
|
|
- *
|
|
|
|
- * Call the registered destructor for each object in a slab that is being
|
|
|
|
- * destroyed.
|
|
|
|
- */
|
|
|
|
-static void slab_destroy_objs(struct kmem_cache *cachep, struct slab *slabp)
|
|
|
|
|
|
+static void slab_destroy_debugcheck(struct kmem_cache *cachep, struct slab *slabp)
|
|
{
|
|
{
|
|
int i;
|
|
int i;
|
|
for (i = 0; i < cachep->num; i++) {
|
|
for (i = 0; i < cachep->num; i++) {
|
|
@@ -1938,7 +1930,7 @@ static void slab_destroy_objs(struct kmem_cache *cachep, struct slab *slabp)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
#else
|
|
#else
|
|
-static void slab_destroy_objs(struct kmem_cache *cachep, struct slab *slabp)
|
|
|
|
|
|
+static void slab_destroy_debugcheck(struct kmem_cache *cachep, struct slab *slabp)
|
|
{
|
|
{
|
|
}
|
|
}
|
|
#endif
|
|
#endif
|
|
@@ -1956,7 +1948,7 @@ static void slab_destroy(struct kmem_cache *cachep, struct slab *slabp)
|
|
{
|
|
{
|
|
void *addr = slabp->s_mem - slabp->colouroff;
|
|
void *addr = slabp->s_mem - slabp->colouroff;
|
|
|
|
|
|
- slab_destroy_objs(cachep, slabp);
|
|
|
|
|
|
+ slab_destroy_debugcheck(cachep, slabp);
|
|
if (unlikely(cachep->flags & SLAB_DESTROY_BY_RCU)) {
|
|
if (unlikely(cachep->flags & SLAB_DESTROY_BY_RCU)) {
|
|
struct slab_rcu *slab_rcu;
|
|
struct slab_rcu *slab_rcu;
|
|
|
|
|