Merge branch 'hpfs' (patches from Mikulas)

[karo-tx-linux.git] / fs / gfs2 / ops_fstype.c

diff --git a/fs/gfs2/ops_fstype.c b/fs/gfs2/ops_fstype.c
index 1e3a93f2f71d55d773f57d69e78ec56514295800..02586e7eb9647aa4f4cf4ccc7b71d63ae8c02893 100644 (file)
--- a/fs/gfs2/ops_fstype.c
+++ b/fs/gfs2/ops_fstype.c
@@ -171,14 +171,14 @@ static int gfs2_check_sb(struct gfs2_sbd *sdp, int silent)
        return -EINVAL;
 }
 
-static void end_bio_io_page(struct bio *bio, int error)
+static void end_bio_io_page(struct bio *bio)
 {
        struct page *page = bio->bi_private;
 
-       if (!error)
+       if (!bio->bi_error)
                SetPageUptodate(page);
        else
-               pr_warn("error %d reading superblock\n", error);
+               pr_warn("error %d reading superblock\n", bio->bi_error);
        unlock_page(page);
 }