# HG changeset patch
# User kaf24@firebug.cl.cam.ac.uk
# Date 1115894522 0
# Node ID 3291b52e8ca6c9e39a1cf90d453251f4a271c726
# Parent  a9b0f5ea765143c72d47352e44e00cb3327d0eb3
bitkeeper revision 1.1389.19.7 (428332faE9tXKL2EQy-9cj-_mI0V8Q)

Fix blkfront driver for 2.4 domU.
Signed-off-by: Keir Fraser <keir@xensource.com>


diff -r a9b0f5ea7651 -r 3291b52e8ca6 linux-2.6.11-xen-sparse/drivers/xen/blkfront/blkfront.c
--- a/linux-2.6.11-xen-sparse/drivers/xen/blkfront/blkfront.c	Thu May 12 10:39:43 2005 +0000
+++ b/linux-2.6.11-xen-sparse/drivers/xen/blkfront/blkfront.c	Thu May 12 10:42:02 2005 +0000
@@ -824,7 +824,7 @@ static int blkif_queue_request(unsigned 
                         buffer_ma >> PAGE_SHIFT,
                         ( operation == BLKIF_OP_WRITE ? 1 : 0 ) );
 
-            blk_shadow[id].frame[req->nr_segments] =
+            blk_shadow[req->id].frame[req->nr_segments] =
                 buffer_ma >> PAGE_SHIFT;
 
             req->frame_and_sects[req->nr_segments] =