diff options
| author | Kent Overstreet <koverstreet@google.com> | 2012-09-06 15:35:00 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2012-09-09 10:35:39 +0200 |
| commit | 4254bba17d92d53822a56ebc2a0c1eb7e2a71155 (patch) | |
| tree | 77668d39949a0751c5e9ef8d0fb47b96392e84e5 /block/blk-core.c | |
| parent | ccc5c9ca6aac08218b1ba52afd07a1a9864c8c5d (diff) | |
| download | blackbird-op-linux-4254bba17d92d53822a56ebc2a0c1eb7e2a71155.tar.gz blackbird-op-linux-4254bba17d92d53822a56ebc2a0c1eb7e2a71155.zip | |
block: Kill bi_destructor
Now that we've got generic code for freeing bios allocated from bio
pools, this isn't needed anymore.
This patch also makes bio_free() static, since without bi_destructor
there should be no need for it to be called anywhere else.
bio_free() is now only called from bio_put, so we can refactor those a
bit - move some code from bio_put() to bio_free() and kill the redundant
bio->bi_next = NULL.
v5: Switch to BIO_KMALLOC_POOL ((void *)~0), per Boaz
v6: BIO_KMALLOC_POOL now NULL, drop bio_free's EXPORT_SYMBOL
v7: No #define BIO_KMALLOC_POOL anymore
Signed-off-by: Kent Overstreet <koverstreet@google.com>
CC: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/blk-core.c')
| -rw-r--r-- | block/blk-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index 95c493511be7..b776cc90a4e7 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -2807,7 +2807,7 @@ int blk_rq_prep_clone(struct request *rq, struct request *rq_src, free_and_out: if (bio) - bio_free(bio, bs); + bio_put(bio); blk_rq_unprep_clone(rq); return -ENOMEM; |
