ia64/xen-unstable

changeset 4570:4d0b44989cce

bitkeeper revision 1.1324 (42644ad1aeFq3LcHbilUBO0afwrj8g)

blkback.c:
fix to error handling for bad grant refs
Signed-off-by: Christopher Clark
author cwc22@centipede.cl.cam.ac.uk
date Tue Apr 19 00:03:29 2005 +0000 (2005-04-19)
parents 5fd95a1db011
children e90dde144eb9
files linux-2.6.11-xen-sparse/drivers/xen/blkback/blkback.c
line diff
     1.1 --- a/linux-2.6.11-xen-sparse/drivers/xen/blkback/blkback.c	Mon Apr 18 23:25:40 2005 +0000
     1.2 +++ b/linux-2.6.11-xen-sparse/drivers/xen/blkback/blkback.c	Tue Apr 19 00:03:29 2005 +0000
     1.3 @@ -397,7 +397,7 @@ static void dispatch_probe(blkif_t *blki
     1.4                          GNTTABOP_map_grant_ref, &op, 1)))
     1.5              BUG();
     1.6  
     1.7 -        if ( op.u.map_grant_ref.dev_bus_addr == 0 )
     1.8 +        if ( op.u.map_grant_ref.handle < 0 )
     1.9              goto out;
    1.10  
    1.11          pending_handle(pending_idx, 0) = op.u.map_grant_ref.handle;
    1.12 @@ -500,7 +500,7 @@ static void dispatch_rw_block_io(blkif_t
    1.13  
    1.14      for ( i = 0; i < nseg; i++ )
    1.15      {
    1.16 -        if ( unlikely(aop[i].u.map_grant_ref.dev_bus_addr == 0) )
    1.17 +        if ( unlikely(aop[i].u.map_grant_ref.handle < 0) )
    1.18          {
    1.19              DPRINTK("invalid buffer -- could not remap it\n");
    1.20              fast_flush_area(pending_idx, nseg);