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/debug.c | |
| parent | 47cd2eb0ee05d9b1f8acd4808a1c829d63e93ac1 (diff) | |
| download | linux-8e51e414a3c6d92ef2cc41720c67342a8e2c0bf7.tar.bz2 | |
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/debug.c')
| -rw-r--r-- | drivers/md/bcache/debug.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/bcache/debug.c b/drivers/md/bcache/debug.c index ba2ceee0fdbb..88e6411eab4f 100644 --- a/drivers/md/bcache/debug.c +++ b/drivers/md/bcache/debug.c @@ -199,7 +199,7 @@ void bch_data_verify(struct search *s) if (!check) return; - if (bch_bio_alloc_pages(check, GFP_NOIO)) + if (bio_alloc_pages(check, GFP_NOIO)) goto out_put; check->bi_rw = READ_SYNC; |