lightnvm: pblk: remove unnecessary indirection

Call nvm_submit_io directly and remove an unnecessary indirection on the
read path.

Signed-off-by: Javier González <javier@cnexlabs.com>
Signed-off-by: Matias Bjørling <mb@lightnvm.io>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Javier González 2018-06-01 15:04:21 +02:00 committed by Jens Axboe
parent b6730dd4a9
commit e13f421ba8

View File

@ -102,16 +102,6 @@ next:
#endif #endif
} }
static int pblk_submit_read_io(struct pblk *pblk, struct nvm_rq *rqd)
{
int err;
err = pblk_submit_io(pblk, rqd);
if (err)
return NVM_IO_ERR;
return NVM_IO_OK;
}
static void pblk_read_check_seq(struct pblk *pblk, struct nvm_rq *rqd, static void pblk_read_check_seq(struct pblk *pblk, struct nvm_rq *rqd,
sector_t blba) sector_t blba)
@ -485,9 +475,9 @@ int pblk_submit_read(struct pblk *pblk, struct bio *bio)
rqd->bio = int_bio; rqd->bio = int_bio;
r_ctx->private = bio; r_ctx->private = bio;
ret = pblk_submit_read_io(pblk, rqd); if (pblk_submit_io(pblk, rqd)) {
if (ret) {
pr_err("pblk: read IO submission failed\n"); pr_err("pblk: read IO submission failed\n");
ret = NVM_IO_ERR;
if (int_bio) if (int_bio)
bio_put(int_bio); bio_put(int_bio);
goto fail_end_io; goto fail_end_io;