Skip to content

Commit 8b904b5

Browse files
KAGA-KOKOaxboe
KAGA-KOKO
authored and
axboe
committed
block: Use blk_queue_flag_*() in drivers instead of queue_flag_*()
This patch has been generated as follows: for verb in set_unlocked clear_unlocked set clear; do replace-in-files queue_flag_${verb} blk_queue_flag_${verb%_unlocked} \ $(git grep -lw queue_flag_${verb} drivers block/bsg*) done Except for protecting all queue flag changes with the queue lock this patch does not change any functionality. Cc: Mike Snitzer <[email protected]> Cc: Shaohua Li <[email protected]> Cc: Christoph Hellwig <[email protected]> Cc: Hannes Reinecke <[email protected]> Cc: Ming Lei <[email protected]> Signed-off-by: Bart Van Assche <[email protected]> Reviewed-by: Martin K. Petersen <[email protected]> Reviewed-by: Johannes Thumshirn <[email protected]> Acked-by: Martin K. Petersen <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
1 parent bf3a2b3 commit 8b904b5

38 files changed

+89
-89
lines changed

‎block/bsg-lib.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -275,8 +275,8 @@ struct request_queue *bsg_setup_queue(struct device *dev, const char *name,
275275

276276
q->queuedata = dev;
277277
q->bsg_job_fn = job_fn;
278-
queue_flag_set_unlocked(QUEUE_FLAG_BIDI, q);
279-
queue_flag_set_unlocked(QUEUE_FLAG_SCSI_PASSTHROUGH, q);
278+
blk_queue_flag_set(QUEUE_FLAG_BIDI, q);
279+
blk_queue_flag_set(QUEUE_FLAG_SCSI_PASSTHROUGH, q);
280280
blk_queue_softirq_done(q, bsg_softirq_done);
281281
blk_queue_rq_timeout(q, BLK_DEFAULT_SG_TIMEOUT);
282282

‎drivers/block/drbd/drbd_nl.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1212,10 +1212,10 @@ static void decide_on_discard_support(struct drbd_device *device,
12121212
* topology on all peers. */
12131213
blk_queue_discard_granularity(q, 512);
12141214
q->limits.max_discard_sectors = drbd_max_discard_sectors(connection);
1215-
queue_flag_set_unlocked(QUEUE_FLAG_DISCARD, q);
1215+
blk_queue_flag_set(QUEUE_FLAG_DISCARD, q);
12161216
q->limits.max_write_zeroes_sectors = drbd_max_discard_sectors(connection);
12171217
} else {
1218-
queue_flag_clear_unlocked(QUEUE_FLAG_DISCARD, q);
1218+
blk_queue_flag_clear(QUEUE_FLAG_DISCARD, q);
12191219
blk_queue_discard_granularity(q, 0);
12201220
q->limits.max_discard_sectors = 0;
12211221
q->limits.max_write_zeroes_sectors = 0;

‎drivers/block/loop.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -214,10 +214,10 @@ static void __loop_update_dio(struct loop_device *lo, bool dio)
214214
blk_mq_freeze_queue(lo->lo_queue);
215215
lo->use_dio = use_dio;
216216
if (use_dio) {
217-
queue_flag_clear_unlocked(QUEUE_FLAG_NOMERGES, lo->lo_queue);
217+
blk_queue_flag_clear(QUEUE_FLAG_NOMERGES, lo->lo_queue);
218218
lo->lo_flags |= LO_FLAGS_DIRECT_IO;
219219
} else {
220-
queue_flag_set_unlocked(QUEUE_FLAG_NOMERGES, lo->lo_queue);
220+
blk_queue_flag_set(QUEUE_FLAG_NOMERGES, lo->lo_queue);
221221
lo->lo_flags &= ~LO_FLAGS_DIRECT_IO;
222222
}
223223
blk_mq_unfreeze_queue(lo->lo_queue);
@@ -817,7 +817,7 @@ static void loop_config_discard(struct loop_device *lo)
817817
q->limits.discard_alignment = 0;
818818
blk_queue_max_discard_sectors(q, 0);
819819
blk_queue_max_write_zeroes_sectors(q, 0);
820-
queue_flag_clear_unlocked(QUEUE_FLAG_DISCARD, q);
820+
blk_queue_flag_clear(QUEUE_FLAG_DISCARD, q);
821821
return;
822822
}
823823

@@ -826,7 +826,7 @@ static void loop_config_discard(struct loop_device *lo)
826826

827827
blk_queue_max_discard_sectors(q, UINT_MAX >> 9);
828828
blk_queue_max_write_zeroes_sectors(q, UINT_MAX >> 9);
829-
queue_flag_set_unlocked(QUEUE_FLAG_DISCARD, q);
829+
blk_queue_flag_set(QUEUE_FLAG_DISCARD, q);
830830
}
831831

