[PATCH 002 of 4] Only call bi_end_io once for any bio.

From: NeilBrown
Date: Thu Sep 27 2007 - 03:20:58 EST



Currently bi_end_io can be called multiple times as sub-requests
complete. However no ->bi_end_io function wants to know about that.
So only call when the bio is complete.

Signed-off-by: Neil Brown <neilb@xxxxxxx>

### Diffstat output
./fs/bio.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff .prev/fs/bio.c ./fs/bio.c
--- .prev/fs/bio.c 2007-09-27 16:36:53.000000000 +1000
+++ ./fs/bio.c 2007-09-27 16:39:02.000000000 +1000
@@ -1018,6 +1018,8 @@ void bio_endio(struct bio *bio, unsigned
{
if (error)
clear_bit(BIO_UPTODATE, &bio->bi_flags);
+ else if (!test_bit(BIO_UPTODATE, &bio->bi_flags))
+ error = -EIO;

if (unlikely(bytes_done > bio->bi_size)) {
printk("%s: want %u bytes done, only %u left\n", __FUNCTION__,
@@ -1028,7 +1030,7 @@ void bio_endio(struct bio *bio, unsigned
bio->bi_size -= bytes_done;
bio->bi_sector += (bytes_done >> 9);

- if (bio->bi_end_io)
+ if (bio->bi_size && bio->bi_end_io)
bio->bi_end_io(bio, bytes_done, error);
}

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/