Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 73f61b2a authored by Miguel's avatar Miguel Committed by Chris Mason
Browse files

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: default avatarChris Mason <chris.mason@oracle.com>
parent 594994aa

fs/btrfs/disk-io.c

+4 −1
Original line number Diff line number Diff line
@@ -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)

{

fs/btrfs/volumes.c

+4 −0
Original line number Diff line number Diff line
@@ -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);

	}