elevator: Fix a race in elevator switching and md device initialization

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / block / elevator.c

diff --git a/block/elevator.c b/block/elevator.c
index 668394d185885bc3fcc878697878a4cb07be899e..02d4390afeebde962cd328c9a6a64fe37b3c91fd 100644 (file)
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -186,6 +186,12 @@ int elevator_init(struct request_queue *q, char *name)
        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;