From a570e39d7ea8a572c35c3b37d4834237e049d72d Mon Sep 17 00:00:00 2001 From: t_jeang Date: Tue, 6 Jan 2009 12:06:01 +0000 Subject: [PATCH] imported patch CA-24784-resource-leak --- drivers/xen/blkback/blkback.c | 8 ++++---- drivers/xen/blktap/blktap.c | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/xen/blkback/blkback.c b/drivers/xen/blkback/blkback.c index 970afe20..c326d88e 100644 --- a/drivers/xen/blkback/blkback.c +++ b/drivers/xen/blkback/blkback.c @@ -423,14 +423,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 (blkif->remove_requested) { more_to_do = 1; break; } - if (blkif->remove_requested) { + pending_req = alloc_req(); + if (NULL == pending_req) { + blkif->st_oo_req++; more_to_do = 1; break; } diff --git a/drivers/xen/blktap/blktap.c b/drivers/xen/blktap/blktap.c index 87cb9df9..72c4a7a3 100644 --- a/drivers/xen/blktap/blktap.c +++ b/drivers/xen/blktap/blktap.c @@ -1129,6 +1129,11 @@ static int do_block_io_op(tap_blkif_t *info) break; } + if (info->remove_requested) { + more_to_do = 1; + break; + } + usr_idx = GET_NEXT_REQ(info->idx_map); if (usr_idx == INVALID_REQ) break; @@ -1140,11 +1145,6 @@ static int do_block_io_op(tap_blkif_t *info) break; } - if (info->remove_requested) { - more_to_do = 1; - break; - } - switch (blkif->blk_protocol) { case BLKIF_PROTOCOL_NATIVE: memcpy(&req, RING_GET_REQUEST(&blk_rings->native, rc), -- 2.39.5