summaryrefslogtreecommitdiff
path: root/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc14-flush-properly.patch
diff options
context:
space:
mode:
Diffstat (limited to 'sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc14-flush-properly.patch')
-rw-r--r--sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc14-flush-properly.patch42
1 files changed, 0 insertions, 42 deletions
diff --git a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc14-flush-properly.patch b/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc14-flush-properly.patch
deleted file mode 100644
index fb4c7c35696c..000000000000
--- a/sys-fs/zfs-kmod/files/zfs-kmod-0.6.0_rc14-flush-properly.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git a/config/kernel.m4 b/config/kernel.m4
-index 5623785..9d5aa46 100644
---- a/config/kernel.m4
-+++ b/config/kernel.m4
-@@ -16,7 +16,6 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [
- ZFS_AC_KERNEL_INVALIDATE_BDEV_ARGS
- ZFS_AC_KERNEL_BDEV_LOGICAL_BLOCK_SIZE
- ZFS_AC_KERNEL_BDEV_PHYSICAL_BLOCK_SIZE
-- ZFS_AC_KERNEL_BIO_EMPTY_BARRIER
- ZFS_AC_KERNEL_BIO_FAILFAST
- ZFS_AC_KERNEL_BIO_FAILFAST_DTD
- ZFS_AC_KERNEL_REQ_FAILFAST_MASK
-diff --git a/module/zfs/vdev_disk.c b/module/zfs/vdev_disk.c
-index cbf0a4d..e902a70 100644
---- a/module/zfs/vdev_disk.c
-+++ b/module/zfs/vdev_disk.c
-@@ -604,8 +604,6 @@
- return __vdev_disk_physio(bdev, NULL, kbuf, size, offset, flags);
- }
-
--/* 2.6.24 API change */
--#ifdef HAVE_BIO_EMPTY_BARRIER
- BIO_END_IO_PROTO(vdev_disk_io_flush_completion, bio, size, rc)
- {
- zio_t *zio = bio->bi_private;
-@@ -646,13 +644,6 @@
-
- return 0;
- }
--#else
--static int
--vdev_disk_io_flush(struct block_device *bdev, zio_t *zio)
--{
-- return ENOTSUP;
--}
--#endif /* HAVE_BIO_EMPTY_BARRIER */
-
- static int
- vdev_disk_io_start(zio_t *zio)
---
-1.7.10
-