diff options
author | Kent Overstreet <koverstreet@google.com> | 2013-06-06 18:15:57 -0700 |
---|---|---|
committer | Kent Overstreet <kmo@daterainc.com> | 2013-07-01 14:43:53 -0700 |
commit | 8e51e414a3c6d92ef2cc41720c67342a8e2c0bf7 (patch) | |
tree | 3155648dff173925a882ee182cd188e246ce9498 /drivers/md/bcache/util.c | |
parent | 47cd2eb0ee05d9b1f8acd4808a1c829d63e93ac1 (diff) | |
download | op-kernel-dev-8e51e414a3c6d92ef2cc41720c67342a8e2c0bf7.zip op-kernel-dev-8e51e414a3c6d92ef2cc41720c67342a8e2c0bf7.tar.gz |
bcache: Use standard utility code
Some of bcache's utility code has made it into the rest of the kernel,
so drop the bcache versions.
Bcache used to have a workaround for allocating from a bio set under
generic_make_request() (if you allocated more than once, the bios you
already allocated would get stuck on current->bio_list when you
submitted, and you'd risk deadlock) - bcache would mask out __GFP_WAIT
when allocating bios under generic_make_request() so that allocation
could fail and it could retry from workqueue. But bio_alloc_bioset() has
a workaround now, so we can drop this hack and the associated error
handling.
Signed-off-by: Kent Overstreet <koverstreet@google.com>
Diffstat (limited to 'drivers/md/bcache/util.c')
-rw-r--r-- | drivers/md/bcache/util.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/drivers/md/bcache/util.c b/drivers/md/bcache/util.c index da3a99e..98eb811 100644 --- a/drivers/md/bcache/util.c +++ b/drivers/md/bcache/util.c @@ -228,23 +228,6 @@ start: bv->bv_len = min_t(size_t, PAGE_SIZE - bv->bv_offset, } } -int bch_bio_alloc_pages(struct bio *bio, gfp_t gfp) -{ - int i; - struct bio_vec *bv; - - bio_for_each_segment(bv, bio, i) { - bv->bv_page = alloc_page(gfp); - if (!bv->bv_page) { - while (bv-- != bio->bi_io_vec + bio->bi_idx) - __free_page(bv->bv_page); - return -ENOMEM; - } - } - - return 0; -} - /* * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group (Any * use permitted, subject to terms of PostgreSQL license; see.) |