832832
static void loop_unprepare_queue(struct loop_device *lo)
@@ -1808,7 +1808,7 @@ static int loop_add(struct loop_device **l, int i)
18081808
* page. For directio mode, merge does help to dispatch bigger request
18091809
* to underlayer disk. We will enable merge once directio is enabled.
18101810
*/
1811-
queue_flag_set_unlocked(QUEUE_FLAG_NOMERGES, lo->lo_queue);
1811+
blk_queue_flag_set(QUEUE_FLAG_NOMERGES, lo->lo_queue);
18121812

18131813
err = -ENOMEM;
18141814
disk = lo->lo_disk = alloc_disk(1 << part_shift);

‎drivers/block/nbd.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -964,7 +964,7 @@ static void nbd_parse_flags(struct nbd_device *nbd)
964964
else
965965
set_disk_ro(nbd->disk, false);
966966
if (config->flags & NBD_FLAG_SEND_TRIM)
967-
queue_flag_set_unlocked(QUEUE_FLAG_DISCARD, nbd->disk->queue);
967+
blk_queue_flag_set(QUEUE_FLAG_DISCARD, nbd->disk->queue);
968968
if (config->flags & NBD_FLAG_SEND_FLUSH) {
969969
if (config->flags & NBD_FLAG_SEND_FUA)
970970
blk_queue_write_cache(nbd->disk->queue, true, true);
@@ -1040,7 +1040,7 @@ static void nbd_config_put(struct nbd_device *nbd)
10401040
nbd->config = NULL;
10411041

10421042
nbd->tag_set.timeout = 0;
1043-
queue_flag_clear_unlocked(QUEUE_FLAG_DISCARD, nbd->disk->queue);
1043+
blk_queue_flag_clear(QUEUE_FLAG_DISCARD, nbd->disk->queue);
10441044

10451045
mutex_unlock(&nbd->config_lock);
10461046
nbd_put(nbd);
@@ -1488,8 +1488,8 @@ static int nbd_dev_add(int index)
14881488
/*
14891489
* Tell the block layer that we are not a rotational device
14901490
*/
1491-
queue_flag_set_unlocked(QUEUE_FLAG_NONROT, disk->queue);
1492-
queue_flag_clear_unlocked(QUEUE_FLAG_ADD_RANDOM, disk->queue);
1491+
blk_queue_flag_set(QUEUE_FLAG_NONROT, disk->queue);
1492+
blk_queue_flag_clear(QUEUE_FLAG_ADD_RANDOM, disk->queue);
14931493
disk->queue->limits.discard_granularity = 512;
14941494
blk_queue_max_discard_sectors(disk->queue, UINT_MAX);
14951495
blk_queue_max_segment_size(disk->queue, UINT_MAX);

‎drivers/block/null_blk.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1525,7 +1525,7 @@ static void null_config_discard(struct nullb *nullb)
15251525
nullb->q->limits.discard_granularity = nullb->dev->blocksize;
15261526
nullb->q->limits.discard_alignment = nullb->dev->blocksize;
15271527
blk_queue_max_discard_sectors(nullb->q, UINT_MAX >> 9);
1528-
queue_flag_set_unlocked(QUEUE_FLAG_DISCARD, nullb->q);
1528+
blk_queue_flag_set(QUEUE_FLAG_DISCARD, nullb->q);
15291529
}
15301530

15311531
static int null_open(struct block_device *bdev, fmode_t mode)
@@ -1810,8 +1810,8 @@ static int null_add_dev(struct nullb_device *dev)
18101810
}
18111811

18121812
nullb->q->queuedata = nullb;
1813-
queue_flag_set_unlocked(QUEUE_FLAG_NONROT, nullb->q);
1814-
queue_flag_clear_unlocked(QUEUE_FLAG_ADD_RANDOM, nullb->q);
1813+
blk_queue_flag_set(QUEUE_FLAG_NONROT, nullb->q);
1814+
blk_queue_flag_clear(QUEUE_FLAG_ADD_RANDOM, nullb->q);
18151815

