diff options
-rw-r--r-- | fs/gfs2/super.c | 1 | ||||
-rw-r--r-- | fs/jfs/jfs_metapage.c | 3 | ||||
-rw-r--r-- | fs/ocfs2/cluster/heartbeat.c | 3 | ||||
-rw-r--r-- | fs/xfs/linux-2.6/xfs_aops.c | 3 | ||||
-rw-r--r-- | fs/xfs/linux-2.6/xfs_buf.c | 3 |
5 files changed, 3 insertions, 10 deletions
diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c index 2473e2a86d1b..a2da76b5ae4c 100644 --- a/fs/gfs2/super.c +++ b/fs/gfs2/super.c | |||
@@ -169,7 +169,6 @@ static void end_bio_io_page(struct bio *bio, int error) | |||
169 | else | 169 | else |
170 | printk(KERN_WARNING "gfs2: error %d reading superblock\n", error); | 170 | printk(KERN_WARNING "gfs2: error %d reading superblock\n", error); |
171 | unlock_page(page); | 171 | unlock_page(page); |
172 | return 0; | ||
173 | } | 172 | } |
174 | 173 | ||
175 | static void gfs2_sb_in(struct gfs2_sb_host *sb, const void *buf) | 174 | static void gfs2_sb_in(struct gfs2_sb_host *sb, const void *buf) |
diff --git a/fs/jfs/jfs_metapage.c b/fs/jfs/jfs_metapage.c index 1332adc0b9fa..941369c1ac8d 100644 --- a/fs/jfs/jfs_metapage.c +++ b/fs/jfs/jfs_metapage.c | |||
@@ -291,8 +291,6 @@ static void metapage_read_end_io(struct bio *bio, int err) | |||
291 | 291 | ||
292 | dec_io(page, last_read_complete); | 292 | dec_io(page, last_read_complete); |
293 | bio_put(bio); | 293 | bio_put(bio); |
294 | |||
295 | return 0; | ||
296 | } | 294 | } |
297 | 295 | ||
298 | static void remove_from_logsync(struct metapage *mp) | 296 | static void remove_from_logsync(struct metapage *mp) |
@@ -349,7 +347,6 @@ static void metapage_write_end_io(struct bio *bio, int err) | |||
349 | } | 347 | } |
350 | dec_io(page, last_write_complete); | 348 | dec_io(page, last_write_complete); |
351 | bio_put(bio); | 349 | bio_put(bio); |
352 | return 0; | ||
353 | } | 350 | } |
354 | 351 | ||
355 | static int metapage_writepage(struct page *page, struct writeback_control *wbc) | 352 | static int metapage_writepage(struct page *page, struct writeback_control *wbc) |
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 |
diff --git a/fs/xfs/linux-2.6/xfs_aops.c b/fs/xfs/linux-2.6/xfs_aops.c index 3f13519436af..6f4c29e9c3d9 100644 --- a/fs/xfs/linux-2.6/xfs_aops.c +++ b/fs/xfs/linux-2.6/xfs_aops.c | |||
@@ -323,7 +323,7 @@ xfs_iomap_valid( | |||
323 | /* | 323 | /* |
324 | * BIO completion handler for buffered IO. | 324 | * BIO completion handler for buffered IO. |
325 | */ | 325 | */ |
326 | STATIC int | 326 | STATIC void |
327 | xfs_end_bio( | 327 | xfs_end_bio( |
328 | struct bio *bio, | 328 | struct bio *bio, |
329 | int error) | 329 | int error) |
@@ -339,7 +339,6 @@ xfs_end_bio( | |||
339 | bio_put(bio); | 339 | bio_put(bio); |
340 | 340 | ||
341 | xfs_finish_ioend(ioend, 0); | 341 | xfs_finish_ioend(ioend, 0); |
342 | return 0; | ||
343 | } | 342 | } |
344 | 343 | ||
345 | STATIC void | 344 | STATIC void |
diff --git a/fs/xfs/linux-2.6/xfs_buf.c b/fs/xfs/linux-2.6/xfs_buf.c index 6a75f4d984a1..39f44ee572e8 100644 --- a/fs/xfs/linux-2.6/xfs_buf.c +++ b/fs/xfs/linux-2.6/xfs_buf.c | |||
@@ -1103,7 +1103,7 @@ _xfs_buf_ioend( | |||
1103 | } | 1103 | } |
1104 | } | 1104 | } |
1105 | 1105 | ||
1106 | STATIC int | 1106 | STATIC void |
1107 | xfs_buf_bio_end_io( | 1107 | xfs_buf_bio_end_io( |
1108 | struct bio *bio, | 1108 | struct bio *bio, |
1109 | int error) | 1109 | int error) |
@@ -1139,7 +1139,6 @@ xfs_buf_bio_end_io( | |||
1139 | 1139 | ||
1140 | _xfs_buf_ioend(bp, 1); | 1140 | _xfs_buf_ioend(bp, 1); |
1141 | bio_put(bio); | 1141 | bio_put(bio); |
1142 | return 0; | ||
1143 | } | 1142 | } |
1144 | 1143 | ||
1145 | STATIC void | 1144 | STATIC void |