diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-05-16 17:59:28 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-05-16 17:59:28 +0100 |
| commit | 646a9f024350bf33088b47ffa36ffa8ebf87c156 (patch) | |
| tree | 3d1592d6b36f06ea46db45009934612c2d2c54fa /sys-kernel/zfs-dkms/files | |
| parent | 0138a69f33ca79e0c0ab339e500e20be43c0881d (diff) | |
sys-fs/zfs : version bump
Diffstat (limited to 'sys-kernel/zfs-dkms/files')
| -rw-r--r-- | sys-kernel/zfs-dkms/files/dkms.conf | 2 | ||||
| -rw-r--r-- | sys-kernel/zfs-dkms/files/kernel-5.5.patch | 35 |
2 files changed, 1 insertions, 36 deletions
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 |