nvme/lightnvm: Log using the ctrl named device
Sagi Grimberg
maintainerPATCH 1/1 nvme/lightnvm: Log using the ctrl named device
Align with the rest of the nvme subsystem.
Signed-off-by Sagi Grimberg <sagi at grimberg.me>
--- drivers/nvme/host/lightnvm.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/nvme/host/lightnvm.c +6 -6
@@ -367,7 +367,7 @@ static int nvme_nvm_get_l2p_tbl(struct nvm_dev *nvmdev, u64 slba, u32 nlb, ret =nvme_submit_sync_cmd (ns->ctrl->admin_q, (struct nvme_command *)&c, entries, len);if (ret) { -dev_err (ns->ctrl->dev,"L2P table transfer failed (%d)\n" , +dev_err (ns->ctrl->device,"L2P table transfer failed (%d)\n" , ret); ret = -EIO ; goto out;
@@ -441,27 +441,27 @@ static int nvme_nvm_get_bb_tbl(struct nvm_dev *nvmdev, struct ppa_addr ppa, ret =nvme_submit_sync_cmd (ctrl->admin_q, (struct nvme_command *)&c, bb_tbl, tblsz);if (ret) { -dev_err (ctrl->dev,"get bad block table failed (%d)\n" , ret); +dev_err (ctrl->device,"get bad block table failed (%d)\n" , ret); ret = -EIO ; goto out; }if (bb_tbl->tblid[0 ] !='B' || bb_tbl->tblid[1 ] !='B' || bb_tbl->tblid[2 ] !='L' || bb_tbl->tblid[3 ] !='T' ) { -dev_err (ctrl->dev,"bbt format mismatch\n" ); +dev_err (ctrl->device,"bbt format mismatch\n" ); ret = -EINVAL ; goto out; }if (le16_to_cpu (bb_tbl->verid) !=1 ) { ret = -EINVAL ; -dev_err (ctrl->dev,"bbt version not supported\n" ); +dev_err (ctrl->device,"bbt version not supported\n" ); goto out; }if (le32_to_cpu (bb_tbl->tblks) != nr_src_blks) { ret = -EINVAL ; -dev_err (ctrl->dev,"bbt unsuspected blocks returned (%u!=%u)" , +dev_err (ctrl->device,"bbt unsuspected blocks returned (%u!=%u)" ,le32_to_cpu (bb_tbl->tblks), nr_src_blks); goto out; }
@@ -494,7 +494,7 @@ static int nvme_nvm_set_bb_tbl(struct nvm_dev *nvmdev, struct nvm_rq *rqd, ret =nvme_submit_sync_cmd (ns->ctrl->admin_q, (struct nvme_command *)&c,NULL ,0 );if (ret) -dev_err (ns->ctrl->dev,"set bad block table failed (%d)\n" , ret); +dev_err (ns->ctrl->device,"set bad block table failed (%d)\n" , ret);return ret; }
Signature · 1 line
1.9.1
PATCH 1/1 nvme/lightnvm: Log using the ctrl named device
Quoted 54 lines · Sagi Grimberg
Align with the rest of the nvme subsystem.
Signed-off-by Sagi Grimberg <sagi at grimberg.me>--- drivers/nvme/host/lightnvm.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)drivers/nvme/host/lightnvm.c +5
-5@@ -367,7 +367,7 @@ static int nvme_nvm_get_l2p_tbl(struct nvm_dev *nvmdev, u64 slba, u32 nlb, ret =nvme_submit_sync_cmd (ns->ctrl->admin_q, (struct nvme_command *)&c, entries, len);if (ret) { -dev_err (ns->ctrl->dev,"L2P table transfer failed (%d)\n" , +dev_err (ns->ctrl->device,"L2P table transfer failed (%d)\n" , ret); ret = -EIO ; goto out;@@ -441,27 +441,27 @@ static int nvme_nvm_get_bb_tbl(struct nvm_dev *nvmdev, struct ppa_addr ppa, ret =nvme_submit_sync_cmd (ctrl->admin_q, (struct nvme_command *)&c, bb_tbl, tblsz);if (ret) { -dev_err (ctrl->dev,"get bad block table failed (%d)\n" , ret); +dev_err (ctrl->device,"get bad block table failed (%d)\n" , ret); ret = -EIO ; goto out; }if (bb_tbl->tblid[0 ] !='B' || bb_tbl->tblid[1 ] !='B' || bb_tbl->tblid[2 ] !='L' || bb_tbl->tblid[3 ] !='T' ) { -dev_err (ctrl->dev,"bbt format mismatch\n" ); +dev_err (ctrl->device,"bbt format mismatch\n" ); ret = -EINVAL ; goto out; }if (le16_to_cpu (bb_tbl->verid) !=1 ) { ret = -EINVAL ; -dev_err (ctrl->dev,"bbt version not supported\n" ); +dev_err (ctrl->device,"bbt version not supported\n" ); goto out; }if (le32_to_cpu (bb_tbl->tblks) != nr_src_blks) { ret = -EINVAL ; -dev_err (ctrl->dev,"bbt unsuspected blocks returned (%u!=%u)" , +dev_err (ctrl->device,"bbt unsuspected blocks returned (%u!=%u)" ,le32_to_cpu (bb_tbl->tblks), nr_src_blks); goto out; }
drivers/nvme/host/lightnvm.c static int nvme_nvm_set_bb_tbl(struct nvm_dev *nvmdev, struct nvm_rq *rqd, · line 500
Quoted 8 lines
drivers/nvme/host/lightnvm.c +1
-1@@ -494,7 +494,7 @@ static int nvme_nvm_set_bb_tbl(struct nvm_dev *nvmdev, struct nvm_rq *rqd, ret =nvme_submit_sync_cmd (ns->ctrl->admin_q, (struct nvme_command *)&c,NULL ,0 );if (ret) -dev_err (ns->ctrl->dev,"set bad block table failed (%d)\n" , ret); +dev_err (ns->ctrl->device,"set bad block table failed (%d)\n" , ret);return ret; }
Thanks Sagi. I have a couple of patches on top of lightnvm.c that conflicts. Will it be okay with you if I carry it through my for-next branch that I send to Jens?
Sagi Grimberg
maintainerPATCH 1/1 nvme/lightnvm: Log using the ctrl named device
Quoted 4 lines
Thanks Sagi. I have a couple of patches on top of
lightnvm.cthat conflicts. Will it be okay with you if I carry it through my for-next branch that I send to Jens?
Sure, go ahead.