diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-05-14 11:57:54 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-05-14 11:57:54 +1000 |
| commit | 587263790f4baf660c490bf585526ac699dffbf6 (patch) | |
| tree | 1339feeb50091e1419d20e4b23b0fbdae1ef4e32 /drivers/md/raid1.c | |
| parent | 7a28bc989a4428e8750d0bbac7aa356fba952630 (diff) | |
| parent | c4918a73e3c202d396684fcdb0a68bb50ec1098b (diff) | |
Merge branch 'akpm/master'
Diffstat (limited to 'drivers/md/raid1.c')
| -rw-r--r-- | drivers/md/raid1.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c index 0fbe6549f493..57adb153cb46 100644 --- a/drivers/md/raid1.c +++ b/drivers/md/raid1.c @@ -294,7 +294,8 @@ static int find_bio_disk(struct r1bio *r1_bio, struct bio *bio) return mirror; } -static void raid1_end_read_request(struct bio *bio, int error) +static void raid1_end_read_request(struct bio *bio, int error, + struct batch_complete *batch) { int uptodate = test_bit(BIO_UPTODATE, &bio->bi_flags); struct r1bio *r1_bio = bio->bi_private; @@ -379,7 +380,8 @@ static void r1_bio_write_done(struct r1bio *r1_bio) } } -static void raid1_end_write_request(struct bio *bio, int error) +static void raid1_end_write_request(struct bio *bio, int error, + struct batch_complete *batch) { int uptodate = test_bit(BIO_UPTODATE, &bio->bi_flags); struct r1bio *r1_bio = bio->bi_private; @@ -1613,7 +1615,8 @@ abort: } -static void end_sync_read(struct bio *bio, int error) +static void end_sync_read(struct bio *bio, int error, + struct batch_complete *batch) { struct r1bio *r1_bio = bio->bi_private; @@ -1631,7 +1634,8 @@ static void end_sync_read(struct bio *bio, int error) reschedule_retry(r1_bio); } -static void end_sync_write(struct bio *bio, int error) +static void end_sync_write(struct bio *bio, int error, + struct batch_complete *batch) { int uptodate = test_bit(BIO_UPTODATE, &bio->bi_flags); struct r1bio *r1_bio = bio->bi_private; |