projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'lts/linux-4.4.y' into linux-linaro-lsk-v4.4
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
lightnvm
/
gennvm.c
diff --git
a/drivers/lightnvm/gennvm.c
b/drivers/lightnvm/gennvm.c
index a54b339951a3e695bfa68e96fb6eaf2e3e451c62..2a96ff6923f02c331190581da6c3be8b07797566 100644
(file)
--- a/
drivers/lightnvm/gennvm.c
+++ b/
drivers/lightnvm/gennvm.c
@@
-89,6
+89,7
@@
static int gennvm_block_bb(struct ppa_addr ppa, int nr_blocks, u8 *blks,
list_move_tail(&blk->list, &lun->bb_list);
lun->vlun.nr_bad_blocks++;
list_move_tail(&blk->list, &lun->bb_list);
lun->vlun.nr_bad_blocks++;
+ lun->vlun.nr_free_blocks--;
}
return 0;
}
return 0;
@@
-345,7
+346,7
@@
static void gennvm_generic_to_addr_mode(struct nvm_dev *dev, struct nvm_rq *rqd)
static int gennvm_submit_io(struct nvm_dev *dev, struct nvm_rq *rqd)
{
if (!dev->ops->submit_io)
static int gennvm_submit_io(struct nvm_dev *dev, struct nvm_rq *rqd)
{
if (!dev->ops->submit_io)
- return
0
;
+ return
-ENODEV
;
/* Convert address space */
gennvm_generic_to_addr_mode(dev, rqd);
/* Convert address space */
gennvm_generic_to_addr_mode(dev, rqd);