Merge tag 'dma-mapping-5.4' of git://git.infradead.org/users/hch/dma-mapping

[mirror_ubuntu-jammy-kernel.git] / block / blk-settings.c

diff --git a/block/blk-settings.c b/block/blk-settings.c
index c3632fc6d54046566dad6a74835c99fdfb8be6ff..5f6dcc7a47bd92745341feee781cb2f2d3fa58b2 100644 (file)
--- a/block/blk-settings.c
+++ b/block/blk-settings.c
@@ -806,7 +806,7 @@ EXPORT_SYMBOL(blk_queue_update_dma_alignment);
 void blk_set_queue_depth(struct request_queue *q, unsigned int depth)
 {
        q->queue_depth = depth;
-       wbt_set_queue_depth(q, depth);
+       rq_qos_queue_depth_changed(q);
 }
 EXPORT_SYMBOL(blk_set_queue_depth);
 
@@ -833,6 +833,22 @@ void blk_queue_write_cache(struct request_queue *q, bool wc, bool fua)
 }
 EXPORT_SYMBOL_GPL(blk_queue_write_cache);
 
+/**
+ * blk_queue_required_elevator_features - Set a queue required elevator features
+ * @q:         the request queue for the target device
+ * @features:  Required elevator features OR'ed together
+ *
+ * Tell the block layer that for the device controlled through @q, only the
+ * only elevators that can be used are those that implement at least the set of
+ * features specified by @features.
+ */
+void blk_queue_required_elevator_features(struct request_queue *q,
+                                         unsigned int features)
+{
+       q->required_elevator_features = features;
+}
+EXPORT_SYMBOL_GPL(blk_queue_required_elevator_features);
+
 /**
  * blk_queue_can_use_dma_map_merging - configure queue for merging segments.
  * @q:         the request queue for the device