* [PATCH] nvme/lightnvm: Log using the ctrl named device
@ 2016-05-01 3:25 Sagi Grimberg
2016-05-02 8:06 ` Matias Bjørling
0 siblings, 1 reply; 3+ messages in thread
From: Sagi Grimberg @ 2016-05-01 3:25 UTC (permalink / raw)
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(-)
diff --git a/drivers/nvme/host/lightnvm.c b/drivers/nvme/host/lightnvm.c
index 9461dd639acd..a03a3e8febdf 100644
--- a/drivers/nvme/host/lightnvm.c
+++ b/drivers/nvme/host/lightnvm.c
@@ -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;
}
--
1.9.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH] nvme/lightnvm: Log using the ctrl named device
2016-05-01 3:25 [PATCH] nvme/lightnvm: Log using the ctrl named device Sagi Grimberg
@ 2016-05-02 8:06 ` Matias Bjørling
2016-05-02 9:30 ` Sagi Grimberg
0 siblings, 1 reply; 3+ messages in thread
From: Matias Bjørling @ 2016-05-02 8:06 UTC (permalink / raw)
On 05/01/2016 05:25 AM, Sagi Grimberg wrote:
> 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(-)
>
> diff --git a/drivers/nvme/host/lightnvm.c b/drivers/nvme/host/lightnvm.c
> index 9461dd639acd..a03a3e8febdf 100644
> --- a/drivers/nvme/host/lightnvm.c
> +++ b/drivers/nvme/host/lightnvm.c
> @@ -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;
> }
>
>
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?
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH] nvme/lightnvm: Log using the ctrl named device
2016-05-02 8:06 ` Matias Bjørling
@ 2016-05-02 9:30 ` Sagi Grimberg
0 siblings, 0 replies; 3+ messages in thread
From: Sagi Grimberg @ 2016-05-02 9:30 UTC (permalink / raw)
> 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?
Sure, go ahead.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-05-02 9:30 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-05-01 3:25 [PATCH] nvme/lightnvm: Log using the ctrl named device Sagi Grimberg
2016-05-02 8:06 ` Matias Bjørling
2016-05-02 9:30 ` Sagi Grimberg
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox