]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
blk-mq-debugfs: don't open code strstrip()
authorOmar Sandoval <osandov@fb.com>
Thu, 4 May 2017 07:31:26 +0000 (00:31 -0700)
committerJens Axboe <axboe@fb.com>
Thu, 4 May 2017 14:23:20 +0000 (08:23 -0600)
Slightly more readable, plus we also strip leading spaces.

Signed-off-by: Omar Sandoval <osandov@fb.com>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
block/blk-mq-debugfs.c

index 2a19237455d4ada28b7c74df36953b4376231278..109ae9f3d4007984e590be47b514ad53bc9be29b 100644 (file)
@@ -111,17 +111,16 @@ static ssize_t blk_queue_flags_store(struct file *file, const char __user *buf,
                                     size_t count, loff_t *ppos)
 {
        struct request_queue *q = file_inode(file)->i_private;
-       char op[16] = { }, *s;
+       char opbuf[16] = { }, *op;
 
-       if (count >= sizeof(op)) {
+       if (count >= sizeof(opbuf)) {
                pr_err("%s: operation too long\n", __func__);
                goto inval;
        }
 
-       if (copy_from_user(op, buf, count))
+       if (copy_from_user(opbuf, buf, count))
                return -EFAULT;
-       s = op;
-       strsep(&s, " \t\n"); /* strip trailing whitespace */
+       op = strstrip(opbuf);
        if (strcmp(op, "run") == 0) {
                blk_mq_run_hw_queues(q, true);
        } else if (strcmp(op, "start") == 0) {