diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-05-06 21:29:25 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-05-06 21:29:25 -0400 |
| commit | 1ed31d6db90d51010545921e59d369d2f92b7ac2 (patch) | |
| tree | 358a0b346bc8135cd5e53700eb44308b1a7c8c5b /block/elevator.c | |
| parent | ceba1abcb00b0ef0b1efcd715285f6e05523edef (diff) | |
| parent | 722154e4cacf015161efe60009ae9be23d492296 (diff) | |
Merge commit 'origin/master' into next
Diffstat (limited to 'block/elevator.c')
| -rw-r--r-- | block/elevator.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/elevator.c b/block/elevator.c index df75676f6671..76e3702d5381 100644 --- a/block/elevator.c +++ b/block/elevator.c | |||
| @@ -154,7 +154,7 @@ static struct elevator_type *elevator_get(const char *name) | |||
| 154 | 154 | ||
| 155 | spin_unlock(&elv_list_lock); | 155 | spin_unlock(&elv_list_lock); |
| 156 | 156 | ||
| 157 | sprintf(elv, "%s-iosched", name); | 157 | snprintf(elv, sizeof(elv), "%s-iosched", name); |
| 158 | 158 | ||
| 159 | request_module("%s", elv); | 159 | request_module("%s", elv); |
| 160 | spin_lock(&elv_list_lock); | 160 | spin_lock(&elv_list_lock); |