Merge tag 'trace-v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...

[linux-2.6-block.git] / drivers / md / raid5.c

diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index b5d2601483e34fa97fc8cfb7faeff6f014c0e035..be117d0a65a81c55d2141a8c5646bfd68192d16d 100644 (file)
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -7443,10 +7443,10 @@ static int raid5_run(struct mddev *mddev)
                if (devices_handle_discard_safely &&
                    mddev->queue->limits.max_discard_sectors >= (stripe >> 9) &&
                    mddev->queue->limits.discard_granularity >= stripe)
-                       queue_flag_set_unlocked(QUEUE_FLAG_DISCARD,
+                       blk_queue_flag_set(QUEUE_FLAG_DISCARD,
                                                mddev->queue);
                else
-                       queue_flag_clear_unlocked(QUEUE_FLAG_DISCARD,
+                       blk_queue_flag_clear(QUEUE_FLAG_DISCARD,
                                                mddev->queue);
 
                blk_queue_max_hw_sectors(mddev->queue, UINT_MAX);