Btrfs: bio_endio support for linux 2.6.23 and older.

bio_endio() changed prototype on linux 2.6.24, support older kernels
using the older prototype.

Signed-off-by: Chris Mason <chris.mason@oracle.com>

diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 0bfcc31d94d73ad5ea95511ecf7857f67d4d4512..aebe8c21ec80a3709d4f59afcda2e9112bc97d4e 100644 (file)
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -949,11 +949,14 @@ void btrfs_end_io_csum(struct work_struct *work)
                bio->bi_private = end_io_wq->private;
                bio->bi_end_io = end_io_wq->end_io;
                kfree(end_io_wq);
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,23)
+               bio_endio(bio, bio->bi_size, err);
+#else
                bio_endio(bio, error);
+#endif
        }
 }
 
-
 struct btrfs_root *open_ctree(struct super_block *sb,
                              struct btrfs_fs_devices *fs_devices)
 {

diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 07d43553141c5c3e328a4976691df63a58695191..82bc6cfc110f5129a010ddc0c2395659c932e058 100644 (file)
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -960,7 +960,11 @@ static int end_bio_multi_stripe(struct bio *bio,
                        err = multi->error;
                kfree(multi);
 
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,23)
+               bio_endio(bio, bio->bi_size, err);
+#else
                bio_endio(bio, err);
+#endif
        } else {
                bio_put(bio);
        }