diff options
| author | Javier González <javier@cnexlabs.com> | 2017-10-13 08:46:10 -0400 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2017-10-13 10:34:57 -0400 |
| commit | 2942f50fa389a62865572452dce6214a8aed69dc (patch) | |
| tree | aa2aad3383d32c0eb5b115d05469b406f5c4db95 /drivers/lightnvm/pblk-core.c | |
| parent | e72ec1d31bcb6dffe325418c6d96f2fcab7c2654 (diff) | |
lightnvm: pblk: remove checks on mempool alloc.
As part of the mempool audit on pblk, remove unnecessary mempool
allocation checks on mempools.
Reported-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Javier González <javier@cnexlabs.com>
Signed-off-by: Matias Bjørling <m@bjorling.me>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/lightnvm/pblk-core.c')
| -rw-r--r-- | drivers/lightnvm/pblk-core.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/lightnvm/pblk-core.c b/drivers/lightnvm/pblk-core.c index 215aadb84c6e..0da58869006b 100644 --- a/drivers/lightnvm/pblk-core.c +++ b/drivers/lightnvm/pblk-core.c | |||
| @@ -206,8 +206,6 @@ int pblk_bio_add_pages(struct pblk *pblk, struct bio *bio, gfp_t flags, | |||
| 206 | 206 | ||
| 207 | for (i = 0; i < nr_pages; i++) { | 207 | for (i = 0; i < nr_pages; i++) { |
| 208 | page = mempool_alloc(pblk->page_bio_pool, flags); | 208 | page = mempool_alloc(pblk->page_bio_pool, flags); |
| 209 | if (!page) | ||
| 210 | goto err; | ||
| 211 | 209 | ||
| 212 | ret = bio_add_pc_page(q, bio, page, PBLK_EXPOSED_PAGE_SIZE, 0); | 210 | ret = bio_add_pc_page(q, bio, page, PBLK_EXPOSED_PAGE_SIZE, 0); |
| 213 | if (ret != PBLK_EXPOSED_PAGE_SIZE) { | 211 | if (ret != PBLK_EXPOSED_PAGE_SIZE) { |
| @@ -1653,8 +1651,6 @@ void pblk_gen_run_ws(struct pblk *pblk, struct pblk_line *line, void *priv, | |||
| 1653 | struct pblk_line_ws *line_ws; | 1651 | struct pblk_line_ws *line_ws; |
| 1654 | 1652 | ||
| 1655 | line_ws = mempool_alloc(pblk->gen_ws_pool, gfp_mask); | 1653 | line_ws = mempool_alloc(pblk->gen_ws_pool, gfp_mask); |
| 1656 | if (!line_ws) | ||
| 1657 | return; | ||
| 1658 | 1654 | ||
| 1659 | line_ws->pblk = pblk; | 1655 | line_ws->pblk = pblk; |
| 1660 | line_ws->line = line; | 1656 | line_ws->line = line; |
