nvmet: rename nvmet_rw_len to nvmet_rw_data_len

The function doesn't add the metadata length (only data length is
calculated). This is preparation for adding metadata (T10-PI) support.

Signed-off-by: Israel Rukshin <israelr@mellanox.com>
Reviewed-by: Max Gurtovoy <maxg@mellanox.com>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: James Smart <james.smart@broadcom.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>

diff --git a/drivers/nvme/target/io-cmd-bdev.c b/drivers/nvme/target/io-cmd-bdev.c
index e518bb9bf7183e0654bd768624c3f7994abd1b66..628e81a7444419a922d50b191cb93397872451c6 100644 (file)
--- a/drivers/nvme/target/io-cmd-bdev.c
+++ b/drivers/nvme/target/io-cmd-bdev.c
@@ -178,7 +178,7 @@ static void nvmet_bdev_execute_rw(struct nvmet_req *req)
        sector_t sector;
        int op, i;
 
-       if (!nvmet_check_data_len(req, nvmet_rw_len(req)))
+       if (!nvmet_check_data_len(req, nvmet_rw_data_len(req)))
                return;
 
        if (!req->sg_cnt) {

diff --git a/drivers/nvme/target/io-cmd-file.c b/drivers/nvme/target/io-cmd-file.c
index f0bd08d86ac0bc7116f771e76052affb222c5a7b..b31717c5d75fb134bfd8d9450ecfaf010eafbb2d 100644 (file)
--- a/drivers/nvme/target/io-cmd-file.c
+++ b/drivers/nvme/target/io-cmd-file.c
@@ -241,7 +241,7 @@ static void nvmet_file_execute_rw(struct nvmet_req *req)
 {
        ssize_t nr_bvec = req->sg_cnt;
 
-       if (!nvmet_check_data_len(req, nvmet_rw_len(req)))
+       if (!nvmet_check_data_len(req, nvmet_rw_data_len(req)))
                return;
 
        if (!req->sg_cnt || !nr_bvec) {

diff --git a/drivers/nvme/target/nvmet.h b/drivers/nvme/target/nvmet.h
index daef06a3aff4e980bb117dc62106f38eb45830fa..8bed8a61345e847a8b96983c3ae91a483cd1547d 100644 (file)
--- a/drivers/nvme/target/nvmet.h
+++ b/drivers/nvme/target/nvmet.h
@@ -505,7 +505,7 @@ void nvmet_bdev_ns_revalidate(struct nvmet_ns *ns);
 int nvmet_file_ns_revalidate(struct nvmet_ns *ns);
 void nvmet_ns_revalidate(struct nvmet_ns *ns);
 
-static inline u32 nvmet_rw_len(struct nvmet_req *req)
+static inline u32 nvmet_rw_data_len(struct nvmet_req *req)
 {
        return ((u32)le16_to_cpu(req->cmd->rw.length) + 1) <<
                        req->ns->blksize_shift;