Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ba0ba7d3 authored by Ming Lin's avatar Ming Lin Committed by Jens Axboe
Browse files

nvme: move timeout variables to core.c 



These variables are used by PCI driver and will also be used in the
forthcoming NVMe over Fabrics drivers.

Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: default avatarSagi Grimberg <sagig@mellanox.com>
Signed-off-by: default avatarMing Lin <ming.l@ssi.samsung.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent e439bb12

drivers/nvme/host/core.c

+12 −0
Original line number Diff line number Diff line
@@ -33,6 +33,18 @@ 


#define NVME_MINORS		(1U << MINORBITS)



unsigned char admin_timeout = 60;

module_param(admin_timeout, byte, 0644);

MODULE_PARM_DESC(admin_timeout, "timeout in seconds for admin commands");



unsigned char nvme_io_timeout = 30;

module_param_named(io_timeout, nvme_io_timeout, byte, 0644);

MODULE_PARM_DESC(io_timeout, "timeout in seconds for I/O");



unsigned char shutdown_timeout = 5;

module_param(shutdown_timeout, byte, 0644);

MODULE_PARM_DESC(shutdown_timeout, "timeout in seconds for controller shutdown");



static int nvme_major;

module_param(nvme_major, int, 0);

drivers/nvme/host/pci.c

+0 −12
Original line number Diff line number Diff line
@@ -57,18 +57,6 @@ 
#define NVME_NR_AEN_COMMANDS	1

#define NVME_AQ_BLKMQ_DEPTH	(NVME_AQ_DEPTH - NVME_NR_AEN_COMMANDS)



unsigned char admin_timeout = 60;

module_param(admin_timeout, byte, 0644);

MODULE_PARM_DESC(admin_timeout, "timeout in seconds for admin commands");



unsigned char nvme_io_timeout = 30;

module_param_named(io_timeout, nvme_io_timeout, byte, 0644);

MODULE_PARM_DESC(io_timeout, "timeout in seconds for I/O");



unsigned char shutdown_timeout = 5;

module_param(shutdown_timeout, byte, 0644);

MODULE_PARM_DESC(shutdown_timeout, "timeout in seconds for controller shutdown");



static int use_threaded_interrupts;

module_param(use_threaded_interrupts, int, 0);