Message ID | 20190716221539.31891-2-gpiccoli@canonical.com |
---|---|
State | New |
Headers | show |
Series | Two crashes on raid0 error path (during a member device removal) | expand |
diff --git a/block/blk-core.c b/block/blk-core.c index 5bde73a49399..cf5c81e82773 100644 --- a/block/blk-core.c +++ b/block/blk-core.c @@ -1075,10 +1075,8 @@ blk_qc_t generic_make_request(struct bio *bio) flags = 0; if (bio->bi_opf & REQ_NOWAIT) flags = BLK_MQ_REQ_NOWAIT; - if (blk_queue_enter(q, flags) < 0) { + if (blk_queue_enter(q, flags) < 0) enter_succeeded = false; - q = NULL; - } } if (enter_succeeded) { @@ -1109,6 +1107,7 @@ blk_qc_t generic_make_request(struct bio *bio) bio_wouldblock_error(bio); else bio_io_error(bio); + q = NULL; } bio = bio_list_pop(&bio_list_on_stack[0]); } while (bio);