diff options
| author |   Jens Axboe <axboe@fb.com> | 2017-03-29 11:25:48 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2017-03-29 11:25:48 -0600 |
| commit | d708f0d5026f48081debdd1c5b0a5636455a9589 (patch) | |
| tree | 6e11aa8a25058fa7a6190cf2d477f1ce44bb172f /include/linux | |
| parent | blk-mq: fix a typo and a spelling mistake (diff) | |
| download | linux-dev-d708f0d5026f48081debdd1c5b0a5636455a9589.tar.xz linux-dev-d708f0d5026f48081debdd1c5b0a5636455a9589.zip | |
Revert "blkcg: allocate struct blkcg_gq outside request queue spinlock"
I inadvertently applied the v5 version of this patch, whereas
the agreed upon version was v5. Revert this one so we can apply
the right one.
This reverts commit 7fc6b87a9ff537e7df32b1278118ce9c5bcd6788.
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/blk-cgroup.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/linux/blk-cgroup.h b/include/linux/blk-cgroup.h index 955903a8f6cb..01b62e7bac74 100644 --- a/include/linux/blk-cgroup.h +++ b/include/linux/blk-cgroup.h @@ -172,8 +172,7 @@ extern struct cgroup_subsys_state * const blkcg_root_css; struct blkcg_gq *blkg_lookup_slowpath(struct blkcg *blkcg, struct request_queue *q, bool update_hint); struct blkcg_gq *blkg_lookup_create(struct blkcg *blkcg, - struct request_queue *q, gfp_t gfp, - const struct blkcg_policy *pol); + struct request_queue *q); int blkcg_init_queue(struct request_queue *q); void blkcg_drain_queue(struct request_queue *q); void blkcg_exit_queue(struct request_queue *q); @@ -695,8 +694,7 @@ static inline bool blkcg_bio_issue_check(struct request_queue *q, blkg = blkg_lookup(blkcg, q); if (unlikely(!blkg)) { spin_lock_irq(q->queue_lock); - blkg = blkg_lookup_create(blkcg, q, GFP_NOWAIT | __GFP_NOWARN, - NULL); + blkg = blkg_lookup_create(blkcg, q); if (IS_ERR(blkg)) blkg = NULL; spin_unlock_irq(q->queue_lock); |