aboutsummaryrefslogtreecommitdiffstats
path: root/block/blk-cgroup.c
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2018-11-14 11:02:04 -0500
committerJens Axboe <axboe@kernel.dk>2018-11-15 14:13:15 -0500
commit8f4236d9008b0973a8281256ccfde6913cdec6cb (patch)
treedf22388e2396b014899b7db04d0e08c303adb1da /block/blk-cgroup.c
parente96c0d8336fdc5f1a6cae798bfa9c6e730001ad4 (diff)
block: remove QUEUE_FLAG_BYPASS and ->bypass
Unused since the removal of the legacy request code. Reviewed-by: Hannes Reinecke <hare@suse.com> Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/blk-cgroup.c')
-rw-r--r--block/blk-cgroup.c15
1 files changed, 0 insertions, 15 deletions
diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
index 6c65791bc3fe..a95cddb39f1c 100644
--- a/block/blk-cgroup.c
+++ b/block/blk-cgroup.c
@@ -270,13 +270,6 @@ struct blkcg_gq *blkg_lookup_create(struct blkcg *blkcg,
270 WARN_ON_ONCE(!rcu_read_lock_held()); 270 WARN_ON_ONCE(!rcu_read_lock_held());
271 lockdep_assert_held(q->queue_lock); 271 lockdep_assert_held(q->queue_lock);
272 272
273 /*
274 * This could be the first entry point of blkcg implementation and
275 * we shouldn't allow anything to go through for a bypassing queue.
276 */
277 if (unlikely(blk_queue_bypass(q)))
278 return ERR_PTR(blk_queue_dying(q) ? -ENODEV : -EBUSY);
279
280 blkg = __blkg_lookup(blkcg, q, true); 273 blkg = __blkg_lookup(blkcg, q, true);
281 if (blkg) 274 if (blkg)
282 return blkg; 275 return blkg;
@@ -741,14 +734,6 @@ static struct blkcg_gq *blkg_lookup_check(struct blkcg *blkcg,
741 734
742 if (!blkcg_policy_enabled(q, pol)) 735 if (!blkcg_policy_enabled(q, pol))
743 return ERR_PTR(-EOPNOTSUPP); 736 return ERR_PTR(-EOPNOTSUPP);
744
745 /*
746 * This could be the first entry point of blkcg implementation and
747 * we shouldn't allow anything to go through for a bypassing queue.
748 */
749 if (unlikely(blk_queue_bypass(q)))
750 return ERR_PTR(blk_queue_dying(q) ? -ENODEV : -EBUSY);
751
752 return __blkg_lookup(blkcg, q, true /* update_hint */); 737 return __blkg_lookup(blkcg, q, true /* update_hint */);
753} 738}
754 739