diff options
| author | Christoph Hellwig <hch@lst.de> | 2020-04-28 13:27:55 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2020-04-29 09:33:26 -0600 |
| commit | 0376e9efe18388bd486a65edbc16d34b84bddc8f (patch) | |
| tree | 6382ef0862fc9c4433dfaa2ed64e2e663b00b7b9 /block/blk-merge.c | |
| parent | 760f83ea63a7b2c12b3b1e656b24cbb880b6b814 (diff) | |
| download | linux-0376e9efe18388bd486a65edbc16d34b84bddc8f.tar.bz2 | |
block: replace BIO_QUEUE_ENTERED with BIO_CGROUP_ACCT
BIO_QUEUE_ENTERED is only used for cgroup accounting now, so rename
the flag and move setting it into the cgroup code.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/blk-merge.c')
| -rw-r--r-- | block/blk-merge.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/block/blk-merge.c b/block/blk-merge.c index c49eb3bdd0be..a04e991b5ded 100644 --- a/block/blk-merge.c +++ b/block/blk-merge.c @@ -336,16 +336,6 @@ void __blk_queue_split(struct request_queue *q, struct bio **bio, /* there isn't chance to merge the splitted bio */ split->bi_opf |= REQ_NOMERGE; - /* - * Since we're recursing into make_request here, ensure - * that we mark this bio as already having entered the queue. - * If not, and the queue is going away, we can get stuck - * forever on waiting for the queue reference to drop. But - * that will never happen, as we're already holding a - * reference to it. - */ - bio_set_flag(*bio, BIO_QUEUE_ENTERED); - bio_chain(split, *bio); trace_block_split(q, split, (*bio)->bi_iter.bi_sector); generic_make_request(*bio); |