Fix up more bio fallout

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c
index 2473e2a86d1be412b3fda7b211708f05de8e98ac..a2da76b5ae4cc5ac8e37b343b5ca10335484c343 100644 (file)
--- 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)
        else
                printk(KERN_WARNING "gfs2: error %d reading superblock\n", error);
        unlock_page(page);
-       return 0;
 }
 
 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 1332adc0b9fae2b8ede59c9b30d2dcffe9d6a366..941369c1ac8dcd5ab20f93736b02494202c9e974 100644 (file)
--- 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)
 
        dec_io(page, last_read_complete);
        bio_put(bio);
-
-       return 0;
 }
 
 static void remove_from_logsync(struct metapage *mp)
@@ -349,7 +347,6 @@ static void metapage_write_end_io(struct bio *bio, int err)
        }
        dec_io(page, last_write_complete);
        bio_put(bio);
-       return 0;
 }
 
 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 da2c2b442b4913e768812fa644dd78823979edee..f14b541fab951d01aae5155a4cbd224c6c807b2e 100644 (file)
--- 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,
        wait_for_completion(&wc->wc_io_complete);
 }
 
-static int o2hb_bio_end_io(struct bio *bio,
+static void o2hb_bio_end_io(struct bio *bio,
                           int error)
 {
        struct o2hb_bio_wait_ctxt *wc = bio->bi_private;
@@ -228,7 +228,6 @@ static int o2hb_bio_end_io(struct bio *bio,
 
        o2hb_bio_wait_dec(wc, 1);
        bio_put(bio);
-       return 0;
 }
 
 /* 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 3f13519436afc983ed5b1a62a4433387964b39d4..6f4c29e9c3d9e6209e5c999df4e61b10ba2dd902 100644 (file)
--- 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(
 /*
  * BIO completion handler for buffered IO.
  */
-STATIC int
+STATIC void
 xfs_end_bio(
        struct bio              *bio,
        int                     error)
@@ -339,7 +339,6 @@ xfs_end_bio(
        bio_put(bio);
 
        xfs_finish_ioend(ioend, 0);
-       return 0;
 }
 
 STATIC void

diff --git a/fs/xfs/linux-2.6/xfs_buf.c b/fs/xfs/linux-2.6/xfs_buf.c
index 6a75f4d984a1a7ada4efc6148b8b02036f9d4e90..39f44ee572e86ec5f417bbb20d1ed1b4af8ce36d 100644 (file)
--- 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(
        }
 }
 
-STATIC int
+STATIC void
 xfs_buf_bio_end_io(
        struct bio              *bio,
        int                     error)
@@ -1139,7 +1139,6 @@ xfs_buf_bio_end_io(
 
        _xfs_buf_ioend(bp, 1);
        bio_put(bio);
-       return 0;
 }
 
 STATIC void