diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-30 23:45:41 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-30 23:45:41 -0400 |
| commit | 1c7da74c4aab595a994beb5fe728ebf0d0b41f59 (patch) | |
| tree | 64128abdf9550ebb51d8f3ee6732d7350b9c62f2 /drivers/block/cpqarray.c | |
| parent | aebb1153ac54ddbbd3d3f0481a193f4bf0ead53b (diff) | |
| parent | 1bdfd554be94def718323659173517c5d4a69d25 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/block/cpqarray.c')
| -rw-r--r-- | drivers/block/cpqarray.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c index 78082edc14b4..4abc193314ee 100644 --- a/drivers/block/cpqarray.c +++ b/drivers/block/cpqarray.c | |||
| @@ -989,7 +989,6 @@ static inline void complete_buffers(struct bio *bio, int ok) | |||
| 989 | xbh = bio->bi_next; | 989 | xbh = bio->bi_next; |
| 990 | bio->bi_next = NULL; | 990 | bio->bi_next = NULL; |
| 991 | 991 | ||
| 992 | blk_finished_io(nr_sectors); | ||
| 993 | bio_endio(bio, nr_sectors << 9, ok ? 0 : -EIO); | 992 | bio_endio(bio, nr_sectors << 9, ok ? 0 : -EIO); |
| 994 | 993 | ||
| 995 | bio = xbh; | 994 | bio = xbh; |