diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2007-10-12 02:17:47 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-12 03:29:50 -0400 |
| commit | 782e3b3b3804c38d5130c7f21d7ec7bf6709023f (patch) | |
| tree | 54e790dfd52f0451189fa1591dc97bc5ff5f5866 /fs/ocfs2 | |
| parent | cbd09dbbb62096c1da627eca865f988d2ed0a84e (diff) | |
Fix up more bio fallout
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/ocfs2')
| -rw-r--r-- | fs/ocfs2/cluster/heartbeat.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/ocfs2/cluster/heartbeat.c b/fs/ocfs2/cluster/heartbeat.c index da2c2b442b49..f14b541fab95 100644 --- a/fs/ocfs2/cluster/heartbeat.c +++ b/fs/ocfs2/cluster/heartbeat.c | |||
| @@ -216,7 +216,7 @@ static void o2hb_wait_on_io(struct o2hb_region *reg, | |||
| 216 | wait_for_completion(&wc->wc_io_complete); | 216 | wait_for_completion(&wc->wc_io_complete); |
| 217 | } | 217 | } |
| 218 | 218 | ||
| 219 | static int o2hb_bio_end_io(struct bio *bio, | 219 | static void o2hb_bio_end_io(struct bio *bio, |
| 220 | int error) | 220 | int error) |
| 221 | { | 221 | { |
| 222 | struct o2hb_bio_wait_ctxt *wc = bio->bi_private; | 222 | struct o2hb_bio_wait_ctxt *wc = bio->bi_private; |
| @@ -228,7 +228,6 @@ static int o2hb_bio_end_io(struct bio *bio, | |||
| 228 | 228 | ||
| 229 | o2hb_bio_wait_dec(wc, 1); | 229 | o2hb_bio_wait_dec(wc, 1); |
| 230 | bio_put(bio); | 230 | bio_put(bio); |
| 231 | return 0; | ||
| 232 | } | 231 | } |
| 233 | 232 | ||
| 234 | /* Setup a Bio to cover I/O against num_slots slots starting at | 233 | /* Setup a Bio to cover I/O against num_slots slots starting at |