projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Linux 3.10.49
[firefly-linux-kernel-4.4.55.git]
/
block
/
elevator.c
diff --git
a/block/elevator.c
b/block/elevator.c
index eba5b04c29b135bdc6b84ac80690d380d59dd8a5..6d765f7e2b2bd905984ee54fc4dde56d1f5d1744 100644
(file)
--- a/
block/elevator.c
+++ b/
block/elevator.c
@@
-150,7
+150,7
@@
void __init load_default_elevator_module(void)
static struct kobj_type elv_ktype;
static struct kobj_type elv_ktype;
-st
atic st
ruct elevator_queue *elevator_alloc(struct request_queue *q,
+struct elevator_queue *elevator_alloc(struct request_queue *q,
struct elevator_type *e)
{
struct elevator_queue *eq;
struct elevator_type *e)
{
struct elevator_queue *eq;
@@
-170,6
+170,7
@@
err:
elevator_put(e);
return NULL;
}
elevator_put(e);
return NULL;
}
+EXPORT_SYMBOL(elevator_alloc);
static void elevator_release(struct kobject *kobj)
{
static void elevator_release(struct kobject *kobj)
{
@@
-185,6
+186,12
@@
int elevator_init(struct request_queue *q, char *name)
struct elevator_type *e = NULL;
int err;
struct elevator_type *e = NULL;
int err;
+ /*
+ * q->sysfs_lock must be held to provide mutual exclusion between
+ * elevator_switch() and here.
+ */
+ lockdep_assert_held(&q->sysfs_lock);
+
if (unlikely(q->elevator))
return 0;
if (unlikely(q->elevator))
return 0;
@@
-221,16
+228,7
@@
int elevator_init(struct request_queue *q, char *name)
}
}
}
}
- q->elevator = elevator_alloc(q, e);
- if (!q->elevator)
- return -ENOMEM;
-
- err = e->ops.elevator_init_fn(q);
- if (err) {
- kobject_put(&q->elevator->kobj);
- return err;
- }
-
+ err = e->ops.elevator_init_fn(q, e);
return 0;
}
EXPORT_SYMBOL(elevator_init);
return 0;
}
EXPORT_SYMBOL(elevator_init);
@@
-935,16
+933,9
@@
static int elevator_switch(struct request_queue *q, struct elevator_type *new_e)
spin_unlock_irq(q->queue_lock);
/* allocate, init and register new elevator */
spin_unlock_irq(q->queue_lock);
/* allocate, init and register new elevator */
- err = -ENOMEM;
- q->elevator = elevator_alloc(q, new_e);
- if (!q->elevator)
- goto fail_init;
-
- err = new_e->ops.elevator_init_fn(q);
- if (err) {
- kobject_put(&q->elevator->kobj);
+ err = new_e->ops.elevator_init_fn(q, new_e);
+ if (err)
goto fail_init;
goto fail_init;
- }
if (registered) {
err = elv_register_queue(q);
if (registered) {
err = elv_register_queue(q);
@@
-974,7
+965,7
@@
fail_init:
/*
* Switch this queue to the given IO scheduler.
*/
/*
* 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;
{
char elevator_name[ELV_NAME_MAX];
struct elevator_type *e;
@@
-996,6
+987,18
@@
int elevator_change(struct request_queue *q, const char *name)
return elevator_switch(q, e);
}
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,
EXPORT_SYMBOL(elevator_change);
ssize_t elv_iosched_store(struct request_queue *q, const char *name,
@@
-1006,7
+1009,7
@@
ssize_t elv_iosched_store(struct request_queue *q, const char *name,
if (!q->elevator)
return count;
if (!q->elevator)
return count;
- ret = elevator_change(q, name);
+ ret =
__
elevator_change(q, name);
if (!ret)
return count;
if (!ret)
return count;