UBUNTU: SAUCE: (noup) Update spl to 0.6.5.9-1, zfs to 0.6.5.9-2

[mirror_ubuntu-artful-kernel.git] / zfs / config / kernel-bio-end-io-t-args.m4

diff --git a/zfs/config/kernel-bio-end-io-t-args.m4 b/zfs/config/kernel-bio-end-io-t-args.m4
new file mode 100644 (file)
index 0000000..c8c520f
--- /dev/null
+++ b/zfs/config/kernel-bio-end-io-t-args.m4
@@ -0,0 +1,24 @@
+dnl #
+dnl # 4.3 API change
+dnl # Error argument dropped from bio_endio in favor of newly introduced
+dnl # bio->bi_error. This also replaces bio->bi_flags value BIO_UPTODATE.
+dnl # Introduced by torvalds/linux@4246a0b63bd8f56a1469b12eafeb875b1041a451
+dnl # ("block: add a bi_error field to struct bio").
+dnl #
+AC_DEFUN([ZFS_AC_KERNEL_BIO_END_IO_T_ARGS], [
+       AC_MSG_CHECKING([whether bio_end_io_t wants 1 arg])
+       ZFS_LINUX_TRY_COMPILE([
+               #include <linux/bio.h>
+
+               void wanted_end_io(struct bio *bio) { return; }
+
+               bio_end_io_t *end_io __attribute__ ((unused)) = wanted_end_io;
+       ],[
+       ],[
+               AC_MSG_RESULT(yes)
+               AC_DEFINE(HAVE_1ARG_BIO_END_IO_T, 1,
+                         [bio_end_io_t wants 1 arg])
+       ],[
+               AC_MSG_RESULT(no)
+       ])
+])