Commit 7901f342 authored by Marc Olson's avatar Marc Olson Committed by Stefan Bader

nvme: update timeout module parameter type

BugLink: https://bugs.launchpad.net/bugs/1729119

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>
(backported from commit 8ae4e447)
Signed-off-by: default avatarDaniel Axtens <daniel.axtens@canonical.com>
Acked-by: default avatarStefan Bader <stefan.bader@canonical.com>
Acked-by: default avatarColin King <colin.king@canonical.com>
Signed-off-by: default avatarStefan Bader <stefan.bader@canonical.com>
parent e76984cb
...@@ -29,10 +29,10 @@ enum { ...@@ -29,10 +29,10 @@ enum {
NVME_SC_CANCELLED = -EINTR, NVME_SC_CANCELLED = -EINTR,
}; };
extern unsigned char nvme_io_timeout; extern unsigned int nvme_io_timeout;
#define NVME_IO_TIMEOUT (nvme_io_timeout * HZ) #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 ADMIN_TIMEOUT (admin_timeout * HZ)
extern unsigned char shutdown_timeout; extern unsigned char shutdown_timeout;
......
...@@ -61,12 +61,12 @@ ...@@ -61,12 +61,12 @@
#define NVME_NR_AEN_COMMANDS 1 #define NVME_NR_AEN_COMMANDS 1
#define NVME_AQ_BLKMQ_DEPTH (NVME_AQ_DEPTH - NVME_NR_AEN_COMMANDS) #define NVME_AQ_BLKMQ_DEPTH (NVME_AQ_DEPTH - NVME_NR_AEN_COMMANDS)
unsigned char admin_timeout = 60; unsigned int admin_timeout = 60;
module_param(admin_timeout, byte, 0644); module_param(admin_timeout, uint, 0644);
MODULE_PARM_DESC(admin_timeout, "timeout in seconds for admin commands"); MODULE_PARM_DESC(admin_timeout, "timeout in seconds for admin commands");
unsigned char nvme_io_timeout = 30; unsigned int nvme_io_timeout = 30;
module_param_named(io_timeout, nvme_io_timeout, byte, 0644); module_param_named(io_timeout, nvme_io_timeout, uint, 0644);
MODULE_PARM_DESC(io_timeout, "timeout in seconds for I/O"); MODULE_PARM_DESC(io_timeout, "timeout in seconds for I/O");
unsigned char shutdown_timeout = 5; unsigned char shutdown_timeout = 5;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment