Commit 8ae4e447 authored by Marc Olson's avatar Marc Olson Committed by Christoph Hellwig
Browse files

nvme: update timeout module parameter type 



The underlying blk_mq_tag_set, and request timeout parameters support an
unsigned int. Extend the size of the nvme module parameters for io and
admin commands to match.

Signed-off-by: default avatarMarc Olson <marcolso@amazon.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 9c988374

drivers/nvme/host/core.c

+4 −4
Original line number Diff line number Diff line
@@ -34,13 +34,13 @@ 


#define NVME_MINORS		(1U << MINORBITS)



unsigned char admin_timeout = 60;

module_param(admin_timeout, byte, 0644);

unsigned int admin_timeout = 60;

module_param(admin_timeout, uint, 0644);

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

EXPORT_SYMBOL_GPL(admin_timeout);



unsigned char nvme_io_timeout = 30;

module_param_named(io_timeout, nvme_io_timeout, byte, 0644);

unsigned int nvme_io_timeout = 30;

module_param_named(io_timeout, nvme_io_timeout, uint, 0644);

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

EXPORT_SYMBOL_GPL(nvme_io_timeout);

drivers/nvme/host/nvme.h

+2 −2
Original line number Diff line number Diff line
@@ -21,10 +21,10 @@ 
#include <linux/lightnvm.h>

#include <linux/sed-opal.h>



extern unsigned char nvme_io_timeout;

extern unsigned int nvme_io_timeout;

#define NVME_IO_TIMEOUT	(nvme_io_timeout * HZ)



extern unsigned char admin_timeout;

extern unsigned int admin_timeout;

#define ADMIN_TIMEOUT	(admin_timeout * HZ)



#define NVME_DEFAULT_KATO	5

CRA Git | Maintained and supported by SUSTech CRA and CCSE