kern/kmem: rename constructor type

3 files changed, 9 insertions, 9 deletions

diff --git a/kern/kmem.c b/kern/kmem.c
index bba9372b..0a5562a1 100644
--- a/kern/kmem.c
+++ b/kern/kmem.c
@@ -383,7 +383,7 @@ kmem_cpu_pool_push(struct kmem_cpu_pool *cpu_pool, void *obj)
 static int
 kmem_cpu_pool_fill(struct kmem_cpu_pool *cpu_pool, struct kmem_cache *cache)
 {
-    kmem_cache_ctor_t ctor;
+    kmem_ctor_fn_t ctor;
     void *buf;
     int i;
 
@@ -535,7 +535,7 @@ kmem_cache_compute_sizes(struct kmem_cache *cache, int flags)
 
 void
 kmem_cache_init(struct kmem_cache *cache, const char *name, size_t obj_size,
-                size_t align, kmem_cache_ctor_t ctor,
+                size_t align, kmem_ctor_fn_t ctor,
                 kmem_slab_alloc_fn_t slab_alloc_fn,
                 kmem_slab_free_fn_t slab_free_fn, int flags)
 {
diff --git a/kern/kmem.h b/kern/kmem.h
index 0e49d492..86e3f20c 100644
--- a/kern/kmem.h
+++ b/kern/kmem.h
@@ -33,12 +33,12 @@ struct kmem_cache;
  *
  * The pre-constructed state of an object is supposed to include only
  * elements such as e.g. linked lists, locks, reference counters. Therefore
- * constructors are expected to 1) never fail and 2) not need any
- * user-provided data. The first constraint implies that object construction
- * never performs dynamic resource allocation, which also means there is no
- * need for destructors.
+ * constructors are expected to 1) never block, 2) never fail and 3) not
+ * need any user-provided data. As a result, object construction never
+ * performs dynamic resource allocation, which removes the need for
+ * destructors.
  */
-typedef void (*kmem_cache_ctor_t)(void *);
+typedef void (*kmem_ctor_fn_t)(void *);
 
 /*
  * Types for slab allocation/free functions.
@@ -64,7 +64,7 @@ typedef void (*kmem_slab_free_fn_t)(unsigned long, size_t);
  * (vm_kmem on the kernel map) is used for the allocation/free action.
  */
 void kmem_cache_init(struct kmem_cache *cache, const char *name,
-                     size_t obj_size, size_t align, kmem_cache_ctor_t ctor,
+                     size_t obj_size, size_t align, kmem_ctor_fn_t ctor,
                      kmem_slab_alloc_fn_t slab_alloc_fn,
                      kmem_slab_free_fn_t slab_free_fn, int flags);
 
diff --git a/kern/kmem_i.h b/kern/kmem_i.h
index 8ccbe6c7..c007bfed 100644
--- a/kern/kmem_i.h
+++ b/kern/kmem_i.h
@@ -191,7 +191,7 @@ struct kmem_cache {
     unsigned long nr_bufs;  /* Total number of buffers */
     unsigned long nr_slabs;
     unsigned long nr_free_slabs;
-    kmem_cache_ctor_t ctor;
+    kmem_ctor_fn_t ctor;
     kmem_slab_alloc_fn_t slab_alloc_fn;
     kmem_slab_free_fn_t slab_free_fn;
     char name[KMEM_NAME_SIZE];