diff options
Diffstat (limited to 'drivers/nvme')
-rw-r--r-- | drivers/nvme/host/core.c | 21 | ||||
-rw-r--r-- | drivers/nvme/target/configfs.c | 10 |
2 files changed, 4 insertions, 27 deletions
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index 35b3fee5a453..b40cfb076f02 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -263,21 +263,6 @@ static inline int nvme_setup_discard(struct nvme_ns *ns, struct request *req, return BLK_MQ_RQ_QUEUE_OK; } -static inline void nvme_setup_write_zeroes(struct nvme_ns *ns, - struct request *req, struct nvme_command *cmnd) -{ - struct nvme_write_zeroes_cmd *write_zeroes = &cmnd->write_zeroes; - - memset(cmnd, 0, sizeof(*cmnd)); - write_zeroes->opcode = nvme_cmd_write_zeroes; - write_zeroes->nsid = cpu_to_le32(ns->ns_id); - write_zeroes->slba = - cpu_to_le64(nvme_block_nr(ns, blk_rq_pos(req))); - write_zeroes->length = - cpu_to_le16((blk_rq_bytes(req) >> ns->lba_shift) - 1); - write_zeroes->control = 0; -} - static inline void nvme_setup_rw(struct nvme_ns *ns, struct request *req, struct nvme_command *cmnd) { @@ -330,8 +315,6 @@ int nvme_setup_cmd(struct nvme_ns *ns, struct request *req, nvme_setup_flush(ns, cmd); else if (req_op(req) == REQ_OP_DISCARD) ret = nvme_setup_discard(ns, req, cmd); - else if (req_op(req) == REQ_OP_WRITE_ZEROES) - nvme_setup_write_zeroes(ns, req, cmd); else nvme_setup_rw(ns, req, cmd); @@ -952,10 +935,6 @@ static void __nvme_revalidate_disk(struct gendisk *disk, struct nvme_id_ns *id) if (ns->ctrl->oncs & NVME_CTRL_ONCS_DSM) nvme_config_discard(ns); - if (ns->ctrl->oncs & NVME_CTRL_ONCS_WRITE_ZEROES) - blk_queue_max_write_zeroes_sectors(ns->queue, - ((u32)(USHRT_MAX + 1) * bs) >> 9); - blk_mq_unfreeze_queue(disk->queue); } diff --git a/drivers/nvme/target/configfs.c b/drivers/nvme/target/configfs.c index d0f60c36d576..6f5074153dcd 100644 --- a/drivers/nvme/target/configfs.c +++ b/drivers/nvme/target/configfs.c @@ -480,7 +480,7 @@ out_free_link: return ret; } -static int nvmet_port_subsys_drop_link(struct config_item *parent, +static void nvmet_port_subsys_drop_link(struct config_item *parent, struct config_item *target) { struct nvmet_port *port = to_nvmet_port(parent->ci_parent); @@ -493,7 +493,7 @@ static int nvmet_port_subsys_drop_link(struct config_item *parent, goto found; } up_write(&nvmet_config_sem); - return -EINVAL; + return; found: list_del(&p->entry); @@ -502,7 +502,6 @@ found: nvmet_disable_port(port); up_write(&nvmet_config_sem); kfree(p); - return 0; } static struct configfs_item_operations nvmet_port_subsys_item_ops = { @@ -556,7 +555,7 @@ out_free_link: return ret; } -static int nvmet_allowed_hosts_drop_link(struct config_item *parent, +static void nvmet_allowed_hosts_drop_link(struct config_item *parent, struct config_item *target) { struct nvmet_subsys *subsys = to_subsys(parent->ci_parent); @@ -569,14 +568,13 @@ static int nvmet_allowed_hosts_drop_link(struct config_item *parent, goto found; } up_write(&nvmet_config_sem); - return -EINVAL; + return; found: list_del(&p->entry); nvmet_genctr++; up_write(&nvmet_config_sem); kfree(p); - return 0; } static struct configfs_item_operations nvmet_allowed_hosts_item_ops = { |