diff options
| author | Tomoki Sekiyama <tomoki.sekiyama@hds.com> | 2013-10-15 16:42:19 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2013-11-08 09:00:13 -0700 |
| commit | 7c8a3679e3d8e9d92d58f282161760a0e247df97 (patch) | |
| tree | 220802e0b80df5b3191359cf09effcfae84718a5 /block/elevator.c | |
| parent | eb1c160b22655fd4ec44be732d6594fd1b1e44f4 (diff) | |
| download | linux-7c8a3679e3d8e9d92d58f282161760a0e247df97.tar.bz2 | |
elevator: acquire q->sysfs_lock in elevator_change()
Add locking of q->sysfs_lock into elevator_change() (an exported function)
to ensure it is held to protect q->elevator from elevator_init(), even if
elevator_change() is called from non-sysfs paths.
sysfs path (elv_iosched_store) uses __elevator_change(), non-locking
version, as the lock is already taken by elv_iosched_store().
Signed-off-by: Tomoki Sekiyama <tomoki.sekiyama@hds.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/elevator.c')
| -rw-r--r-- | block/elevator.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/block/elevator.c b/block/elevator.c index 249cc5e10906..b7ff2861b6bd 100644 --- a/block/elevator.c +++ b/block/elevator.c @@ -965,7 +965,7 @@ fail_init: /* * Switch this queue to the given IO scheduler. */ -int elevator_change(struct request_queue *q, const char *name) +static int __elevator_change(struct request_queue *q, const char *name) { char elevator_name[ELV_NAME_MAX]; struct elevator_type *e; @@ -987,6 +987,18 @@ int elevator_change(struct request_queue *q, const char *name) return elevator_switch(q, e); } + +int elevator_change(struct request_queue *q, const char *name) +{ + int ret; + + /* Protect q->elevator from elevator_init() */ + mutex_lock(&q->sysfs_lock); + ret = __elevator_change(q, name); + mutex_unlock(&q->sysfs_lock); + + return ret; +} EXPORT_SYMBOL(elevator_change); ssize_t elv_iosched_store(struct request_queue *q, const char *name, @@ -997,7 +1009,7 @@ ssize_t elv_iosched_store(struct request_queue *q, const char *name, if (!q->elevator) return count; - ret = elevator_change(q, name); + ret = __elevator_change(q, name); if (!ret) return count; |