summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJens Axboe <axboe@suse.de>2006-07-18 22:24:11 +0200
committerJens Axboe <axboe@nelson.home.kernel.dk>2006-09-30 20:29:38 +0200
commit1ea25ecb7256978947c258f08a30c878eebe9edb (patch)
treed0dd75162f20afdf97a086bb22604d2aeb9c263e
parent4050cf1674c632c73801a561689543d4887df2ef (diff)
downloadop-kernel-dev-1ea25ecb7256978947c258f08a30c878eebe9edb.zip
op-kernel-dev-1ea25ecb7256978947c258f08a30c878eebe9edb.tar.gz
[PATCH] Audit block layer inlines
Kill a few inlines that bring in too much code to more than one location Shrinks kernel text by about 300 bytes on 32-bit x86. Signed-off-by: Jens Axboe <axboe@suse.de>
-rw-r--r--block/cfq-iosched.c2
-rw-r--r--block/ll_rw_blk.c8
2 files changed, 5 insertions, 5 deletions
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index c988aa7..85f1d87 100644
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -1041,7 +1041,7 @@ static void cfq_put_queue(struct cfq_queue *cfqq)
kmem_cache_free(cfq_pool, cfqq);
}
-static inline struct cfq_queue *
+static struct cfq_queue *
__cfq_find_cfq_hash(struct cfq_data *cfqd, unsigned int key, unsigned int prio,
const int hashval)
{
diff --git a/block/ll_rw_blk.c b/block/ll_rw_blk.c
index 508548b..4b7b446 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)
EXPORT_SYMBOL(blk_queue_make_request);
-static inline void rq_init(request_queue_t *q, struct request *rq)
+static void rq_init(request_queue_t *q, struct request *rq)
{
INIT_LIST_HEAD(&rq->queuelist);
INIT_LIST_HEAD(&rq->donelist);
@@ -589,8 +589,8 @@ static int flush_dry_bio_endio(struct bio *bio, unsigned int bytes, int error)
return 0;
}
-static inline int ordered_bio_endio(struct request *rq, struct bio *bio,
- unsigned int nbytes, int error)
+static int ordered_bio_endio(struct request *rq, struct bio *bio,
+ unsigned int nbytes, int error)
{
request_queue_t *q = rq->q;
bio_end_io_t *endio;
@@ -2002,7 +2002,7 @@ static inline void blk_free_request(request_queue_t *q, struct request *rq)
mempool_free(rq, q->rq.rq_pool);
}
-static inline struct request *
+static struct request *
blk_alloc_request(request_queue_t *q, int rw, int priv, gfp_t gfp_mask)
{
struct request *rq = mempool_alloc(q->rq.rq_pool, gfp_mask);
OpenPOWER on IntegriCloud