path: root/block/blk-core.c
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2019-01-27 10:58:20 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2019-01-27 10:58:20 -0800
commit419967d53fc74bb151cdc9a00d0df80a2cc37173 (patch)
tree68fefeb5682a501282775db074aa68c192f89252 /block/blk-core.c
parent1fc7f56db7a7c467e46a5d2e2a009d2f337e0338 (diff)
parent947b7ac135b16aa60f9141ff72bd494eda0edb5e (diff)
Merge tag 'for-linus-20190127' of git://git.kernel.dk/linux-block
Pull block revert from Jens Axboe: "Silly error snuck into a patch from the last series, let's do a revert to avoid a potential use-after-free" * tag 'for-linus-20190127' of git://git.kernel.dk/linux-block: Revert "block: cover another queue enter recursion via BIO_QUEUE_ENTERED"
Diffstat (limited to 'block/blk-core.c')
1 files changed, 0 insertions, 11 deletions
diff --git a/block/blk-core.c b/block/blk-core.c
index 1ccec27d20c3..3c5f61ceeb67 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -1083,18 +1083,7 @@ blk_qc_t generic_make_request(struct bio *bio)
/* Create a fresh bio_list for all subordinate requests */
bio_list_on_stack[1] = bio_list_on_stack[0];
- /*
- * 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);
ret = q->make_request_fn(q, bio);
- bio_clear_flag(bio, BIO_QUEUE_ENTERED);
/* sort new bios into those for a lower level
* and those for the same level