diff options
author | Javier González <javier@cnexlabs.com> | 2017-10-13 08:46:24 -0400 |
---|---|---|
committer | Jens Axboe <axboe@kernel.dk> | 2017-10-13 10:34:57 -0400 |
commit | 0f9248cf1e22333b2a0458540aafb1ad3b2b3337 (patch) | |
tree | d55104aad57bc9ac37717f4237c12a99c6095ba8 /drivers/lightnvm | |
parent | 7bd4d370db6090004a06deb526f0f01fa99a3f9f (diff) |
lightnvm: pblk: remove redundant check on read path
A partial read I/O in pblk is an I/O where some sectors reside in the
write buffer in main memory and some are persisted on the device. Such
an I/O must at least contain 2 lbas, therefore checking for the case
where a single lba is mapped is not necessary.
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')
-rw-r--r-- | drivers/lightnvm/pblk-read.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/lightnvm/pblk-read.c b/drivers/lightnvm/pblk-read.c index 402f8eff6a2e..71c58503f1a4 100644 --- a/drivers/lightnvm/pblk-read.c +++ b/drivers/lightnvm/pblk-read.c | |||
@@ -235,7 +235,7 @@ static int pblk_fill_partial_read_bio(struct pblk *pblk, struct nvm_rq *rqd, | |||
235 | rqd->end_io = pblk_end_io_sync; | 235 | rqd->end_io = pblk_end_io_sync; |
236 | rqd->private = &wait; | 236 | rqd->private = &wait; |
237 | 237 | ||
238 | if (unlikely(nr_secs > 1 && nr_holes == 1)) { | 238 | if (unlikely(nr_holes == 1)) { |
239 | ppa_ptr = rqd->ppa_list; | 239 | ppa_ptr = rqd->ppa_list; |
240 | dma_ppa_list = rqd->dma_ppa_list; | 240 | dma_ppa_list = rqd->dma_ppa_list; |
241 | rqd->ppa_addr = rqd->ppa_list[0]; | 241 | rqd->ppa_addr = rqd->ppa_list[0]; |
@@ -260,7 +260,7 @@ static int pblk_fill_partial_read_bio(struct pblk *pblk, struct nvm_rq *rqd, | |||
260 | #endif | 260 | #endif |
261 | } | 261 | } |
262 | 262 | ||
263 | if (unlikely(nr_secs > 1 && nr_holes == 1)) { | 263 | if (unlikely(nr_holes == 1)) { |
264 | struct ppa_addr ppa; | 264 | struct ppa_addr ppa; |
265 | 265 | ||
266 | ppa = rqd->ppa_addr; | 266 | ppa = rqd->ppa_addr; |