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 /fs/ocfs2/cluster/heartbeat.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 'fs/ocfs2/cluster/heartbeat.c')
-rw-r--r-- | fs/ocfs2/cluster/heartbeat.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/fs/ocfs2/cluster/heartbeat.c b/fs/ocfs2/cluster/heartbeat.c index 2bd7f788cf34..da2c2b442b49 100644 --- a/fs/ocfs2/cluster/heartbeat.c +++ b/fs/ocfs2/cluster/heartbeat.c | |||
@@ -217,7 +217,6 @@ static void o2hb_wait_on_io(struct o2hb_region *reg, | |||
217 | } | 217 | } |
218 | 218 | ||
219 | static int o2hb_bio_end_io(struct bio *bio, | 219 | static int o2hb_bio_end_io(struct bio *bio, |
220 | unsigned int bytes_done, | ||
221 | int error) | 220 | int error) |
222 | { | 221 | { |
223 | struct o2hb_bio_wait_ctxt *wc = bio->bi_private; | 222 | struct o2hb_bio_wait_ctxt *wc = bio->bi_private; |
@@ -227,9 +226,6 @@ static int o2hb_bio_end_io(struct bio *bio, | |||
227 | wc->wc_error = error; | 226 | wc->wc_error = error; |
228 | } | 227 | } |
229 | 228 | ||
230 | if (bio->bi_size) | ||
231 | return 1; | ||
232 | |||
233 | o2hb_bio_wait_dec(wc, 1); | 229 | o2hb_bio_wait_dec(wc, 1); |
234 | bio_put(bio); | 230 | bio_put(bio); |
235 | return 0; | 231 | return 0; |