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

nvme: use consistent macro name for timeout 



This is purely a clenaup patch, add prefix NVME to the ADMIN_TIMEOUT to
make consistent with NVME_IO_TIMEOUT.

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

drivers/nvme/host/core.c

+3 −3
Original line number Diff line number Diff line
@@ -536,7 +536,7 @@ struct request *nvme_alloc_request(struct request_queue *q, 
	if (req->q->queuedata)

		req->timeout = NVME_IO_TIMEOUT;

	else /* no queuedata implies admin queue */

		req->timeout = ADMIN_TIMEOUT;

		req->timeout = NVME_ADMIN_TIMEOUT;



	req->cmd_flags |= REQ_FAILFAST_DRIVER;

	nvme_clear_nvme_request(req);
@@ -2268,8 +2268,8 @@ int nvme_sec_submit(void *data, u16 spsp, u8 secp, void *buffer, size_t len, 
	cmd.common.cdw10 = cpu_to_le32(((u32)secp) << 24 | ((u32)spsp) << 8);

	cmd.common.cdw11 = cpu_to_le32(len);



	return __nvme_submit_sync_cmd(ctrl->admin_q, &cmd, NULL, buffer, len,

				      ADMIN_TIMEOUT, NVME_QID_ANY, 1, 0, false);

	return __nvme_submit_sync_cmd(ctrl->admin_q, &cmd, NULL, buffer, len, 0,

			NVME_QID_ANY, 1, 0, false);

}

EXPORT_SYMBOL_GPL(nvme_sec_submit);

#endif /* CONFIG_BLK_SED_OPAL */

drivers/nvme/host/fc.c

+1 −1
Original line number Diff line number Diff line
@@ -3479,7 +3479,7 @@ nvme_fc_init_ctrl(struct device *dev, struct nvmf_ctrl_options *opts, 
			    ctrl->lport->ops->fcprqst_priv_sz);

	ctrl->admin_tag_set.driver_data = ctrl;

	ctrl->admin_tag_set.nr_hw_queues = 1;

	ctrl->admin_tag_set.timeout = ADMIN_TIMEOUT;

	ctrl->admin_tag_set.timeout = NVME_ADMIN_TIMEOUT;

	ctrl->admin_tag_set.flags = BLK_MQ_F_NO_SCHED;



	ret = blk_mq_alloc_tag_set(&ctrl->admin_tag_set);

drivers/nvme/host/nvme.h

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ extern unsigned int nvme_io_timeout; 
#define NVME_IO_TIMEOUT	(nvme_io_timeout * HZ)



extern unsigned int admin_timeout;

#define ADMIN_TIMEOUT	(admin_timeout * HZ)

#define NVME_ADMIN_TIMEOUT	(admin_timeout * HZ)



#define NVME_DEFAULT_KATO	5

#define NVME_KATO_GRACE		10

drivers/nvme/host/pci.c

+2 −2
Original line number Diff line number Diff line
@@ -1606,7 +1606,7 @@ static int nvme_alloc_admin_tags(struct nvme_dev *dev) 
		dev->admin_tagset.nr_hw_queues = 1;



		dev->admin_tagset.queue_depth = NVME_AQ_MQ_TAG_DEPTH;

		dev->admin_tagset.timeout = ADMIN_TIMEOUT;

		dev->admin_tagset.timeout = NVME_ADMIN_TIMEOUT;

		dev->admin_tagset.numa_node = dev->ctrl.numa_node;

		dev->admin_tagset.cmd_size = sizeof(struct nvme_iod);

		dev->admin_tagset.flags = BLK_MQ_F_NO_SCHED;
@@ -2237,7 +2237,7 @@ static bool __nvme_disable_io_queues(struct nvme_dev *dev, u8 opcode) 
	unsigned long timeout;



 retry:

	timeout = ADMIN_TIMEOUT;

	timeout = NVME_ADMIN_TIMEOUT;

	while (nr_queues > 0) {

		if (nvme_delete_queue(&dev->queues[nr_queues], opcode))

			break;

drivers/nvme/host/rdma.c

+1 −1
Original line number Diff line number Diff line
@@ -797,7 +797,7 @@ static struct blk_mq_tag_set *nvme_rdma_alloc_tagset(struct nvme_ctrl *nctrl, 
				NVME_RDMA_DATA_SGL_SIZE;

		set->driver_data = ctrl;

		set->nr_hw_queues = 1;

		set->timeout = ADMIN_TIMEOUT;

		set->timeout = NVME_ADMIN_TIMEOUT;

		set->flags = BLK_MQ_F_NO_SCHED;

	} else {

		set = &ctrl->tag_set;