NVMe: Rename io_timeout to nvme_io_timeout
authorMatthew Wilcox <matthew.r.wilcox@intel.com>
Wed, 4 Jun 2014 03:04:30 +0000 (23:04 -0400)
committerMatthew Wilcox <matthew.r.wilcox@intel.com>
Wed, 4 Jun 2014 03:04:30 +0000 (23:04 -0400)
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>
drivers/block/nvme-core.c
include/linux/nvme.h

Simple merge
Simple merge