|
@@ -741,9 +741,17 @@ blk_init_allocated_queue(struct request_queue *q, request_fn_proc *rfn,
|
|
|
|
|
|
q->sg_reserved_size = INT_MAX;
|
|
q->sg_reserved_size = INT_MAX;
|
|
|
|
|
|
|
|
+ /* Protect q->elevator from elevator_change */
|
|
|
|
+ mutex_lock(&q->sysfs_lock);
|
|
|
|
+
|
|
/* init elevator */
|
|
/* init elevator */
|
|
- if (elevator_init(q, NULL))
|
|
|
|
|
|
+ if (elevator_init(q, NULL)) {
|
|
|
|
+ mutex_unlock(&q->sysfs_lock);
|
|
return NULL;
|
|
return NULL;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ mutex_unlock(&q->sysfs_lock);
|
|
|
|
+
|
|
return q;
|
|
return q;
|
|
}
|
|
}
|
|
EXPORT_SYMBOL(blk_init_allocated_queue);
|
|
EXPORT_SYMBOL(blk_init_allocated_queue);
|