iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nvme: refactor nvme_validate_ns

Browse Source 
Move the logic to revalidate the block_device size or remove the
namespace from the caller into nvme_validate_ns.  This removes
the return value and thus the status code translation.  Additionally
it also catches non-permanent errors from nvme_update_ns_info using
the existing logic.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Keith Busch <kbusch@kernel.org>
Reviewed-by: Damien Le Moal <damien.lemoal@wdc.com>
This commit is contained in:
Christoph Hellwig 2020-09-28 13:59:06 +02:00
parent b2dc748a70
commit 0a05226a3a
1 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
drivers/nvme/host/core.c
View File

@ -3899,6 +3899,7 @@ static void nvme_ns_remove(struct nvme_ns *ns)
if (test_and_set_bit(NVME_NS_REMOVING, &ns->flags)) if (test_and_set_bit(NVME_NS_REMOVING, &ns->flags))
return; return;
set_capacity(ns->disk, 0);
nvme_fault_inject_fini(&ns->fault_inject); nvme_fault_inject_fini(&ns->fault_inject);
mutex_lock(&ns->ctrl->subsys->lock); mutex_lock(&ns->ctrl->subsys->lock);
@ -3936,58 +3937,54 @@ static void nvme_ns_remove_by_nsid(struct nvme_ctrl *ctrl, u32 nsid)
} }
} }
static int nvme_validate_ns(struct nvme_ns *ns, struct nvme_ns_ids *ids) static void nvme_validate_ns(struct nvme_ns *ns, struct nvme_ns_ids *ids)
{ {
struct nvme_ctrl *ctrl = ns->ctrl; struct nvme_ctrl *ctrl = ns->ctrl;
struct nvme_id_ns *id; struct nvme_id_ns *id;
int ret = 0; int ret = -ENODEV;
if (test_bit(NVME_NS_DEAD, &ns->flags)) { if (test_bit(NVME_NS_DEAD, &ns->flags))
set_capacity(ns->disk, 0); goto out;
return -ENODEV;
}
ret = nvme_identify_ns(ctrl, ns->head->ns_id, ids, &id); ret = nvme_identify_ns(ctrl, ns->head->ns_id, ids, &id);
if (ret) if (ret)
goto out; goto out;
ret = -ENODEV;
if (!nvme_ns_ids_equal(&ns->head->ids, ids)) { if (!nvme_ns_ids_equal(&ns->head->ids, ids)) {
dev_err(ctrl->device, dev_err(ctrl->device,
"identifiers changed for nsid %d\n", ns->head->ns_id); "identifiers changed for nsid %d\n", ns->head->ns_id);
ret = -ENODEV; goto out_free_id;
goto free_id;
} }
ret = nvme_update_ns_info(ns, id); ret = nvme_update_ns_info(ns, id);
free_id:
out_free_id:
kfree(id); kfree(id);
out: out:
/* /*
* Only fail the function if we got a fatal error back from the * Only remove the namespace if we got a fatal error back from the
* device, otherwise ignore the error and just move on. * device, otherwise ignore the error and just move on.
*
* TODO: we should probably schedule a delayed retry here.
*/ */
if (ret == -ENOMEM || (ret > 0 && !(ret & NVME_SC_DNR))) if (ret && ret != -ENOMEM && !(ret > 0 && !(ret & NVME_SC_DNR)))
ret = 0; nvme_ns_remove(ns);
else if (ret > 0) else
ret = blk_status_to_errno(nvme_error_status(ret)); revalidate_disk_size(ns->disk, true);
return ret;
} }
static void nvme_validate_or_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid) static void nvme_validate_or_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid)
{ {
struct nvme_ns_ids ids = { }; struct nvme_ns_ids ids = { };
struct nvme_ns *ns; struct nvme_ns *ns;
int ret;
if (nvme_identify_ns_descs(ctrl, nsid, &ids)) if (nvme_identify_ns_descs(ctrl, nsid, &ids))
return; return;
ns = nvme_find_get_ns(ctrl, nsid); ns = nvme_find_get_ns(ctrl, nsid);
if (ns) { if (ns) {
ret = nvme_validate_ns(ns, &ids); nvme_validate_ns(ns, &ids);
revalidate_disk_size(ns->disk, ret == 0);
if (ret)
nvme_ns_remove(ns);
nvme_put_ns(ns); nvme_put_ns(ns);
return; return;
} }