diff --git a/[refs] b/[refs] index debf88ea33a3..d9ed18f4bd18 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dd3672424caa7b302433635831afbb6787476b96 +refs/heads/master: 8270b45bc8a45eef4a224bd256bd0997d4fd857e diff --git a/trunk/drivers/xen/blkback/blkback.c b/trunk/drivers/xen/blkback/blkback.c index 43fd07091d4d..8d988f4513aa 100644 --- a/trunk/drivers/xen/blkback/blkback.c +++ b/trunk/drivers/xen/blkback/blkback.c @@ -318,14 +318,14 @@ static int do_block_io_op(blkif_t *blkif) if (RING_REQUEST_CONS_OVERFLOW(&blk_rings->common, rc)) break; - pending_req = alloc_req(); - if (NULL == pending_req) { - blkif->st_oo_req++; + if (kthread_should_stop()) { more_to_do = 1; break; } - if (kthread_should_stop()) { + pending_req = alloc_req(); + if (NULL == pending_req) { + blkif->st_oo_req++; more_to_do = 1; break; }