diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-12 22:03:53 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-12 22:03:53 -0500 |
| commit | 9da305eb089c94c535d1790fd2dec16f44c1689f (patch) | |
| tree | f37f07f148fd7a793233c7f15c0fa9f46212049d /drivers/md/raid1.c | |
| parent | d96212ed87d032d2d830e265aae14038dc1f8ad8 (diff) | |
| parent | 14ee0a1414536d27bc29373bf23c106b8ef8ce0b (diff) | |
| download | op-kernel-dev-9da305eb089c94c535d1790fd2dec16f44c1689f.zip op-kernel-dev-9da305eb089c94c535d1790fd2dec16f44c1689f.tar.gz | |
Merge branch 'master'
Diffstat (limited to 'drivers/md/raid1.c')
| -rw-r--r-- | drivers/md/raid1.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c index 3066c58..229d7b2 100644 --- a/drivers/md/raid1.c +++ b/drivers/md/raid1.c @@ -320,7 +320,6 @@ static int raid1_end_write_request(struct bio *bio, unsigned int bytes_done, int * this branch is our 'one mirror IO has finished' event handler: */ r1_bio->bios[mirror] = NULL; - bio_put(bio); if (!uptodate) { md_error(r1_bio->mddev, conf->mirrors[mirror].rdev); /* an I/O failed, we can't clear the bitmap */ @@ -377,7 +376,6 @@ static int raid1_end_write_request(struct bio *bio, unsigned int bytes_done, int } if (test_bit(R1BIO_BehindIO, &r1_bio->state)) { /* free extra copy of the data pages */ -/* FIXME bio has been freed!!! */ int i = bio->bi_vcnt; while (i--) __free_page(bio->bi_io_vec[i].bv_page); @@ -391,6 +389,9 @@ static int raid1_end_write_request(struct bio *bio, unsigned int bytes_done, int raid_end_bio_io(r1_bio); } + if (r1_bio->bios[mirror]==NULL) + bio_put(bio); + rdev_dec_pending(conf->mirrors[mirror].rdev, conf->mddev); return 0; } |