18161816
mutex_lock(&lock);
18171817
nullb->index = ida_simple_get(&nullb_indexes, 0, 0, GFP_KERNEL);

‎drivers/block/rbd.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4370,7 +4370,7 @@ static int rbd_init_disk(struct rbd_device *rbd_dev)
43704370
goto out_tag_set;
43714371
}
43724372

4373-
queue_flag_set_unlocked(QUEUE_FLAG_NONROT, q);
4373+
blk_queue_flag_set(QUEUE_FLAG_NONROT, q);
43744374
/* QUEUE_FLAG_ADD_RANDOM is off by default for blk-mq */
43754375

43764376
/* set io sizes to object size */
@@ -4383,7 +4383,7 @@ static int rbd_init_disk(struct rbd_device *rbd_dev)
43834383
blk_queue_io_opt(q, segment_size);
43844384

43854385
/* enable the discard support */
4386-
queue_flag_set_unlocked(QUEUE_FLAG_DISCARD, q);
4386+
blk_queue_flag_set(QUEUE_FLAG_DISCARD, q);
43874387
q->limits.discard_granularity = segment_size;
43884388
blk_queue_max_discard_sectors(q, segment_size / SECTOR_SIZE);
43894389
blk_queue_max_write_zeroes_sectors(q, segment_size / SECTOR_SIZE);

‎drivers/block/rsxx/dev.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -287,10 +287,10 @@ int rsxx_setup_dev(struct rsxx_cardinfo *card)
287287
blk_queue_max_hw_sectors(card->queue, blkdev_max_hw_sectors);
288288
blk_queue_physical_block_size(card->queue, RSXX_HW_BLK_SIZE);
289289

290-
queue_flag_set_unlocked(QUEUE_FLAG_NONROT, card->queue);
291-
queue_flag_clear_unlocked(QUEUE_FLAG_ADD_RANDOM, card->queue);
290+
blk_queue_flag_set(QUEUE_FLAG_NONROT, card->queue);
291+
blk_queue_flag_clear(QUEUE_FLAG_ADD_RANDOM, card->queue);
292292
if (rsxx_discard_supported(card)) {
293-
queue_flag_set_unlocked(QUEUE_FLAG_DISCARD, card->queue);
293+
blk_queue_flag_set(QUEUE_FLAG_DISCARD, card->queue);
294294
blk_queue_max_discard_sectors(card->queue,
295295
RSXX_HW_BLK_SIZE >> 9);
296296
card->queue->limits.discard_granularity = RSXX_HW_BLK_SIZE;

‎drivers/block/skd_main.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2858,8 +2858,8 @@ static int skd_cons_disk(struct skd_device *skdev)
28582858
/* set optimal I/O size to 8KB */
28592859
blk_queue_io_opt(q, 8192);
28602860

2861-
queue_flag_set_unlocked(QUEUE_FLAG_NONROT, q);
2862-
queue_flag_clear_unlocked(QUEUE_FLAG_ADD_RANDOM, q);
2861+
blk_queue_flag_set(QUEUE_FLAG_NONROT, q);
2862+
blk_queue_flag_clear(QUEUE_FLAG_ADD_RANDOM, q);
28632863

28642864
blk_queue_rq_timeout(q, 8 * HZ);
28652865

‎drivers/block/xen-blkfront.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -931,15 +931,15 @@ static void blkif_set_queue_limits(struct blkfront_info *info)
931931
unsigned int segments = info->max_indirect_segments ? :
932932
BLKIF_MAX_SEGMENTS_PER_REQUEST;
933933

934-
queue_flag_set_unlocked(QUEUE_FLAG_VIRT, rq);
934+
blk_queue_flag_set(QUEUE_FLAG_VIRT, rq);
935935

936936
if (info->feature_discard) {
937-
queue_flag_set_unlocked(QUEUE_FLAG_DISCARD, rq);
937+
blk_queue_flag_set(QUEUE_FLAG_DISCARD, rq);
938938
blk_queue_max_discard_sectors(rq, get_capacity(gd));
939939
rq->limits.discard_granularity = info->discard_granularity;
940940
rq->limits.discard_alignment = info->discard_alignment;
941941
if (info->feature_secdiscard)
942-
queue_flag_set_unlocked(QUEUE_FLAG_SECERASE, rq);
942+
blk_queue_flag_set(QUEUE_FLAG_SECERASE, rq);
943943
}
944944

945945
/* Hard sector size and max sectors impersonate the equiv. hardware. */
@@ -1610,8 +1610,8 @@ static irqreturn_t blkif_interrupt(int irq, void *dev_id)
16101610
blkif_req(req)->error = BLK_STS_NOTSUPP;
16111611
info->feature_discard = 0;
16121612
info->feature_secdiscard = 0;
1613-
queue_flag_clear(QUEUE_FLAG_DISCARD, rq);
1614-
queue_flag_clear(QUEUE_FLAG_SECERASE, rq);
1613+
blk_queue_flag_clear(QUEUE_FLAG_DISCARD, rq);
1614+
blk_queue_flag_clear(QUEUE_FLAG_SECERASE, rq);
16151615
}
16161616
break;
16171617
case BLKIF_OP_FLUSH_DISKCACHE:

