Commit bd67608a authored by Matthew Wilcox's avatar Matthew Wilcox

NVMe: Rename io_timeout to nvme_io_timeout

It's positively immoral to have a global variable called 'io_timeout'.
Keep the module parameter called io_timeout, though.
Signed-off-by: default avatarMatthew Wilcox <matthew.r.wilcox@intel.com>
parent dedf4b15
...@@ -54,8 +54,8 @@ static unsigned char admin_timeout = 60; ...@@ -54,8 +54,8 @@ static unsigned char admin_timeout = 60;
module_param(admin_timeout, byte, 0644); module_param(admin_timeout, byte, 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 io_timeout = 30; unsigned char nvme_io_timeout = 30;
module_param(io_timeout, byte, 0644); module_param_named(io_timeout, nvme_io_timeout, byte, 0644);
MODULE_PARM_DESC(io_timeout, "timeout in seconds for I/O"); MODULE_PARM_DESC(io_timeout, "timeout in seconds for I/O");
static unsigned char retry_time = 30; static unsigned char retry_time = 30;
......
...@@ -62,8 +62,8 @@ enum { ...@@ -62,8 +62,8 @@ enum {
#define NVME_VS(major, minor) (major << 16 | minor) #define NVME_VS(major, minor) (major << 16 | minor)
extern unsigned char io_timeout; extern unsigned char nvme_io_timeout;
#define NVME_IO_TIMEOUT (io_timeout * HZ) #define NVME_IO_TIMEOUT (nvme_io_timeout * HZ)
/* /*
* Represents an NVM Express device. Each nvme_dev is a PCI function. * Represents an NVM Express device. Each nvme_dev is a PCI function.
......
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