Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

NVMe: Rename io_timeout to nvme_io_timeout

Browse source 
It's positively immoral to have a global variable called 'io_timeout'.
Keep the module parameter called io_timeout, though.

Signed-off-by: Matthew Wilcox <matthew.r.wilcox@intel.com>
This commit is contained in:
Matthew Wilcox 2014-06-03 23:04:30 -04:00
parent dedf4b1561
commit bd67608a61
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/block/nvme-core.c
View file

@ -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;

4
include/linux/nvme.h
View file

@ -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.