‎drivers/block/zram/zram_drv.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1530,8 +1530,8 @@ static int zram_add(void)
15301530
/* Actual capacity set using syfs (/sys/block/zram<id>/disksize */
15311531
set_capacity(zram->disk, 0);
15321532
/* zram devices sort of resembles non-rotational disks */
1533-
queue_flag_set_unlocked(QUEUE_FLAG_NONROT, zram->disk->queue);
1534-
queue_flag_clear_unlocked(QUEUE_FLAG_ADD_RANDOM, zram->disk->queue);
1533+
blk_queue_flag_set(QUEUE_FLAG_NONROT, zram->disk->queue);
1534+
blk_queue_flag_clear(QUEUE_FLAG_ADD_RANDOM, zram->disk->queue);
15351535

15361536
/*
15371537
* To ensure that we always get PAGE_SIZE aligned
@@ -1544,7 +1544,7 @@ static int zram_add(void)
15441544
blk_queue_io_opt(zram->disk->queue, PAGE_SIZE);
15451545
zram->disk->queue->limits.discard_granularity = PAGE_SIZE;
15461546
blk_queue_max_discard_sectors(zram->disk->queue, UINT_MAX);
1547-
queue_flag_set_unlocked(QUEUE_FLAG_DISCARD, zram->disk->queue);
1547+
blk_queue_flag_set(QUEUE_FLAG_DISCARD, zram->disk->queue);
15481548

15491549
/*
15501550
* zram_bio_discard() will clear all logical blocks if logical block

‎drivers/ide/ide-disk.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -687,8 +687,8 @@ static void ide_disk_setup(ide_drive_t *drive)
687687
queue_max_sectors(q) / 2);
688688

689689
if (ata_id_is_ssd(id)) {
690-
queue_flag_set_unlocked(QUEUE_FLAG_NONROT, q);
691-
queue_flag_clear_unlocked(QUEUE_FLAG_ADD_RANDOM, q);
690+
blk_queue_flag_set(QUEUE_FLAG_NONROT, q);
691+
blk_queue_flag_clear(QUEUE_FLAG_ADD_RANDOM, q);
692692
}
693693

694694
/* calculate drive capacity, and select LBA if possible */

