nvmet: introduce flags member in nvmet_fabrics_ops

Replace has_keyed_sgls and metadata_support booleans with a flags member
that will be used for adding more features in the future.

Signed-off-by: Max Gurtovoy <maxg@mellanox.com>
Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com>
Reviewed-by: Israel Rukshin <israelr@mellanox.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>

diff --git a/drivers/nvme/target/admin-cmd.c b/drivers/nvme/target/admin-cmd.c
index 1db8c049866885807b4f8e29a9f2725385f43986..95bb3bc4e3350d5ce50c3e191427a0cef145dee5 100644 (file)
--- a/drivers/nvme/target/admin-cmd.c
+++ b/drivers/nvme/target/admin-cmd.c
@@ -427,7 +427,7 @@ static void nvmet_execute_identify_ctrl(struct nvmet_req *req)
        id->awupf = 0;
 
        id->sgls = cpu_to_le32(1 << 0); /* we always support SGLs */
-       if (ctrl->ops->has_keyed_sgls)
+       if (ctrl->ops->flags & NVMF_KEYED_SGLS)
                id->sgls |= cpu_to_le32(1 << 2);
        if (req->port->inline_data_size)
                id->sgls |= cpu_to_le32(1 << 20);

diff --git a/drivers/nvme/target/core.c b/drivers/nvme/target/core.c
index 6816507fba58a65e2d10789e0c5dc592d5b24c82..9cdc39c8b7295a165aafab10480af51ff70030de 100644 (file)
--- a/drivers/nvme/target/core.c
+++ b/drivers/nvme/target/core.c
@@ -336,7 +336,7 @@ int nvmet_enable_port(struct nvmet_port *port)
         * If the user requested PI support and the transport isn't pi capable,
         * don't enable the port.
         */
-       if (port->pi_enable && !ops->metadata_support) {
+       if (port->pi_enable && !(ops->flags & NVMF_METADATA_SUPPORTED)) {
                pr_err("T10-PI is not supported by transport type %d\n",
                       port->disc_addr.trtype);
                ret = -EINVAL;

diff --git a/drivers/nvme/target/discovery.c b/drivers/nvme/target/discovery.c
index 40cf0b6e6c9de252ea1ce6f588e0102c4a7e421f..f40c05c33c3abda990e31b37fe5472cdde00db84 100644 (file)
--- a/drivers/nvme/target/discovery.c
+++ b/drivers/nvme/target/discovery.c
@@ -277,7 +277,7 @@ static void nvmet_execute_disc_identify(struct nvmet_req *req)
        id->maxcmd = cpu_to_le16(NVMET_MAX_CMD);
 
        id->sgls = cpu_to_le32(1 << 0); /* we always support SGLs */
-       if (ctrl->ops->has_keyed_sgls)
+       if (ctrl->ops->flags & NVMF_KEYED_SGLS)
                id->sgls |= cpu_to_le32(1 << 2);
        if (req->port->inline_data_size)
                id->sgls |= cpu_to_le32(1 << 20);

diff --git a/drivers/nvme/target/nvmet.h b/drivers/nvme/target/nvmet.h
index 809691291e738928770264e23f59254869ff8c35..6f8bd6a93575193209ab64d6b5546efc788e355d 100644 (file)
--- a/drivers/nvme/target/nvmet.h
+++ b/drivers/nvme/target/nvmet.h
@@ -286,8 +286,9 @@ struct nvmet_fabrics_ops {
        struct module *owner;
        unsigned int type;
        unsigned int msdbd;
-       bool has_keyed_sgls : 1;
-       bool metadata_support : 1;
+       unsigned int flags;
+#define NVMF_KEYED_SGLS                        (1 << 0)
+#define NVMF_METADATA_SUPPORTED                (1 << 1)
        void (*queue_response)(struct nvmet_req *req);
        int (*add_port)(struct nvmet_port *port);
        void (*remove_port)(struct nvmet_port *port);

diff --git a/drivers/nvme/target/rdma.c b/drivers/nvme/target/rdma.c
index 76ea23a2c2be7622cef3fff59a7a6371624ab048..6731e0349480a1af4edcf328e663275fe7ad2737 100644 (file)
--- a/drivers/nvme/target/rdma.c
+++ b/drivers/nvme/target/rdma.c
@@ -1970,8 +1970,7 @@ static const struct nvmet_fabrics_ops nvmet_rdma_ops = {
        .owner                  = THIS_MODULE,
        .type                   = NVMF_TRTYPE_RDMA,
        .msdbd                  = 1,
-       .has_keyed_sgls         = 1,
-       .metadata_support       = 1,
+       .flags                  = NVMF_KEYED_SGLS | NVMF_METADATA_SUPPORTED,
        .add_port               = nvmet_rdma_add_port,
        .remove_port            = nvmet_rdma_remove_port,
        .queue_response         = nvmet_rdma_queue_response,