Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 769db45b authored by Coywolf Qi Hunt's avatar Coywolf Qi Hunt Committed by Jens Axboe
Browse files

make elv_try_merge() static, kill the dead declaration of 



elv_try_last_merge().

Signed-off-by: default avatarCoywolf Qi Hunt <qiyong@fc-cn.com>
Signed-off-by: default avatarJens Axboe <axboe@suse.de>
parent 1abee6d2

block/elevator.c

+1 −2
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ inline int elv_rq_merge_ok(struct request *rq, struct bio *bio) 
}

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 *__rq, struct bio *bio) 


	return ret;

}

EXPORT_SYMBOL(elv_try_merge);



static struct elevator_type *elevator_find(const char *name)

{

include/linux/elevator.h

+0 −2
Original line number Diff line number Diff line
@@ -114,8 +114,6 @@ extern ssize_t elv_iosched_store(request_queue_t *, const char *, size_t); 
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