summaryrefslogtreecommitdiff
path: root/sys-kernel
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-05-16 17:59:28 +0100
committerV3n3RiX <venerix@redcorelinux.org>2020-05-16 17:59:28 +0100
commit646a9f024350bf33088b47ffa36ffa8ebf87c156 (patch)
tree3d1592d6b36f06ea46db45009934612c2d2c54fa /sys-kernel
parent0138a69f33ca79e0c0ab339e500e20be43c0881d (diff)
sys-fs/zfs : version bump
Diffstat (limited to 'sys-kernel')
-rw-r--r--sys-kernel/zfs-dkms/Manifest2
-rw-r--r--sys-kernel/zfs-dkms/files/dkms.conf2
-rw-r--r--sys-kernel/zfs-dkms/files/kernel-5.5.patch35
-rw-r--r--sys-kernel/zfs-dkms/zfs-dkms-0.8.4.ebuild (renamed from sys-kernel/zfs-dkms/zfs-dkms-0.8.3-r1.ebuild)2
4 files changed, 2 insertions, 39 deletions
diff --git a/sys-kernel/zfs-dkms/Manifest b/sys-kernel/zfs-dkms/Manifest
index 9e5ed996..f9de9cf7 100644
--- a/sys-kernel/zfs-dkms/Manifest
+++ b/sys-kernel/zfs-dkms/Manifest
@@ -1 +1 @@
-DIST zfs-0.8.3.tar.gz 8779385 BLAKE2B 8b51b9d5b61543566bc7839d8452fdf9358442155e95f93a011531338824bbd4fc8879500e276b02d5d49d504a046728ecc0c6154f69eb7b47180b9bb0e46958 SHA512 aded632e6b04180560d4f2ff283260016e883dadae4e7fda9070b7113dee948099cb7a7b183f1c8139654389a2610fb9cc6f997acdc846040e605125cf016010
+DIST zfs-0.8.4.tar.gz 9285838 BLAKE2B 776bcd6dfab8825c07d315085e288b29bf543d6957325d5d566b7b78c04505dde9bd25eb6684cb4a1b6a657de8a4e1290d04d2b9079d26d6b834a70f1ec3b569 SHA512 9086dc6a6262dd93ca6ec43f1b4c2e5c804deba708c8a7460b8531aa4802b0bf8cac0917a1a00e6af2e96d4a21cd68b85e226bf571bd94041d0325c457106eb1
diff --git a/sys-kernel/zfs-dkms/files/dkms.conf b/sys-kernel/zfs-dkms/files/dkms.conf
index 31227a82..b40695b3 100644
--- a/sys-kernel/zfs-dkms/files/dkms.conf
+++ b/sys-kernel/zfs-dkms/files/dkms.conf
@@ -1,5 +1,5 @@
PACKAGE_NAME="zfs-dkms"
-PACKAGE_VERSION="0.8.3"
+PACKAGE_VERSION="0.8.4"
PACKAGE_CONFIG="/etc/sysconfig/zfs"
PRE_BUILD="configure
--prefix=/usr
diff --git a/sys-kernel/zfs-dkms/files/kernel-5.5.patch b/sys-kernel/zfs-dkms/files/kernel-5.5.patch
deleted file mode 100644
index 8d2a950f..00000000
--- a/sys-kernel/zfs-dkms/files/kernel-5.5.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/module/zfs/vdev_disk.c b/module/zfs/vdev_disk.c
-index 4ffc41cca34..cbe9e18316e 100644
---- a/module/zfs/vdev_disk.c
-+++ b/module/zfs/vdev_disk.c
-@@ -473,6 +473,30 @@
-
- #ifdef HAVE_BIO_SET_DEV
- #if defined(CONFIG_BLK_CGROUP) && defined(HAVE_BIO_SET_DEV_GPL_ONLY)
-+static inline bool vdev_percpu_ref_tryget(struct percpu_ref *ref)
-+{
-+ unsigned long __percpu *percpu_count;
-+ bool ret;
-+
-+ rcu_read_lock_sched();
-+
-+ if (__ref_is_percpu(ref, &percpu_count)) {
-+ this_cpu_inc(*percpu_count);
-+ ret = true;
-+ } else {
-+ ret = atomic_long_inc_not_zero(&ref->count);
-+ }
-+
-+ rcu_read_unlock_sched();
-+
-+ return ret;
-+}
-+#define percpu_ref_tryget vdev_percpu_ref_tryget
-+static inline bool vdev_blkg_tryget(struct blkcg_gq *blkg)
-+{
-+ return blkg && vdev_percpu_ref_tryget(&blkg->refcnt);
-+}
-+#define blkg_tryget vdev_blkg_tryget
- /*
- * The Linux 5.0 kernel updated the bio_set_dev() macro so it calls the
- * GPL-only bio_associate_blkg() symbol thus inadvertently converting
diff --git a/sys-kernel/zfs-dkms/zfs-dkms-0.8.3-r1.ebuild b/sys-kernel/zfs-dkms/zfs-dkms-0.8.4.ebuild
index 7cd225f8..7e448719 100644
--- a/sys-kernel/zfs-dkms/zfs-dkms-0.8.3-r1.ebuild
+++ b/sys-kernel/zfs-dkms/zfs-dkms-0.8.4.ebuild
@@ -20,8 +20,6 @@ IUSE=""
DEPEND="sys-kernel/dkms"
RDEPEND="${DEPEND}"
-PATCHES=( "${FILESDIR}"/kernel-5.5.patch )
-
S="${WORKDIR}/${MY_P}"
src_configure() {