Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

[platform/kernel/linux-rpi.git] / drivers / s390 / block / dasd.c

diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index c89c26e..04143c0 100644 (file)
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -3208,7 +3208,7 @@ static void dasd_setup_queue(struct dasd_block *block)
        } else {
                max = block->base->discipline->max_blocks << block->s2b_shift;
        }
-       queue_flag_set_unlocked(QUEUE_FLAG_NONROT, q);
+       blk_queue_flag_set(QUEUE_FLAG_NONROT, q);
        q->limits.max_dev_sectors = max;
        blk_queue_logical_block_size(q, logical_block_size);
        blk_queue_max_hw_sectors(q, max);
@@ -3231,7 +3231,7 @@ static void dasd_setup_queue(struct dasd_block *block)
 
                blk_queue_max_discard_sectors(q, max_discard_sectors);
                blk_queue_max_write_zeroes_sectors(q, max_discard_sectors);
-               queue_flag_set_unlocked(QUEUE_FLAG_DISCARD, q);
+               blk_queue_flag_set(QUEUE_FLAG_DISCARD, q);
        }
 }