2004-11-12 22:16:05

by Chris Wright

Subject: [PATCH] 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.

Signed-off-by: Chris Wright <[email protected]>

===== drivers/block/as-iosched.c 1.41 vs edited =====
--- 1.41/drivers/block/as-iosched.c 2004-10-19 02:40:18 -07:00
+++ edited/drivers/block/as-iosched.c 2004-10-29 16:28:05 -07:00
@@ -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);

2004-11-12 22:20:00

by Chris Wright

Subject: [PATCH] Mark cfq_exit as an exit function

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

Signed-off-by: Chris Wright <[email protected]>

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

===== drivers/block/cfq-iosched.c 1.12 vs edited =====
--- 1.12/drivers/block/cfq-iosched.c 2004-10-28 00:40:02 -07:00
+++ edited/drivers/block/cfq-iosched.c 2004-10-29 16:35:21 -07:00
@@ -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);

2004-11-12 22:22:56

by Chris Wright

Subject: [PATCH] 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.

Signed-off-by: Chris Wright <[email protected]>

===== drivers/block/deadline-iosched.c 1.31 vs edited =====
--- 1.31/drivers/block/deadline-iosched.c 2004-10-19 02:40:18 -07:00
+++ edited/drivers/block/deadline-iosched.c 2004-10-29 15:51:12 -07:00
@@ -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);

2004-11-14 13:58:21

by Jens Axboe

Subject: Re: [PATCH] Mark as_init and as_exit as init and exit functions

On Fri, Nov 12 2004, Chris Wright wrote:
> 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.

--
Jens Axboe