diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-11 05:44:30 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-11 05:44:30 -0400 |
| commit | 4a1032faac94ebbf647460ae3e06fc21146eb280 (patch) | |
| tree | 7f31b97beb0406faa1523e619289ad0ab07c9787 /block/elevator.c | |
| parent | ae4e8d63b5619d4d95f1d2bfa2b836caa6e62d06 (diff) | |
| parent | 0eddb519b9127c73d53db4bf3ec1d45b13f844d1 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
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); |