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.
Signed-off-by: Bart Van Assche
Reviewed-by: Martin K. Petersen
Acked-by: Martin K. Petersen
Cc: Martin K. Petersen
Cc: Mike Snitzer
Cc: Shaohua Li
Cc: Christoph Hellwig
Cc: Hannes Reinecke
Cc: Johannes Thumshirn
Cc: Ming Lei
---
block/bsg-lib.c | 4 ++--
drivers/block/drbd/drbd_nl.c| 4 ++--
drivers/block/loop.c| 10 +-
drivers/block/nbd.c | 8
drivers/block/null_blk.c| 6 +++---
drivers/block/rbd.c | 4 ++--
drivers/block/rsxx/dev.c| 6 +++---
drivers/block/skd_main.c| 4 ++--
drivers/block/xen-blkfront.c| 10 +-
drivers/block/zram/zram_drv.c | 6 +++---
drivers/ide/ide-disk.c | 4 ++--
drivers/ide/ide-probe.c | 2 +-
drivers/lightnvm/pblk-init.c| 2 +-
drivers/md/dm-table.c | 16
drivers/md/md-linear.c | 4 ++--
drivers/md/md.c | 4 ++--
drivers/md/raid0.c | 4 ++--
drivers/md/raid1.c | 6 +++---
drivers/md/raid10.c | 6 +++---
drivers/md/raid5.c | 4 ++--
drivers/mmc/core/queue.c| 8
drivers/mtd/mtd_blkdevs.c | 6 +++---
drivers/nvdimm/blk.c| 2 +-
drivers/nvdimm/btt.c| 2 +-
drivers/nvdimm/pmem.c | 4 ++--
drivers/nvme/host/core.c| 4 ++--
drivers/nvme/host/multipath.c | 2 +-
drivers/s390/block/dasd.c | 4 ++--
drivers/s390/block/dcssblk.c| 2 +-
drivers/s390/block/scm_blk.c| 4 ++--
drivers/s390/block/xpram.c | 4 ++--
drivers/scsi/megaraid/megaraid_sas_base.c | 2 +-
drivers/scsi/megaraid/megaraid_sas_fusion.c | 2 +-
drivers/scsi/mpt3sas/mpt3sas_scsih.c| 2 +-
drivers/scsi/scsi_debug.c | 2 +-
drivers/scsi/scsi_lib.c | 2 +-
drivers/scsi/scsi_transport_sas.c | 4 ++--
drivers/scsi/sd.c | 8
38 files changed, 89 insertions(+), 89 deletions(-)
diff --git a/block/bsg-lib.c b/block/bsg-lib.c
index 1474153f73e3..b4fe1a48f111 100644
--- a/block/bsg-lib.c
+++ b/block/bsg-lib.c
@@ -275,8 +275,8 @@ struct request_queue *bsg_setup_queue(struct device *dev,
const char *name,
q->queuedata = dev;
q->bsg_job_fn = job_fn;
- queue_flag_set_unlocked(QUEUE_FLAG_BIDI, q);
- queue_flag_set_unlocked(QUEUE_FLAG_SCSI_PASSTHROUGH, q);
+ blk_queue_flag_set(QUEUE_FLAG_BIDI, q);
+ blk_queue_flag_set(QUEUE_FLAG_SCSI_PASSTHROUGH, q);
blk_queue_softirq_done(q, bsg_softirq_done);
blk_queue_rq_timeout(q, BLK_DEFAULT_SG_TIMEOUT);
diff --git a/drivers/block/drbd/drbd_nl.c b/drivers/block/drbd/drbd_nl.c
index a12f77e6891e..b4f02768ba47 100644
--- a/drivers/block/drbd/drbd_nl.c
+++ b/drivers/block/drbd/drbd_nl.c
@@ -1212,10 +1212,10 @@ static void decide_on_discard_support(struct
drbd_device *device,
* topology on all peers. */
blk_queue_discard_granularity(q, 512);
q->limits.max_discard_sectors =
drbd_max_discard_sectors(connection);
- queue_flag_set_unlocked(QUEUE_FLAG_DISCARD, q);
+ blk_queue_flag_set(QUEUE_FLAG_DISCARD, q);
q->limits.max_write_zeroes_sectors =
drbd_max_discard_sectors(connection);
} else {
- queue_flag_clear_unlocked(QUEUE_FLAG_DISCARD, q);
+ blk_queue_flag_clear(QUEUE_FLAG_DISCARD, q);
blk_queue_discard_granularity(q, 0);
q->limits.max_discard_sectors = 0;
q->limits.max_write_zeroes_sectors = 0;
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index 9d29aa6413e5..7952ed5c607b 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -214,10 +214,10 @@ static void __loop_update_dio(struct loop_device *lo,
bool dio)
blk_mq_freeze_queue(lo->lo_queue);
lo->use_dio = use_dio;
if (use_dio) {
- queue_flag_clear_unlocked(QUEUE_FLAG_NOMERGES, lo->lo_queue);
+ blk_queue_flag_clear(QUEUE_FLAG_NOMERGES, lo->lo_queue);
lo->lo_flags |= LO_FLAGS_DIRECT_IO;
} else {
- queue_flag_set_unlocked(QUEUE_FLAG_NOMERGES, lo->lo_queue);
+
