Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw

[linux-2.6-omap-h63xx.git] / fs / gfs2 / super.c

diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c
index 55898023782b2bfffa5afe2424baf43cd5f4f427..dd3e737f528e0b111387b506608e63fc99ef5c0b 100644 (file)
--- a/fs/gfs2/super.c
+++ b/fs/gfs2/super.c
@@ -159,18 +159,15 @@ int gfs2_check_sb(struct gfs2_sbd *sdp, struct gfs2_sb_host *sb, int silent)
 }
 
 
-static int end_bio_io_page(struct bio *bio, unsigned int bytes_done, int error)
+static void end_bio_io_page(struct bio *bio, int error)
 {
        struct page *page = bio->bi_private;
-       if (bio->bi_size)
-               return 1;
 
        if (!error)
                SetPageUptodate(page);
        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)