From: Keith Busch <keith.busch@intel.com>
Date: Tue, 13 May 2014 17:42:02 +0000 (-0600)
Subject: NVMe: Make admin timeout a module parameter
X-Git-Tag: MMI-PSA29.97-13-9~12048^2~9
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9d43cf646eab948db81913379dacb1dcecacb1eb;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

NVMe: Make admin timeout a module parameter

Signed-off-by: Keith Busch <keith.busch@intel.com>
[made admin_timeout static]
Signed-off-by: Matthew Wilcox <matthew.r.wilcox@intel.com>
---

diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c
index 1a911067061c..12c57eb7c915 100644
--- a/drivers/block/nvme-core.c
+++ b/drivers/block/nvme-core.c
@@ -44,11 +44,15 @@
 
 #include <trace/events/block.h>
 
-#define NVME_Q_DEPTH 1024
+#define NVME_Q_DEPTH		1024
 #define SQ_SIZE(depth)		(depth * sizeof(struct nvme_command))
 #define CQ_SIZE(depth)		(depth * sizeof(struct nvme_completion))
-#define ADMIN_TIMEOUT	(60 * HZ)
-#define IOD_TIMEOUT	(retry_time * HZ)
+#define ADMIN_TIMEOUT		(admin_timeout * HZ)
+#define IOD_TIMEOUT		(retry_time * HZ)
+
+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);