From: Markus Trippelsdorf <markus@trippelsdorf.de>
To: linux-block@vger.kernel.org
Subject: [PATCH cosmetic] Remove trailing newline in elevator switch error message
Date: Sat, 29 Apr 2017 07:38:08 +0200 [thread overview]
Message-ID: <20170429053808.GA293@x4> (raw)
Trying to switch to a non-existing elevator currently results in garbled
dmesg output, e.g.:
# echo "foo" > /sys/block/sda/queue/scheduler
elevator: type foo not found
elevator: switch to foo
failed
(note the unintended line break.)
Fix by stripping the trailing newline.
diff --git a/block/elevator.c b/block/elevator.c
index bf11e70f008b..4f13fcd3c626 100644
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -1112,6 +1112,7 @@ static inline bool elv_support_iosched(struct request_queue *q)
ssize_t elv_iosched_store(struct request_queue *q, const char *name,
size_t count)
{
+ char elevator_name[ELV_NAME_MAX];
int ret;
if (!(q->mq_ops || q->request_fn) || !elv_support_iosched(q))
@@ -1121,7 +1122,9 @@ ssize_t elv_iosched_store(struct request_queue *q, const char *name,
if (!ret)
return count;
- printk(KERN_ERR "elevator: switch to %s failed\n", name);
+ strlcpy(elevator_name, name, sizeof(elevator_name));
+ strstrip(elevator_name);
+ printk(KERN_ERR "elevator: switch to %s failed\n", elevator_name);
return ret;
}
--
Markus
next reply other threads:[~2017-04-29 5:44 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-29 5:38 Markus Trippelsdorf [this message]
2017-05-01 15:18 ` [PATCH cosmetic] Remove trailing newline in elevator switch error message Bart Van Assche
2017-05-01 15:49 ` markus
2017-05-01 15:58 ` Bart Van Assche
2017-05-01 16:29 ` [PATCH v2 " markus
2017-05-05 20:05 ` Bart Van Assche
2017-05-06 5:15 ` markus
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170429053808.GA293@x4 \
--to=markus@trippelsdorf.de \
--cc=linux-block@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox