Commit b355084a authored by Keith Busch's avatar Keith Busch Committed by Matthew Wilcox
Browse files

NVMe: Make I/O timeout a module parameter 



Increase the default timeout to 30 seconds to match SCSI.

Signed-off-by: default avatarKeith Busch <keith.busch@intel.com>
[use byte instead of ushort]
Signed-off-by: default avatarMatthew Wilcox <matthew.r.wilcox@intel.com>
parent 33b1e95c

drivers/block/nvme-core.c

+4 −0
Original line number Diff line number Diff line
@@ -50,6 +50,10 @@ 
#define CQ_SIZE(depth)		(depth * sizeof(struct nvme_completion))

#define ADMIN_TIMEOUT	(60 * HZ)



unsigned char io_timeout = 30;

module_param(io_timeout, byte, 0644);

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



static int nvme_major;

module_param(nvme_major, int, 0);

include/linux/nvme.h

+2 −1
Original line number Diff line number Diff line
@@ -66,7 +66,8 @@ enum { 


#define NVME_VS(major, minor)	(major << 16 | minor)



#define NVME_IO_TIMEOUT	(5 * HZ)

extern unsigned char io_timeout;

#define NVME_IO_TIMEOUT	(io_timeout * HZ)



/*

 * Represents an NVM Express device.  Each nvme_dev is a PCI function.