ia64/xen-unstable

changeset 4943:1fa301443996

bitkeeper revision 1.1423 (428900e16Uxi9JzPfHD98q7NuH29dg)

Merge firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk
author kaf24@firebug.cl.cam.ac.uk
date Mon May 16 20:21:53 2005 +0000 (2005-05-16)
parents e8ad55c3b8fb 85e3c42fd78f
children 8820b00f46e3
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 May 16 19:59:29 2005 +0000
     1.2 +++ b/linux-2.6.11-xen-sparse/drivers/xen/blkback/blkback.c	Mon May 16 20:21:53 2005 +0000
     1.3 @@ -300,8 +300,9 @@ static void end_block_io_op(struct buffe
     1.4  #else
     1.5  static int end_block_io_op(struct bio *bio, unsigned int done, int error)
     1.6  {
     1.7 -    if ( done || error )
     1.8 -        __end_block_io_op(bio->bi_private, (done && !error));
     1.9 +    if ( bio->bi_size != 0 )
    1.10 +        return 1;
    1.11 +    __end_block_io_op(bio->bi_private, !error);
    1.12      bio_put(bio);
    1.13      return error;
    1.14  }