summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Le Moal <damien.lemoal@wdc.com>2019-07-11 00:57:41 +0900
committerJens Axboe <axboe@kernel.dk>2019-07-10 14:18:01 -0600
commit9305d5d721f2bd5e2eeb670035159b560ca211ca (patch)
tree3a407ca84377590759f0f17392f6a1fb12abe9de
parent36847a005489cfb74dc6388952da73346f867dca (diff)
downloadlinux-stable-9305d5d721f2bd5e2eeb670035159b560ca211ca.tar.gz
linux-stable-9305d5d721f2bd5e2eeb670035159b560ca211ca.tar.bz2
linux-stable-9305d5d721f2bd5e2eeb670035159b560ca211ca.zip
block: Fix elevator name declaration
The elevator_name field in struct elevator_type is declared as an array of characters (ELV_NAME_MAX size) but in practice used as a string pointer with its initialization done statically within each elevator elevator_type structure declaration. Change the declaration of elevator_name to the more appropriate "const char *" type. Acked-by: Marcos Paulo de Souza <marcos.souza.org@gmail.com> Signed-off-by: Damien Le Moal <damien.lemoal@wdc.com> Signed-off-by: Jens Axboe <axboe@kernel.dk>
-rw-r--r--include/linux/elevator.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/elevator.h b/include/linux/elevator.h
index 38590c30a11d..17cd0078377c 100644
--- a/include/linux/elevator.h
+++ b/include/linux/elevator.h
@@ -75,7 +75,7 @@ struct elevator_type
size_t icq_size; /* see iocontext.h */
size_t icq_align; /* ditto */
struct elv_fs_entry *elevator_attrs;
- char elevator_name[ELV_NAME_MAX];
+ const char *elevator_name;
const char *elevator_alias;
struct module *elevator_owner;
#ifdef CONFIG_BLK_DEBUG_FS