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 /drivers/block | |
| parent | dedf4b156134e0dedec18ebecda3e74077fa7c92 (diff) | |
| download | talos-op-linux-bd67608a6127c994e897c49cc4f72d9095925301.tar.gz talos-op-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 'drivers/block')
| -rw-r--r-- | drivers/block/nvme-core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c index bb6ce311ad44..2af079e571fc 100644 --- a/drivers/block/nvme-core.c +++ b/drivers/block/nvme-core.c @@ -54,8 +54,8 @@ static unsigned char admin_timeout = 60; module_param(admin_timeout, byte, 0644); MODULE_PARM_DESC(admin_timeout, "timeout in seconds for admin commands"); -unsigned char io_timeout = 30; -module_param(io_timeout, byte, 0644); +unsigned char nvme_io_timeout = 30; +module_param_named(io_timeout, nvme_io_timeout, byte, 0644); MODULE_PARM_DESC(io_timeout, "timeout in seconds for I/O"); static unsigned char retry_time = 30; |
