nvmet-fc: Update target for common definitions for LS handling

Given that both host and target now generate and receive LS's create
a single table definition for LS names. Each tranport half will have
a local version of the table.

Convert the target side transport to use the new common Create
Association LS validation routine.

Signed-off-by: James Smart <jsmart2021@gmail.com>
Reviewed-by: Hannes Reinecke <hare@suse.de>
Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/nvme/target/fc.c b/drivers/nvme/target/fc.c
index 66a60a2..5739df7 100644 (file)
--- a/drivers/nvme/target/fc.c
+++ b/drivers/nvme/target/fc.c
@@ -1442,32 +1442,8 @@ nvmet_fc_ls_disconnect(struct nvmet_fc_tgtport *tgtport,
 
        memset(acc, 0, sizeof(*acc));
 
-       if (iod->rqstdatalen < sizeof(struct fcnvme_ls_disconnect_assoc_rqst))
-               ret = VERR_DISCONN_LEN;
-       else if (rqst->desc_list_len !=
-                       fcnvme_lsdesc_len(
-                               sizeof(struct fcnvme_ls_disconnect_assoc_rqst)))
-               ret = VERR_DISCONN_RQST_LEN;
-       else if (rqst->associd.desc_tag != cpu_to_be32(FCNVME_LSDESC_ASSOC_ID))
-               ret = VERR_ASSOC_ID;
-       else if (rqst->associd.desc_len !=
-                       fcnvme_lsdesc_len(
-                               sizeof(struct fcnvme_lsdesc_assoc_id)))
-               ret = VERR_ASSOC_ID_LEN;
-       else if (rqst->discon_cmd.desc_tag !=
-                       cpu_to_be32(FCNVME_LSDESC_DISCONN_CMD))
-               ret = VERR_DISCONN_CMD;
-       else if (rqst->discon_cmd.desc_len !=
-                       fcnvme_lsdesc_len(
-                               sizeof(struct fcnvme_lsdesc_disconn_cmd)))
-               ret = VERR_DISCONN_CMD_LEN;
-       /*
-        * As the standard changed on the LS, check if old format and scope
-        * something other than Association (e.g. 0).
-        */
-       else if (rqst->discon_cmd.rsvd8[0])
-               ret = VERR_DISCONN_SCOPE;
-       else {
+       ret = nvmefc_vldt_lsreq_discon_assoc(iod->rqstdatalen, rqst);
+       if (!ret) {
                /* match an active association */
                assoc = nvmet_fc_find_target_assoc(tgtport,
                                be64_to_cpu(rqst->associd.association_id));