2005-12-27 03:38:38

by Qi Yong

Subject: [patch] elevator: elv_try_merge() cleanup

Cleanup: make elv_try_merge() static, kill the dead declaration of elv_try_last_merge().

Signed-off-by: Coywolf Qi Hunt <[email protected]>
---

diff --git a/block/elevator.c b/block/elevator.c
index 6c3fc8a..b7b3f7e 100644
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -64,7 +64,7 @@ inline int elv_rq_merge_ok(struct reques
}
EXPORT_SYMBOL(elv_rq_merge_ok);

-inline int elv_try_merge(struct request *__rq, struct bio *bio)
+static inline int elv_try_merge(struct request *__rq, struct bio *bio)
{
int ret = ELEVATOR_NO_MERGE;

@@ -80,7 +80,6 @@ inline int elv_try_merge(struct request

return ret;
}
-EXPORT_SYMBOL(elv_try_merge);

static struct elevator_type *elevator_find(const char *name)
{
diff --git a/include/linux/elevator.h b/include/linux/elevator.h
index a74c27e..325ee07 100644
--- a/include/linux/elevator.h
+++ b/include/linux/elevator.h
@@ -114,8 +114,6 @@ extern ssize_t elv_iosched_store(request
extern int elevator_init(request_queue_t *, char *);
extern void elevator_exit(elevator_t *);
extern int elv_rq_merge_ok(struct request *, struct bio *);
-extern int elv_try_merge(struct request *, struct bio *);
-extern int elv_try_last_merge(request_queue_t *, struct bio *);

/*
* Return values from elevator merger

2005-12-28 09:25:45

by Jens Axboe

Subject: Re: [patch] elevator: elv_try_merge() cleanup

On Tue, Dec 27 2005, Coywolf Qi Hunt wrote:
> Cleanup: make elv_try_merge() static, kill the dead declaration of
> elv_try_last_merge().

Looks good, it's an artifact of the redone merging stuff that Tejun did
(it used to be called by io schedulers). Applied.

--
Jens Axboe