‎drivers/ide/ide-probe.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -773,7 +773,7 @@ static int ide_init_queue(ide_drive_t *drive)
773773
q->request_fn = do_ide_request;
774774
q->initialize_rq_fn = ide_initialize_rq;
775775
q->cmd_size = sizeof(struct ide_request);
776-
queue_flag_set_unlocked(QUEUE_FLAG_SCSI_PASSTHROUGH, q);
776+
blk_queue_flag_set(QUEUE_FLAG_SCSI_PASSTHROUGH, q);
777777
if (blk_init_allocated_queue(q) < 0) {
778778
blk_cleanup_queue(q);
779779
return 1;

‎drivers/lightnvm/pblk-init.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1067,7 +1067,7 @@ static void *pblk_init(struct nvm_tgt_dev *dev, struct gendisk *tdisk,
10671067
tqueue->limits.discard_granularity = geo->sec_per_chk * geo->sec_size;
10681068
tqueue->limits.discard_alignment = 0;
10691069
blk_queue_max_discard_sectors(tqueue, UINT_MAX >> 9);
1070-
queue_flag_set_unlocked(QUEUE_FLAG_DISCARD, tqueue);
1070+
blk_queue_flag_set(QUEUE_FLAG_DISCARD, tqueue);
10711071

10721072
pr_info("pblk(%s): luns:%u, lines:%d, secs:%llu, buf entries:%u\n",
10731073
tdisk->disk_name,

‎drivers/md/dm-table.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1861,15 +1861,15 @@ void dm_table_set_restrictions(struct dm_table *t, struct request_queue *q,
18611861
q->limits = *limits;
18621862

18631863
if (!dm_table_supports_discards(t)) {
1864-
queue_flag_clear_unlocked(QUEUE_FLAG_DISCARD, q);
1864+
blk_queue_flag_clear(QUEUE_FLAG_DISCARD, q);
18651865
/* Must also clear discard limits... */
18661866
q->limits.max_discard_sectors = 0;
18671867
q->limits.max_hw_discard_sectors = 0;
18681868
q->limits.discard_granularity = 0;
18691869
q->limits.discard_alignment = 0;
18701870
q->limits.discard_misaligned = 0;
18711871
} else
1872-
queue_flag_set_unlocked(QUEUE_FLAG_DISCARD, q);
1872+
blk_queue_flag_set(QUEUE_FLAG_DISCARD, q);
18731873

18741874
if (dm_table_supports_flush(t, (1UL << QUEUE_FLAG_WC))) {
18751875
wc = true;
@@ -1879,25 +1879,25 @@ void dm_table_set_restrictions(struct dm_table *t, struct request_queue *q,
18791879
blk_queue_write_cache(q, wc, fua);
18801880

18811881
if (dm_table_supports_dax(t))
1882-
queue_flag_set_unlocked(QUEUE_FLAG_DAX, q);
1882+
blk_queue_flag_set(QUEUE_FLAG_DAX, q);
18831883
if (dm_table_supports_dax_write_cache(t))
18841884
dax_write_cache(t->md->dax_dev, true);
18851885

18861886
/* Ensure that all underlying devices are non-rotational. */
18871887
if (dm_table_all_devices_attribute(t, device_is_nonrot))
1888-
queue_flag_set_unlocked(QUEUE_FLAG_NONROT, q);
1888+
blk_queue_flag_set(QUEUE_FLAG_NONROT, q);
18891889
else
1890-
queue_flag_clear_unlocked(QUEUE_FLAG_NONROT, q);
1890+
blk_queue_flag_clear(QUEUE_FLAG_NONROT, q);
18911891

18921892
if (!dm_table_supports_write_same(t))
18931893
q->limits.max_write_same_sectors = 0;
18941894
if (!dm_table_supports_write_zeroes(t))
18951895
q->limits.max_write_zeroes_sectors = 0;
18961896

18971897
if (dm_table_all_devices_attribute(t, queue_supports_sg_merge))
1898-
queue_flag_clear_unlocked(QUEUE_FLAG_NO_SG_MERGE, q);
1898+
blk_queue_flag_clear(QUEUE_FLAG_NO_SG_MERGE, q);
18991899
else
1900-
queue_flag_set_unlocked(QUEUE_FLAG_NO_SG_MERGE, q);
1900+
blk_queue_flag_set(QUEUE_FLAG_NO_SG_MERGE, q);
19011901

19021902
dm_table_verify_integrity(t);
19031903

@@ -1908,7 +1908,7 @@ void dm_table_set_restrictions(struct dm_table *t, struct request_queue *q,
19081908
* have it set.
19091909
*/
19101910
if (blk_queue_add_random(q) && dm_table_all_devices_attribute(t, device_is_not_random))
1911-
queue_flag_clear_unlocked(QUEUE_FLAG_ADD_RANDOM, q);
1911+
blk_queue_flag_clear(QUEUE_FLAG_ADD_RANDOM, q);
19121912
}
19131913

19141914
unsigned int dm_table_get_num_targets(struct dm_table *t)

‎drivers/md/md-linear.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,9 +138,9 @@ static struct linear_conf *linear_conf(struct mddev *mddev, int raid_disks)
138138
}
139139

140140
if (!discard_supported)
141-
queue_flag_clear_unlocked(QUEUE_FLAG_DISCARD, mddev->queue);
141+
blk_queue_flag_clear(QUEUE_FLAG_DISCARD, mddev->queue);
142142
else
143-
queue_flag_set_unlocked(QUEUE_FLAG_DISCARD, mddev->queue);
143+
blk_queue_flag_set(QUEUE_FLAG_DISCARD, mddev->queue);
144144

145145
/*
146146
* Here we calculate the device offsets.

‎drivers/md/md.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5608,9 +5608,9 @@ int md_run(struct mddev *mddev)
56085608
if (mddev->degraded)
56095609
nonrot = false;
56105610
if (nonrot)
5611-
queue_flag_set_unlocked(QUEUE_FLAG_NONROT, mddev->queue);
5611+
blk_queue_flag_set(QUEUE_FLAG_NONROT, mddev->queue);
56125612
else
5613-
queue_flag_clear_unlocked(QUEUE_FLAG_NONROT, mddev->queue);
5613+
blk_queue_flag_clear(QUEUE_FLAG_NONROT, mddev->queue);
56145614
mddev->queue->backing_dev_info->congested_data = mddev;
56155615
mddev->queue->backing_dev_info->congested_fn = md_congested;
56165616
}

‎drivers/md/raid0.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -399,9 +399,9 @@ static int raid0_run(struct mddev *mddev)
399399
discard_supported = true;
400400
}
401401
if (!discard_supported)
402-
queue_flag_clear_unlocked(QUEUE_FLAG_DISCARD, mddev->queue);
402+
blk_queue_flag_clear(QUEUE_FLAG_DISCARD, mddev->queue);
403403
else
404-
queue_flag_set_unlocked(QUEUE_FLAG_DISCARD, mddev->queue);
404+
blk_queue_flag_set(QUEUE_FLAG_DISCARD, mddev->queue);
405405
}
406406

407407
/* calculate array device size */

‎drivers/md/raid1.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1760,7 +1760,7 @@ static int raid1_add_disk(struct mddev *mddev, struct md_rdev *rdev)
17601760
}
17611761
}
17621762
if (mddev->queue && blk_queue_discard(bdev_get_queue(rdev->bdev)))
1763-
queue_flag_set_unlocked(QUEUE_FLAG_DISCARD, mddev->queue);
1763+
blk_queue_flag_set(QUEUE_FLAG_DISCARD, mddev->queue);
17641764
print_conf(conf);
17651765
return err;
17661766
}
@@ -3099,10 +3099,10 @@ static int raid1_run(struct mddev *mddev)
30993099

31003100
if (mddev->queue) {
31013101
if (discard_supported)
3102-
queue_flag_set_unlocked(QUEUE_FLAG_DISCARD,
3102+
blk_queue_flag_set(QUEUE_FLAG_DISCARD,
31033103
mddev->queue);
31043104
else
3105-
queue_flag_clear_unlocked(QUEUE_FLAG_DISCARD,
3105+
blk_queue_flag_clear(QUEUE_FLAG_DISCARD,
31063106
mddev->queue);
31073107
}
31083108

‎drivers/md/raid10.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1845,7 +1845,7 @@ static int raid10_add_disk(struct mddev *mddev, struct md_rdev *rdev)
18451845
break;
18461846
}
18471847
if (mddev->queue && blk_queue_discard(bdev_get_queue(rdev->bdev)))
1848-
queue_flag_set_unlocked(QUEUE_FLAG_DISCARD, mddev->queue);
1848+
blk_queue_flag_set(QUEUE_FLAG_DISCARD, mddev->queue);
18491849

18501850
print_conf(conf);
18511851
return err;
@@ -3844,10 +3844,10 @@ static int raid10_run(struct mddev *mddev)
38443844

38453845
if (mddev->queue) {
38463846
if (discard_supported)
3847-
queue_flag_set_unlocked(QUEUE_FLAG_DISCARD,
3847+
blk_queue_flag_set(QUEUE_FLAG_DISCARD,
38483848
mddev->queue);
38493849
else
3850-
queue_flag_clear_unlocked(QUEUE_FLAG_DISCARD,
3850+
blk_queue_flag_clear(QUEUE_FLAG_DISCARD,
38513851
mddev->queue);
38523852
}
38533853
/* need to check that every block has at least one working mirror */

‎drivers/md/raid5.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7444,10 +7444,10 @@ static int raid5_run(struct mddev *mddev)
74447444
if (devices_handle_discard_safely &&
74457445
mddev->queue->limits.max_discard_sectors >= (stripe >> 9) &&
74467446
mddev->queue->limits.discard_granularity >= stripe)
7447-
queue_flag_set_unlocked(QUEUE_FLAG_DISCARD,
7447+
blk_queue_flag_set(QUEUE_FLAG_DISCARD,
74487448
mddev->queue);
74497449
else
7450-
queue_flag_clear_unlocked(QUEUE_FLAG_DISCARD,
7450+
blk_queue_flag_clear(QUEUE_FLAG_DISCARD,
74517451
mddev->queue);
74527452

74537453
blk_queue_max_hw_sectors(mddev->queue, UINT_MAX);

0 commit comments

Comments
 (0)