diff options
| author | Matthew Wilcox <matthew.r.wilcox@intel.com> | 2014-06-03 23:04:30 -0400 |
|---|---|---|
| committer | Matthew Wilcox <matthew.r.wilcox@intel.com> | 2014-06-03 23:04:30 -0400 |
| commit | bd67608a6127c994e897c49cc4f72d9095925301 (patch) | |
| tree | 018c2bb3481b18960e0aed9d13f0715de5b955ef /include | |
| parent | dedf4b156134e0dedec18ebecda3e74077fa7c92 (diff) | |
| download | linux-bd67608a6127c994e897c49cc4f72d9095925301.tar.gz linux-bd67608a6127c994e897c49cc4f72d9095925301.tar.bz2 linux-bd67608a6127c994e897c49cc4f72d9095925301.zip | |
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: Matthew Wilcox <matthew.r.wilcox@intel.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/nvme.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/nvme.h b/include/linux/nvme.h index 1813cfdb7e80..8541dd920bb7 100644 --- a/include/linux/nvme.h +++ b/include/linux/nvme.h @@ -62,8 +62,8 @@ enum { #define NVME_VS(major, minor) (major << 16 | minor) -extern unsigned char io_timeout; -#define NVME_IO_TIMEOUT (io_timeout * HZ) +extern unsigned char nvme_io_timeout; +#define NVME_IO_TIMEOUT (nvme_io_timeout * HZ) /* * Represents an NVM Express device. Each nvme_dev is a PCI function. |