diff options
Diffstat (limited to 'block')
-rw-r--r-- | block/cfq-iosched.c | 2 | ||||
-rw-r--r-- | block/ll_rw_blk.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c index c988aa75dd55..85f1d87e86d4 100644 --- a/block/cfq-iosched.c +++ b/block/cfq-iosched.c | |||
@@ -1041,7 +1041,7 @@ static void cfq_put_queue(struct cfq_queue *cfqq) | |||
1041 | kmem_cache_free(cfq_pool, cfqq); | 1041 | kmem_cache_free(cfq_pool, cfqq); |
1042 | } | 1042 | } |
1043 | 1043 | ||
1044 | static inline struct cfq_queue * | 1044 | static struct cfq_queue * |
1045 | __cfq_find_cfq_hash(struct cfq_data *cfqd, unsigned int key, unsigned int prio, | 1045 | __cfq_find_cfq_hash(struct cfq_data *cfqd, unsigned int key, unsigned int prio, |
1046 | const int hashval) | 1046 | const int hashval) |
1047 | { | 1047 | { |
diff --git a/block/ll_rw_blk.c b/block/ll_rw_blk.c index 508548b834f1..4b7b4461e8d6 100644 --- a/block/ll_rw_blk.c +++ b/block/ll_rw_blk.c | |||
@@ -277,7 +277,7 @@ void blk_queue_make_request(request_queue_t * q, make_request_fn * mfn) | |||
277 | 277 | ||
278 | EXPORT_SYMBOL(blk_queue_make_request); | 278 | EXPORT_SYMBOL(blk_queue_make_request); |
279 | 279 | ||
280 | static inline void rq_init(request_queue_t *q, struct request *rq) | 280 | static void rq_init(request_queue_t *q, struct request *rq) |
281 | { | 281 | { |
282 | INIT_LIST_HEAD(&rq->queuelist); | 282 | INIT_LIST_HEAD(&rq->queuelist); |
283 | INIT_LIST_HEAD(&rq->donelist); | 283 | INIT_LIST_HEAD(&rq->donelist); |
@@ -589,8 +589,8 @@ static int flush_dry_bio_endio(struct bio *bio, unsigned int bytes, int error) | |||
589 | return 0; | 589 | return 0; |
590 | } | 590 | } |
591 | 591 | ||
592 | static inline int ordered_bio_endio(struct request *rq, struct bio *bio, | 592 | static int ordered_bio_endio(struct request *rq, struct bio *bio, |
593 | unsigned int nbytes, int error) | 593 | unsigned int nbytes, int error) |
594 | { | 594 | { |
595 | request_queue_t *q = rq->q; | 595 | request_queue_t *q = rq->q; |
596 | bio_end_io_t *endio; | 596 | bio_end_io_t *endio; |
@@ -2002,7 +2002,7 @@ static inline void blk_free_request(request_queue_t *q, struct request *rq) | |||
2002 | mempool_free(rq, q->rq.rq_pool); | 2002 | mempool_free(rq, q->rq.rq_pool); |
2003 | } | 2003 | } |
2004 | 2004 | ||
2005 | static inline struct request * | 2005 | static struct request * |
2006 | blk_alloc_request(request_queue_t *q, int rw, int priv, gfp_t gfp_mask) | 2006 | blk_alloc_request(request_queue_t *q, int rw, int priv, gfp_t gfp_mask) |
2007 | { | 2007 | { |
2008 | struct request *rq = mempool_alloc(q->rq.rq_pool, gfp_mask); | 2008 | struct request *rq = mempool_alloc(q->rq.rq_pool, gfp_mask); |