summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMatthew Wilcox <matthew.r.wilcox@intel.com>2014-06-03 23:04:30 -0400
committerMatthew Wilcox <matthew.r.wilcox@intel.com>2014-06-03 23:04:30 -0400
commitbd67608a6127c994e897c49cc4f72d9095925301 (patch)
tree018c2bb3481b18960e0aed9d13f0715de5b955ef /drivers
parentdedf4b156134e0dedec18ebecda3e74077fa7c92 (diff)
downloadop-kernel-dev-bd67608a6127c994e897c49cc4f72d9095925301.zip
op-kernel-dev-bd67608a6127c994e897c49cc4f72d9095925301.tar.gz
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')
-rw-r--r--drivers/block/nvme-core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c
index bb6ce31..2af079e 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;
OpenPOWER on IntegriCloud