Skip to contentSkip to conversation

elevator: elv_try_merge() cleanup

PATCH In review Coywolf Qi Hunt 2 participants 2 messages Dec 27, 2005 – Dec 28, 2005 Block layer

lore
Share & tools
lore

Coywolf Qi Hunt

author
#0 lore raw

PATCH 1/1 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]>

---

block/elevator.c +1 -2
index 6c3fc8a..b7b3f7e 100644
@@ -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)
 {
include/linux/elevator.h +0 -2
index a74c27e..325ee07 100644
@@ -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
#1 lore raw
Quoted 2 lines · Coywolf Qi Hunt

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.

Signature · 1 line
Jens Axboe