# HG changeset patch
# User Jake Wires <jwires@xensource.com>
# Date 1163731648 28800
# Node ID f0ba459065d32b61c9d04ccde5787e48e23be782
# Parent  f1d2860c51370f7a89c5b8b6b7941b8975928349
[BLKTAP] fix race between ufe_ring and blk_ring in blktap.c

Signed-off-by: Jake Wires <jwires@xensource.com>

diff -r f1d2860c5137 -r f0ba459065d3 linux-2.6-xen-sparse/drivers/xen/blktap/blktap.c
--- a/linux-2.6-xen-sparse/drivers/xen/blktap/blktap.c	Fri Nov 17 17:57:49 2006 +0000
+++ b/linux-2.6-xen-sparse/drivers/xen/blktap/blktap.c	Thu Nov 16 18:47:28 2006 -0800
@@ -1059,9 +1059,9 @@ static int blktap_read_ufe_ring(tap_blki
 			map[offset] = NULL;
 		}
 		fast_flush_area(pending_req, pending_idx, usr_idx, info->minor);
+		info->idx_map[usr_idx] = INVALID_REQ;
 		make_response(blkif, pending_req->id, res.operation,
 			      res.status);
-		info->idx_map[usr_idx] = INVALID_REQ;
 		blkif_put(pending_req->blkif);
 		free_req(pending_req);
 	}