From c8208b23c2e24c281416320fa1b440c2767cd72d Mon Sep 17 00:00:00 2001
From: Kees Cook <kees.cook@canonical.com>
Date: Thu, 5 May 2011 18:02:12 -0600
Subject: [PATCH] --- yaml --- r: 251137 b: refs/heads/master c:
 490b94be0282c3b67f56453628ff0aaae827a670 h: refs/heads/master i:   251135:
 c23549023346d5430b1dbfe80007dcc07d9261c2 v: v3

---
 [refs]                 | 2 +-
 trunk/block/elevator.c | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 0bea0f52bc1e..aff9d5397b56 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: addd0a09fc06179f2e02b4221775d9ab265c9fc7
+refs/heads/master: 490b94be0282c3b67f56453628ff0aaae827a670
diff --git a/trunk/block/elevator.c b/trunk/block/elevator.c
index 6f6abc08bb56..3cd0d8c84902 100644
--- a/trunk/block/elevator.c
+++ b/trunk/block/elevator.c
@@ -155,13 +155,8 @@ static struct elevator_type *elevator_get(const char *name)
 
 	e = elevator_find(name);
 	if (!e) {
-		char elv[ELV_NAME_MAX + strlen("-iosched")];
-
 		spin_unlock(&elv_list_lock);
-
-		snprintf(elv, sizeof(elv), "%s-iosched", name);
-
-		request_module("%s", elv);
+		request_module("%s-iosched", name);
 		spin_lock(&elv_list_lock);
 		e = elevator_find(name);
 	}