diff options
author | NeilBrown <neilb@suse.de> | 2007-09-27 06:47:43 -0400 |
---|---|---|
committer | Jens Axboe <axboe@carl.home.kernel.dk> | 2007-10-10 03:25:57 -0400 |
commit | 6712ecf8f648118c3363c142196418f89a510b90 (patch) | |
tree | 347d39a7d5a7ed96d3b1afecd28de2a0f98b98c9 /drivers/md/dm-io.c | |
parent | 5bb23a688b2de23d7765a1dd439d89c038378978 (diff) |
Drop 'size' argument from bio_endio and bi_end_io
As bi_end_io is only called once when the reqeust is complete,
the 'size' argument is now redundant. Remove it.
Now there is no need for bio_endio to subtract the size completed
from bi_size. So don't do that either.
While we are at it, change bi_end_io to return void.
Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'drivers/md/dm-io.c')
-rw-r--r-- | drivers/md/dm-io.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/md/dm-io.c b/drivers/md/dm-io.c index f3a772486437..b8e342fe7586 100644 --- a/drivers/md/dm-io.c +++ b/drivers/md/dm-io.c | |||
@@ -124,15 +124,11 @@ static void dec_count(struct io *io, unsigned int region, int error) | |||
124 | } | 124 | } |
125 | } | 125 | } |
126 | 126 | ||
127 | static int endio(struct bio *bio, unsigned int done, int error) | 127 | static void endio(struct bio *bio, int error) |
128 | { | 128 | { |
129 | struct io *io; | 129 | struct io *io; |
130 | unsigned region; | 130 | unsigned region; |
131 | 131 | ||
132 | /* keep going until we've finished */ | ||
133 | if (bio->bi_size) | ||
134 | return 1; | ||
135 | |||
136 | if (error && bio_data_dir(bio) == READ) | 132 | if (error && bio_data_dir(bio) == READ) |
137 | zero_fill_bio(bio); | 133 | zero_fill_bio(bio); |
138 | 134 | ||
@@ -146,8 +142,6 @@ static int endio(struct bio *bio, unsigned int done, int error) | |||
146 | bio_put(bio); | 142 | bio_put(bio); |
147 | 143 | ||
148 | dec_count(io, region, error); | 144 | dec_count(io, region, error); |
149 | |||
150 | return 0; | ||
151 | } | 145 | } |
152 | 146 | ||
153 | /*----------------------------------------------------------------- | 147 | /*----------------------------------------------------------------- |