diff --git a/[refs] b/[refs]
index a6703c98134d..a2d90c2e9cd4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e6d63840ba55ffd3a79aea6792aac6f29f338083
+refs/heads/master: ee2e992cc28553f6c4dd1ab5483c8733c393626b
diff --git a/trunk/block/elevator.c b/trunk/block/elevator.c
index 04518921db31..9482ffa1aae6 100644
--- a/trunk/block/elevator.c
+++ b/trunk/block/elevator.c
@@ -1166,15 +1166,10 @@ ssize_t elv_iosched_store(struct request_queue *q, const char *name,
 			  size_t count)
 {
 	char elevator_name[ELV_NAME_MAX];
-	size_t len;
 	struct elevator_type *e;
 
-	elevator_name[sizeof(elevator_name) - 1] = '\0';
-	strncpy(elevator_name, name, sizeof(elevator_name) - 1);
-	len = strlen(elevator_name);
-
-	if (len && elevator_name[len - 1] == '\n')
-		elevator_name[len - 1] = '\0';
+	strlcpy(elevator_name, name, sizeof(elevator_name));
+	strstrip(elevator_name);
 
 	e = elevator_get(elevator_name);
 	if (!e) {