Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[sfrench/cifs-2.6.git] / block / bfq-iosched.h

diff --git a/block/bfq-iosched.h b/block/bfq-iosched.h
index 5d47b58d5fc89c8c295ffbae5e8499a9ca8721be..350c39ae2896eb589f40c5d3e5b9c59969e03076 100644 (file)
--- a/block/bfq-iosched.h
+++ b/block/bfq-iosched.h
@@ -337,6 +337,11 @@ struct bfq_queue {
         * last transition from idle to backlogged.
         */
        unsigned long service_from_backlogged;
+       /*
+        * Cumulative service received from the @bfq_queue since its
+        * last transition to weight-raised state.
+        */
+       unsigned long service_from_wr;
 
        /*
         * Value of wr start time when switching to soft rt
@@ -629,6 +634,18 @@ struct bfq_data {
        struct bfq_io_cq *bio_bic;
        /* bfqq associated with the task issuing current bio for merging */
        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)
+        */
+       unsigned int word_depths[2][2];
 };
 
 enum bfqq_state_flags {