Commit aa0aff60 authored by Chaitanya Kulkarni's avatar Chaitanya Kulkarni Committed by Christoph Hellwig
Browse files

nvmet: return uniform error for invalid ns 



For nvmet_find_namespace() error case we have inconsistent error code
mapping in the function nvmet_get_smart_log_nsid() and
nvmet_set_feat_write_protect().

There is no point in retrying for the invalid namesapce from the host
side. Set the error code to the NVME_SC_INVALID_NS | NVME_SC_DNR which
matches what we have in nvmet_execute_identify_desclist().

Signed-off-by: default avatarChaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 40244ad3

drivers/nvme/target/admin-cmd.c

+2 −2
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ static u16 nvmet_get_smart_log_nsid(struct nvmet_req *req, 
		pr_err("Could not find namespace id : %d\n",

				le32_to_cpu(req->cmd->get_log_page.nsid));

		req->error_loc = offsetof(struct nvme_rw_command, nsid);

		return NVME_SC_INVALID_NS;

		return NVME_SC_INVALID_NS | NVME_SC_DNR;

	}



	/* we don't have the right data for file backed ns */
@@ -697,7 +697,7 @@ static u16 nvmet_set_feat_write_protect(struct nvmet_req *req) 
	req->ns = nvmet_find_namespace(req->sq->ctrl, req->cmd->rw.nsid);

	if (unlikely(!req->ns)) {

		req->error_loc = offsetof(struct nvme_common_command, nsid);

		return status;

		return status = NVME_SC_INVALID_NS | NVME_SC_DNR;

	}



	mutex_lock(&subsys->lock);