Merge tag 'fuse-update-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/mszered...

[platform/kernel/linux-starfive.git] / block / bfq-iosched.h

diff --git a/block/bfq-iosched.h b/block/bfq-iosched.h
index ae2f3da..0f712e0 100644 (file)
--- a/block/bfq-iosched.h
+++ b/block/bfq-iosched.h
@@ -399,11 +399,6 @@ struct bfq_io_cq {
        struct bfq_ttime saved_ttime;
 };
 
-enum bfq_device_speed {
-       BFQ_BFQD_FAST,
-       BFQ_BFQD_SLOW,
-};
-
 /**
  * struct bfq_data - per-device data structure.
  *
@@ -611,12 +606,11 @@ struct bfq_data {
        /* Max service-rate for a soft real-time queue, in sectors/sec */
        unsigned int bfq_wr_max_softrt_rate;
        /*
-        * Cached value of the product R*T, used for computing the
-        * maximum duration of weight raising automatically.
+        * Cached value of the product ref_rate*ref_wr_duration, used
+        * for computing the maximum duration of weight raising
+        * automatically.
         */
-       u64 RT_prod;
-       /* device-speed class for the low-latency heuristic */
-       enum bfq_device_speed device_speed;
+       u64 rate_dur_prod;
 
        /* fallback dummy bfqq for extreme OOM conditions */
        struct bfq_queue oom_bfqq;
@@ -636,12 +630,6 @@ struct bfq_data {
        struct bfq_queue *bio_bfqq;
 
        /*
-        * Cached sbitmap shift, used to compute depth limits in
-        * bfq_update_depths.
-        */
-       unsigned int sb_shift;
-
-       /*
         * Depth limits used in bfq_limit_depth (see comments on the
         * function)
         */
@@ -732,9 +720,9 @@ struct bfqg_stats {
        /* total time with empty current active q with other requests queued */
        struct blkg_stat                empty_time;
        /* fields after this shouldn't be cleared on stat reset */
-       uint64_t                        start_group_wait_time;
-       uint64_t                        start_idle_time;
-       uint64_t                        start_empty_time;
+       u64                             start_group_wait_time;
+       u64                             start_idle_time;
+       u64                             start_empty_time;
        uint16_t                        flags;
 #endif /* CONFIG_BFQ_GROUP_IOSCHED && CONFIG_DEBUG_BLK_CGROUP */
 };
@@ -856,8 +844,8 @@ void bfqg_stats_update_io_add(struct bfq_group *bfqg, struct bfq_queue *bfqq,
                              unsigned int op);
 void bfqg_stats_update_io_remove(struct bfq_group *bfqg, unsigned int op);
 void bfqg_stats_update_io_merged(struct bfq_group *bfqg, unsigned int op);
-void bfqg_stats_update_completion(struct bfq_group *bfqg, uint64_t start_time,
-                                 uint64_t io_start_time, unsigned int op);
+void bfqg_stats_update_completion(struct bfq_group *bfqg, u64 start_time_ns,
+                                 u64 io_start_time_ns, unsigned int op);
 void bfqg_stats_update_dequeue(struct bfq_group *bfqg);
 void bfqg_stats_set_start_empty_time(struct bfq_group *bfqg);
 void bfqg_stats_update_idle_time(struct bfq_group *bfqg);