Skip to contentSkip to conversation

Mark as_init and as_exit as init and exit functions

PATCH In review Chris Wright 2 participants 4 messages Nov 12, 2004 – Nov 14, 2004 Block layer

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Mark as_init and as_exit as init and exit functions

Mark as_init and as_exit as init and exit functions, and make them static.

===== drivers/block/as-iosched.c 1.41 vs edited =====

drivers/block/as-iosched.c +2 -2
@@ -2096,7 +2096,7 @@ static struct elevator_type iosched_as =
 	.elevator_owner = THIS_MODULE,
 };
 
-int as_init(void)
+static int __init as_init(void)
 {
 	int ret;
 
@@ -2120,7 +2120,7 @@ int as_init(void)
 	return ret;
 }
 
-void as_exit(void)
+static void __exit as_exit(void)
 {
 	kmem_cache_destroy(arq_pool);
 	elv_unregister(&iosched_as);
#1 lore raw

PATCH 1/1 Mark cfq_exit as an exit function

Mark cfq_exit function as and exit function, and make it static.

 cfq-iosched.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

===== drivers/block/cfq-iosched.c 1.12 vs edited =====

drivers/block/cfq-iosched.c +1 -1
@@ -1920,7 +1920,7 @@ int cfq_init(void)
 	return ret;
 }
 
-void cfq_exit(void)
+static void __exit cfq_exit(void)
 {
 	cfq_slab_kill();
 	elv_unregister(&iosched_cfq);
#2 lore raw

PATCH 1/1 Mark deadline_init and deadline_exit as init and exit functions

Mark deadline_init and deadline_exit as init and exit functions, and make them static.

===== drivers/block/deadline-iosched.c 1.31 vs edited =====

drivers/block/deadline-iosched.c +2 -2
@@ -936,7 +936,7 @@ static struct elevator_type iosched_dead
 	.elevator_owner = THIS_MODULE,
 };
 
-int deadline_init(void)
+static int __init deadline_init(void)
 {
 	int ret;
 
@@ -953,7 +953,7 @@ int deadline_init(void)
 	return ret;
 }
 
-void deadline_exit(void)
+static void __exit deadline_exit(void)
 {
 	kmem_cache_destroy(drq_pool);
 	elv_unregister(&iosched_deadline);
#3 lore raw
In reply to Chris Wright
Quoted 1 line · Chris Wright

Mark as_init and as_exit as init and exit functions, and make them static.

Thanks (for all 3). This is an oversight from the recent modularization of the io schedulers.

Signature · 1 line
Jens Axboe