blk-throttle: remove THROTL_TG_HAS_IOPS_LIMIT

[linux-2.6-microblaze.git] / block / blk-throttle.h

diff --git a/block/blk-throttle.h b/block/blk-throttle.h
index 66b4292..3994b89 100644 (file)
--- a/block/blk-throttle.h
+++ b/block/blk-throttle.h
@@ -55,8 +55,7 @@ struct throtl_service_queue {
 enum tg_state_flags {
        THROTL_TG_PENDING       = 1 << 0,       /* on parent's pending tree */
        THROTL_TG_WAS_EMPTY     = 1 << 1,       /* bio_lists[] became non-empty */
-       THROTL_TG_HAS_IOPS_LIMIT = 1 << 2,      /* tg has iops limit */
-       THROTL_TG_CANCELING     = 1 << 3,       /* starts to cancel bio */
+       THROTL_TG_CANCELING     = 1 << 2,       /* starts to cancel bio */
 };
 
 enum {
@@ -183,11 +182,6 @@ static inline bool blk_throtl_bio(struct bio *bio)
 {
        struct throtl_grp *tg = blkg_to_tg(bio->bi_blkg);
 
-       /* no need to throttle bps any more if the bio has been throttled */
-       if (bio_flagged(bio, BIO_BPS_THROTTLED) &&
-           !(tg->flags & THROTL_TG_HAS_IOPS_LIMIT))
-               return false;
-
        if (!tg->has_rules[bio_data_dir(bio)])
                return false;