From: Li Zefan <lizf@cn.fujitsu.com>
Date: Tue, 14 Oct 2008 06:49:56 +0000 (+0200)
Subject: block: simplify string handling in elv_iosched_store()
X-Git-Tag: v2.6.28-rc1~261^2~6
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=ee2e992cc28553f6c4dd1ab5483c8733c393626b;p=linux-2.6-omap-h63xx.git

block: simplify string handling in elv_iosched_store()

strlcpy() guarantees the dest buffer is NULL teminated.

Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
---

diff --git a/block/elevator.c b/block/elevator.c
index 04518921db3..9482ffa1aae 100644
--- a/block/elevator.c
+++ b/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) {