diff options
| -rw-r--r-- | .SRCINFO | 24 | ||||
| -rw-r--r-- | 0001-Linux-5.3-compat-Makefile-subdir-m-no-longer-support.patch | 65 | ||||
| -rw-r--r-- | 0002-fix-5.6-build.patch | 676 | ||||
| -rw-r--r-- | PKGBUILD | 23 |
4 files changed, 25 insertions, 763 deletions
@@ -1,28 +1,28 @@ pkgbase = zfs-dkms pkgdesc = Kernel modules for the Zettabyte File System. - pkgver = 2.1.5 - pkgrel = 1 + pkgver = 2.2.3 + pkgrel = 2 url = https://zfsonlinux.org/ arch = any license = CDDL - provides = ZFS-MODULE=2.1.5 - provides = SPL-MODULE=2.1.5 - provides = spl-dkms + provides = ZFS-MODULE=2.2.3 + provides = SPL-MODULE=2.2.3 provides = zfs - conflicts = spl-dkms - replaces = spl-dkms - source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.1.5/zfs-2.1.5.tar.gz - source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.1.5/zfs-2.1.5.tar.gz.asc + source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.2.3/zfs-2.2.3.tar.gz + source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.2.3/zfs-2.2.3.tar.gz.asc + source = https://github.com/openzfs/zfs/commit/2b481b5477d3a95d0eab723c6639f7114e146ae1.patch source = 0001-only-build-the-module-in-dkms.conf.patch validpgpkeys = 4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027 validpgpkeys = C33DF142657ED1F7C328A2960AB9E991C6AF658B - sha256sums = 1913041e5c44ff07ca384346ad8145aeedf77e77cd1cea9ec5d533246691e10c + sha256sums = 30a512f34ec5c841b8b2b32cc9c1a03fd49391b26c9164d3fb30573fb5d81ac3 sha256sums = SKIP + sha256sums = b3444bbb71b508e12dcbce1a61d01275960f6c38b8db9c163aced83e4cd092c8 sha256sums = 8d5c31f883a906ab42776dcda79b6c89f904d8f356ade0dab5491578a6af55a5 - b2sums = c6e3efd9c0cda91654767eaad0eaaa05cd9a5daf1cb0384c9c78b30062f5c29142ac37ab9dbdaf96c91456d11c317d782d3524ade293f03fda983e5992b79e49 + b2sums = f83439aa929609191a048dd326b2a15e0f57c72d2901cbfb205b81a29aa42dab49b42eb61647ca3eaed17518b8c907e81343364bfecf83ed441271648f8efd4b b2sums = SKIP + b2sums = 245f489ba2f916e95fbbc9616ac7d9f6149dd3b6c63580b25c0af69aa2ad96d2ed28bf4e1446cbf7c8299f5c14de4712c931d3f4949bb8149d5a966310ca6977 b2sums = 58dc2494e71b50833d44c126b72acad52e9817626542afbc245b7ba82009e8c8252ebde6023592aac42d9942207e7655c0a421da9067fbdd619746ebc372d791 pkgname = zfs-dkms - depends = zfs-utils=2.1.5 + depends = zfs-utils=2.2.3 depends = dkms diff --git a/0001-Linux-5.3-compat-Makefile-subdir-m-no-longer-support.patch b/0001-Linux-5.3-compat-Makefile-subdir-m-no-longer-support.patch deleted file mode 100644 index 84ba2b55fa21..000000000000 --- a/0001-Linux-5.3-compat-Makefile-subdir-m-no-longer-support.patch +++ /dev/null @@ -1,65 +0,0 @@ -From ac0fbbfdf3d686130985615184bc25470dcd8c13 Mon Sep 17 00:00:00 2001 -From: Dominic Pearson <dsp@technoanimal.net> -Date: Tue, 20 Aug 2019 00:22:52 +0200 -Subject: [PATCH] Linux 5.3 compat: Makefile subdir-m no longer supported - -Uses obj-m instead, due to kernel changes. - -See LKML: Masahiro Yamada, Tue, 6 Aug 2019 19:03:23 +0900 - -Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> -Reviewed-by: Tony Hutter <hutter2@llnl.gov> -Signed-off-by: Dominic Pearson <dsp@technoanimal.net> -Closes #9169 -(cherry picked from commit 70f67bdbbf5f0e8e099f19db7550cb6e444cb0f8) -[Eli Schwartz: removed undesirable patch hunk for .gitignore, rebased -without 8f12a4f8d2846ca668f8ad90d9ea5c19c8c0b78f conflicts] ---- - module/Makefile.in | 24 ++++++++++++------------ - 1 file changed, 12 insertions(+), 12 deletions(-) - -diff --git a/module/Makefile.in b/module/Makefile.in -index 935bd2663..168bc5a1b 100644 ---- a/module/Makefile.in -+++ b/module/Makefile.in -@@ -1,11 +1,11 @@ --subdir-m += avl --subdir-m += icp --subdir-m += lua --subdir-m += nvpair --subdir-m += spl --subdir-m += unicode --subdir-m += zcommon --subdir-m += zfs -+obj-m += avl/ -+obj-m += icp/ -+obj-m += lua/ -+obj-m += nvpair/ -+obj-m += spl/ -+obj-m += unicode/ -+obj-m += zcommon/ -+obj-m += zfs/ - - INSTALL_MOD_DIR ?= extra - -@@ -60,13 +60,13 @@ modules_install: - modules_uninstall: - @# Uninstall the kernel modules - kmoddir=$(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@ -- list='$(subdir-m)'; for subdir in $$list; do \ -- $(RM) -R $$kmoddir/$(INSTALL_MOD_DIR)/$$subdir; \ -+ list='$(obj-m)'; for objdir in $$list; do \ -+ $(RM) -R $$kmoddir/$(INSTALL_MOD_DIR)/$$objdir; \ - done - - distdir: -- list='$(subdir-m)'; for subdir in $$list; do \ -- (cd @top_srcdir@/module && find $$subdir -name '*.c' -o -name '*.h' -o -name '*.S' |\ -+ list='$(obj-m)'; for objdir in $$list; do \ -+ (cd @top_srcdir@/module && find $$objdir -name '*.c' -o -name '*.h' -o -name '*.S' |\ - xargs cp --parents -t $$distdir); \ - done - --- -2.23.0 - diff --git a/0002-fix-5.6-build.patch b/0002-fix-5.6-build.patch deleted file mode 100644 index ce96f263d8ee..000000000000 --- a/0002-fix-5.6-build.patch +++ /dev/null @@ -1,676 +0,0 @@ -From 02906709cd4d17ab06b5ef48796531838dce4e0c Mon Sep 17 00:00:00 2001 -From: Brian Behlendorf <behlendorf1@llnl.gov> -Date: Thu, 6 Feb 2020 10:30:41 -0800 -Subject: [PATCH 1/4] Linux 5.6 compat: struct proc_ops - -The proc_ops structure was introduced to replace the use of of the -file_operations structure when registering proc handlers. This -change creates a new kstat_proc_op_t typedef for compatibility -which can be used to pass around the correct structure. - -This change additionally adds the 'const' keyword to all of the -existing proc operations structures. - -Reviewed-by: Tony Hutter <hutter2@llnl.gov> -Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> -Closes #9961 -(cherry picked from commit 0dd73648532e8654e07c28bba6c80bfb779a4938) ---- - config/kernel-proc-operations.m4 | 41 ++++++++++++++++++++++++++++++++ - config/kernel.m4 | 2 ++ - include/spl/sys/kstat.h | 8 ++++++- - module/spl/spl-kstat.c | 14 ++++++++--- - module/spl/spl-proc.c | 33 ++++++++++++++++++++----- - module/spl/spl-procfs-list.c | 11 +++++++-- - 6 files changed, 97 insertions(+), 12 deletions(-) - create mode 100644 config/kernel-proc-operations.m4 - -diff --git a/config/kernel-proc-operations.m4 b/config/kernel-proc-operations.m4 -new file mode 100644 -index 000000000..df216222e ---- /dev/null -+++ b/config/kernel-proc-operations.m4 -@@ -0,0 +1,41 @@ -+dnl # -+dnl # 5.6 API Change -+dnl # The proc_ops structure was introduced to replace the use of -+dnl # of the file_operations structure when registering proc handlers. -+dnl # -+AC_DEFUN([ZFS_AC_KERNEL_SRC_PROC_OPERATIONS], [ -+ ZFS_LINUX_TEST_SRC([proc_ops_struct], [ -+ #include <linux/proc_fs.h> -+ -+ int test_open(struct inode *ip, struct file *fp) { return 0; } -+ ssize_t test_read(struct file *fp, char __user *ptr, -+ size_t size, loff_t *offp) { return 0; } -+ ssize_t test_write(struct file *fp, const char __user *ptr, -+ size_t size, loff_t *offp) { return 0; } -+ loff_t test_lseek(struct file *fp, loff_t off, int flag) -+ { return 0; } -+ int test_release(struct inode *ip, struct file *fp) -+ { return 0; } -+ -+ const struct proc_ops test_ops __attribute__ ((unused)) = { -+ .proc_open = test_open, -+ .proc_read = test_read, -+ .proc_write = test_write, -+ .proc_lseek = test_lseek, -+ .proc_release = test_release, -+ }; -+ ], [ -+ struct proc_dir_entry *entry __attribute__ ((unused)) = -+ proc_create_data("test", 0444, NULL, &test_ops, NULL); -+ ]) -+]) -+ -+AC_DEFUN([ZFS_AC_KERNEL_PROC_OPERATIONS], [ -+ AC_MSG_CHECKING([whether proc_ops structure exists]) -+ ZFS_LINUX_TEST_RESULT([proc_ops_struct], [ -+ AC_MSG_RESULT(yes) -+ AC_DEFINE(HAVE_PROC_OPS_STRUCT, 1, [proc_ops structure exists]) -+ ], [ -+ AC_MSG_RESULT(no) -+ ]) -+]) -diff --git a/config/kernel.m4 b/config/kernel.m4 -index dce619729..3a5409b07 100644 ---- a/config/kernel.m4 -+++ b/config/kernel.m4 -@@ -54,6 +54,7 @@ AC_DEFUN([ZFS_AC_KERNEL_TEST_SRC], [ - ZFS_AC_KERNEL_SRC_CURRENT_BIO_TAIL - ZFS_AC_KERNEL_SRC_SUPER_USER_NS - ZFS_AC_KERNEL_SRC_SUBMIT_BIO -+ ZFS_AC_KERNEL_SRC_PROC_OPERATIONS - ZFS_AC_KERNEL_SRC_BLOCK_DEVICE_OPERATIONS - ZFS_AC_KERNEL_SRC_BLKDEV_GET_BY_PATH - ZFS_AC_KERNEL_SRC_BLKDEV_REREAD_PART -@@ -169,6 +170,7 @@ AC_DEFUN([ZFS_AC_KERNEL_TEST_RESULT], [ - ZFS_AC_KERNEL_TIMER_SETUP - ZFS_AC_KERNEL_CURRENT_BIO_TAIL - ZFS_AC_KERNEL_SUPER_USER_NS -+ ZFS_AC_KERNEL_PROC_OPERATIONS - ZFS_AC_KERNEL_SUBMIT_BIO - ZFS_AC_KERNEL_BLOCK_DEVICE_OPERATIONS - ZFS_AC_KERNEL_BLKDEV_GET_BY_PATH -diff --git a/include/spl/sys/kstat.h b/include/spl/sys/kstat.h -index 3ce474248..c93c53171 100644 ---- a/include/spl/sys/kstat.h -+++ b/include/spl/sys/kstat.h -@@ -152,6 +152,12 @@ typedef struct kstat_named_s { - #define KSTAT_NAMED_STR_PTR(knptr) ((knptr)->value.string.addr.ptr) - #define KSTAT_NAMED_STR_BUFLEN(knptr) ((knptr)->value.string.len) - -+#ifdef HAVE_PROC_OPS_STRUCT -+typedef struct proc_ops kstat_proc_op_t; -+#else -+typedef struct file_operations kstat_proc_op_t; -+#endif -+ - typedef struct kstat_intr { - uint_t intrs[KSTAT_NUM_INTRS]; - } kstat_intr_t; -@@ -197,7 +203,7 @@ extern void kstat_proc_entry_init(kstat_proc_entry_t *kpep, - const char *module, const char *name); - extern void kstat_proc_entry_delete(kstat_proc_entry_t *kpep); - extern void kstat_proc_entry_install(kstat_proc_entry_t *kpep, mode_t mode, -- const struct file_operations *file_ops, void *data); -+ const kstat_proc_op_t *file_ops, void *data); - - extern void __kstat_install(kstat_t *ksp); - extern void __kstat_delete(kstat_t *ksp); -diff --git a/module/spl/spl-kstat.c b/module/spl/spl-kstat.c -index c97b6d6cb..c54378ace 100644 ---- a/module/spl/spl-kstat.c -+++ b/module/spl/spl-kstat.c -@@ -507,12 +507,20 @@ proc_kstat_write(struct file *filp, const char __user *buf, size_t len, - return (len); - } - --static struct file_operations proc_kstat_operations = { -+static const kstat_proc_op_t proc_kstat_operations = { -+#ifdef HAVE_PROC_OPS_STRUCT -+ .proc_open = proc_kstat_open, -+ .proc_write = proc_kstat_write, -+ .proc_read = seq_read, -+ .proc_lseek = seq_lseek, -+ .proc_release = seq_release, -+#else - .open = proc_kstat_open, - .write = proc_kstat_write, - .read = seq_read, - .llseek = seq_lseek, - .release = seq_release, -+#endif - }; - - void -@@ -656,7 +664,7 @@ kstat_detect_collision(kstat_proc_entry_t *kpep) - */ - void - kstat_proc_entry_install(kstat_proc_entry_t *kpep, mode_t mode, -- const struct file_operations *file_ops, void *data) -+ const kstat_proc_op_t *proc_ops, void *data) - { - kstat_module_t *module; - kstat_proc_entry_t *tmp = NULL; -@@ -690,7 +698,7 @@ kstat_proc_entry_install(kstat_proc_entry_t *kpep, mode_t mode, - - kpep->kpe_owner = module; - kpep->kpe_proc = proc_create_data(kpep->kpe_name, mode, -- module->ksm_proc, file_ops, data); -+ module->ksm_proc, proc_ops, data); - if (kpep->kpe_proc == NULL) { - list_del_init(&kpep->kpe_list); - if (list_empty(&module->ksm_kstat_list)) -diff --git a/module/spl/spl-proc.c b/module/spl/spl-proc.c -index c0c13913c..40315ede3 100644 ---- a/module/spl/spl-proc.c -+++ b/module/spl/spl-proc.c -@@ -532,11 +532,18 @@ proc_slab_open(struct inode *inode, struct file *filp) - return (seq_open(filp, &slab_seq_ops)); - } - --static struct file_operations proc_slab_operations = { -- .open = proc_slab_open, -- .read = seq_read, -- .llseek = seq_lseek, -+static const kstat_proc_op_t proc_slab_operations = { -+#ifdef HAVE_PROC_OPS_STRUCT -+ .proc_open = proc_slab_open, -+ .proc_read = seq_read, -+ .proc_lseek = seq_lseek, -+ .proc_release = seq_release, -+#else -+ .open = proc_slab_open, -+ .read = seq_read, -+ .llseek = seq_lseek, - .release = seq_release, -+#endif - }; - - static void -@@ -571,18 +578,32 @@ proc_taskq_open(struct inode *inode, struct file *filp) - return (seq_open(filp, &taskq_seq_ops)); - } - --static struct file_operations proc_taskq_all_operations = { -+static const kstat_proc_op_t proc_taskq_all_operations = { -+#ifdef HAVE_PROC_OPS_STRUCT -+ .proc_open = proc_taskq_all_open, -+ .proc_read = seq_read, -+ .proc_lseek = seq_lseek, -+ .proc_release = seq_release, -+#else - .open = proc_taskq_all_open, - .read = seq_read, - .llseek = seq_lseek, - .release = seq_release, -+#endif - }; - --static struct file_operations proc_taskq_operations = { -+static const kstat_proc_op_t proc_taskq_operations = { -+#ifdef HAVE_PROC_OPS_STRUCT -+ .proc_open = proc_taskq_open, -+ .proc_read = seq_read, -+ .proc_lseek = seq_lseek, -+ .proc_release = seq_release, -+#else - .open = proc_taskq_open, - .read = seq_read, - .llseek = seq_lseek, - .release = seq_release, -+#endif - }; - - static struct ctl_table spl_kmem_table[] = { -diff --git a/module/spl/spl-procfs-list.c b/module/spl/spl-procfs-list.c -index f6a00da5c..189d6a7c6 100644 ---- a/module/spl/spl-procfs-list.c -+++ b/module/spl/spl-procfs-list.c -@@ -185,13 +185,20 @@ procfs_list_write(struct file *filp, const char __user *buf, size_t len, - return (len); - } - --static struct file_operations procfs_list_operations = { -- .owner = THIS_MODULE, -+static const kstat_proc_op_t procfs_list_operations = { -+#ifdef HAVE_PROC_OPS_STRUCT -+ .proc_open = procfs_list_open, -+ .proc_write = procfs_list_write, -+ .proc_read = seq_read, -+ .proc_lseek = seq_lseek, -+ .proc_release = seq_release_private, -+#else - .open = procfs_list_open, - .write = procfs_list_write, - .read = seq_read, - .llseek = seq_lseek, - .release = seq_release_private, -+#endif - }; - - /* --- -2.26.0 - - -From 7a1b4338ec69e01acf2f1eaee617646621c72c81 Mon Sep 17 00:00:00 2001 -From: Brian Behlendorf <behlendorf1@llnl.gov> -Date: Thu, 6 Feb 2020 12:37:25 -0800 -Subject: [PATCH 2/4] Linux 5.6 compat: timestamp_truncate() - -The timestamp_truncate() function was added, it replaces the existing -timespec64_trunc() function. This change renames our wrapper function -to be consistent with the upstream name and updates the compatibility -code for older kernels accordingly. - -Reviewed-by: Tony Hutter <hutter2@llnl.gov> -Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> -Closes #9956 -Closes #9961 -(cherry picked from commit 795699a6cc28b8f1059397e03d1a86d576bfc7dc) ---- - config/kernel-inode-times.m4 | 31 +++++++++++++++++++++++++++---- - include/sys/zpl.h | 13 +++++++------ - module/zfs/zfs_vnops.c | 8 ++++---- - module/zfs/zpl_inode.c | 6 ++---- - 4 files changed, 40 insertions(+), 18 deletions(-) - -diff --git a/config/kernel-inode-times.m4 b/config/kernel-inode-times.m4 -index 57e7f31fd..8a79c299e 100644 ---- a/config/kernel-inode-times.m4 -+++ b/config/kernel-inode-times.m4 -@@ -1,8 +1,22 @@ --dnl # --dnl # 4.18 API change --dnl # i_atime, i_mtime, and i_ctime changed from timespec to timespec64. --dnl # - AC_DEFUN([ZFS_AC_KERNEL_SRC_INODE_TIMES], [ -+ -+ dnl # -+ dnl # 5.6 API change -+ dnl # timespec64_trunc() replaced by timestamp_truncate() interface. -+ dnl # -+ ZFS_LINUX_TEST_SRC([timestamp_truncate], [ -+ #include <linux/fs.h> -+ ],[ -+ struct timespec64 ts; -+ struct inode ip; -+ -+ ts = timestamp_truncate(ts, &ip); -+ ]) -+ -+ dnl # -+ dnl # 4.18 API change -+ dnl # i_atime, i_mtime, and i_ctime changed from timespec to timespec64. -+ dnl # - ZFS_LINUX_TEST_SRC([inode_times], [ - #include <linux/fs.h> - ],[ -@@ -15,6 +29,15 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_INODE_TIMES], [ - ]) - - AC_DEFUN([ZFS_AC_KERNEL_INODE_TIMES], [ -+ AC_MSG_CHECKING([whether timestamp_truncate() exists]) -+ ZFS_LINUX_TEST_RESULT([timestamp_truncate], [ -+ AC_MSG_RESULT(yes) -+ AC_DEFINE(HAVE_INODE_TIMESTAMP_TRUNCATE, 1, -+ [timestamp_truncate() exists]) -+ ],[ -+ AC_MSG_RESULT(no) -+ ]) -+ - AC_MSG_CHECKING([whether inode->i_*time's are timespec64]) - ZFS_LINUX_TEST_RESULT([inode_times], [ - AC_MSG_RESULT(no) -diff --git a/include/sys/zpl.h b/include/sys/zpl.h -index 2766269f3..f88ccd540 100644 ---- a/include/sys/zpl.h -+++ b/include/sys/zpl.h -@@ -188,13 +188,14 @@ zpl_dir_emit_dots(struct file *file, zpl_dir_context_t *ctx) - } - #endif /* HAVE_VFS_ITERATE */ - --/* -- * Linux 4.18, inode times converted from timespec to timespec64. -- */ --#if defined(HAVE_INODE_TIMESPEC64_TIMES) --#define zpl_inode_timespec_trunc(ts, gran) timespec64_trunc(ts, gran) -+#if defined(HAVE_INODE_TIMESTAMP_TRUNCATE) -+#define zpl_inode_timestamp_truncate(ts, ip) timestamp_truncate(ts, ip) -+#elif defined(HAVE_INODE_TIMESPEC64_TIMES) -+#define zpl_inode_timestamp_truncate(ts, ip) \ -+ timespec64_trunc(ts, (ip)->i_sb->s_time_gran) - #else --#define zpl_inode_timespec_trunc(ts, gran) timespec_trunc(ts, gran) -+#define zpl_inode_timestamp_truncate(ts, ip) \ -+ timespec_trunc(ts, (ip)->i_sb->s_time_gran) - #endif - - #endif /* _SYS_ZPL_H */ -diff --git a/module/zfs/zfs_vnops.c b/module/zfs/zfs_vnops.c -index 03a8c4a50..c322edf6a 100644 ---- a/module/zfs/zfs_vnops.c -+++ b/module/zfs/zfs_vnops.c -@@ -3415,8 +3415,8 @@ top: - - if (mask & (ATTR_MTIME | ATTR_SIZE)) { - ZFS_TIME_ENCODE(&vap->va_mtime, mtime); -- ZTOI(zp)->i_mtime = zpl_inode_timespec_trunc(vap->va_mtime, -- ZTOI(zp)->i_sb->s_time_gran); -+ ZTOI(zp)->i_mtime = zpl_inode_timestamp_truncate( -+ vap->va_mtime, ZTOI(zp)); - - SA_ADD_BULK_ATTR(bulk, count, SA_ZPL_MTIME(zfsvfs), NULL, - mtime, sizeof (mtime)); -@@ -3424,8 +3424,8 @@ top: - - if (mask & (ATTR_CTIME | ATTR_SIZE)) { - ZFS_TIME_ENCODE(&vap->va_ctime, ctime); -- ZTOI(zp)->i_ctime = zpl_inode_timespec_trunc(vap->va_ctime, -- ZTOI(zp)->i_sb->s_time_gran); -+ ZTOI(zp)->i_ctime = zpl_inode_timestamp_truncate(vap->va_ctime, -+ ZTOI(zp)); - SA_ADD_BULK_ATTR(bulk, count, SA_ZPL_CTIME(zfsvfs), NULL, - ctime, sizeof (ctime)); - } -diff --git a/module/zfs/zpl_inode.c b/module/zfs/zpl_inode.c -index 5660f8b0e..1f228dcf8 100644 ---- a/module/zfs/zpl_inode.c -+++ b/module/zfs/zpl_inode.c -@@ -390,10 +390,8 @@ zpl_setattr(struct dentry *dentry, struct iattr *ia) - vap->va_mtime = ia->ia_mtime; - vap->va_ctime = ia->ia_ctime; - -- if (vap->va_mask & ATTR_ATIME) { -- ip->i_atime = zpl_inode_timespec_trunc(ia->ia_atime, -- ip->i_sb->s_time_gran); -- } -+ if (vap->va_mask & ATTR_ATIME) -+ ip->i_atime = zpl_inode_timestamp_truncate(ia->ia_atime, ip); - - cookie = spl_fstrans_mark(); - error = -zfs_setattr(ip, vap, 0, cr); --- -2.26.0 - - -From 3aed5107cd5645a373fc4c352693c9bf8f2bbd61 Mon Sep 17 00:00:00 2001 -From: Brian Behlendorf <behlendorf1@llnl.gov> -Date: Wed, 26 Feb 2020 12:42:33 -0800 -Subject: [PATCH 3/4] Linux 5.6 compat: ktime_get_raw_ts64() - -The getrawmonotonic() and getrawmonotonic64() interfaces have been -fully retired. Update gethrtime() to use the replacement interface -ktime_get_raw_ts64() which was introduced in the 4.18 kernel. - -Reviewed-by: Tony Hutter <hutter2@llnl.gov> -Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> -Closes #10052 -Closes #10064 -(cherry picked from commit ff5587d651371ab496f7962e85fe2c337fdb8a59) ---- - config/kernel-ktime.m4 | 55 +++++++++++++++++++++ - config/kernel-ktime_get_coarse_real_ts64.m4 | 23 --------- - config/kernel.m4 | 4 +- - include/spl/sys/time.h | 5 ++ - 4 files changed, 62 insertions(+), 25 deletions(-) - create mode 100644 config/kernel-ktime.m4 - delete mode 100644 config/kernel-ktime_get_coarse_real_ts64.m4 - -diff --git a/config/kernel-ktime.m4 b/config/kernel-ktime.m4 -new file mode 100644 -index 000000000..64c3b5f90 ---- /dev/null -+++ b/config/kernel-ktime.m4 -@@ -0,0 +1,55 @@ -+dnl # -+dnl # 4.18: ktime_get_coarse_real_ts64() replaces current_kernel_time64(). -+dnl # -+AC_DEFUN([ZFS_AC_KERNEL_SRC_KTIME_GET_COARSE_REAL_TS64], [ -+ ZFS_LINUX_TEST_SRC([ktime_get_coarse_real_ts64], [ -+ #include <linux/mm.h> -+ ], [ -+ struct timespec64 ts; -+ ktime_get_coarse_real_ts64(&ts); -+ ]) -+]) -+ -+AC_DEFUN([ZFS_AC_KERNEL_KTIME_GET_COARSE_REAL_TS64], [ -+ AC_MSG_CHECKING([whether ktime_get_coarse_real_ts64() exists]) -+ ZFS_LINUX_TEST_RESULT([ktime_get_coarse_real_ts64], [ -+ AC_MSG_RESULT(yes) -+ AC_DEFINE(HAVE_KTIME_GET_COARSE_REAL_TS64, 1, -+ [ktime_get_coarse_real_ts64() exists]) -+ ], [ -+ AC_MSG_RESULT(no) -+ ]) -+]) -+ -+dnl # -+dnl # 4.18: ktime_get_raw_ts64() replaces getrawmonotonic64(). -+dnl # -+AC_DEFUN([ZFS_AC_KERNEL_SRC_KTIME_GET_RAW_TS64], [ -+ ZFS_LINUX_TEST_SRC([ktime_get_raw_ts64], [ -+ #include <linux/mm.h> -+ ], [ -+ struct timespec64 ts; -+ ktime_get_raw_ts64(&ts); -+ ]) -+]) -+ -+AC_DEFUN([ZFS_AC_KERNEL_KTIME_GET_RAW_TS64], [ -+ AC_MSG_CHECKING([whether ktime_get_raw_ts64() exists]) -+ ZFS_LINUX_TEST_RESULT([ktime_get_raw_ts64], [ -+ AC_MSG_RESULT(yes) -+ AC_DEFINE(HAVE_KTIME_GET_RAW_TS64, 1, -+ [ktime_get_raw_ts64() exists]) -+ ], [ -+ AC_MSG_RESULT(no) -+ ]) -+]) -+ -+AC_DEFUN([ZFS_AC_KERNEL_SRC_KTIME], [ -+ ZFS_AC_KERNEL_SRC_KTIME_GET_COARSE_REAL_TS64 -+ ZFS_AC_KERNEL_SRC_KTIME_GET_RAW_TS64 -+]) -+ -+AC_DEFUN([ZFS_AC_KERNEL_KTIME], [ -+ ZFS_AC_KERNEL_KTIME_GET_COARSE_REAL_TS64 -+ ZFS_AC_KERNEL_KTIME_GET_RAW_TS64 -+]) -diff --git a/config/kernel-ktime_get_coarse_real_ts64.m4 b/config/kernel-ktime_get_coarse_real_ts64.m4 -deleted file mode 100644 -index 28492bf04..000000000 ---- a/config/kernel-ktime_get_coarse_real_ts64.m4 -+++ /dev/null -@@ -1,23 +0,0 @@ --dnl # --dnl # 4.18: ktime_get_coarse_real_ts64() added. Use it in place of --dnl # current_kernel_time64(). --dnl # --AC_DEFUN([ZFS_AC_KERNEL_SRC_KTIME_GET_COARSE_REAL_TS64], [ -- ZFS_LINUX_TEST_SRC([ktime_get_coarse_real_ts64], [ -- #include <linux/mm.h> -- ], [ -- struct timespec64 ts; -- ktime_get_coarse_real_ts64(&ts); -- ]) --]) -- --AC_DEFUN([ZFS_AC_KERNEL_KTIME_GET_COARSE_REAL_TS64], [ -- AC_MSG_CHECKING([whether ktime_get_coarse_real_ts64() exists]) -- ZFS_LINUX_TEST_RESULT([ktime_get_coarse_real_ts64], [ -- AC_MSG_RESULT(yes) -- AC_DEFINE(HAVE_KTIME_GET_COARSE_REAL_TS64, 1, -- [ktime_get_coarse_real_ts64() exists]) -- ], [ -- AC_MSG_RESULT(no) -- ]) --]) -diff --git a/config/kernel.m4 b/config/kernel.m4 -index 3a5409b07..383f92984 100644 ---- a/config/kernel.m4 -+++ b/config/kernel.m4 -@@ -137,7 +137,7 @@ AC_DEFUN([ZFS_AC_KERNEL_TEST_SRC], [ - ZFS_AC_KERNEL_SRC_CURRENT_TIME - ZFS_AC_KERNEL_SRC_USERNS_CAPABILITIES - ZFS_AC_KERNEL_SRC_IN_COMPAT_SYSCALL -- ZFS_AC_KERNEL_SRC_KTIME_GET_COARSE_REAL_TS64 -+ ZFS_AC_KERNEL_SRC_KTIME - ZFS_AC_KERNEL_SRC_TOTALRAM_PAGES_FUNC - ZFS_AC_KERNEL_SRC_TOTALHIGH_PAGES - ZFS_AC_KERNEL_SRC_KSTRTOUL -@@ -254,7 +254,7 @@ AC_DEFUN([ZFS_AC_KERNEL_TEST_RESULT], [ - ZFS_AC_KERNEL_CURRENT_TIME - ZFS_AC_KERNEL_USERNS_CAPABILITIES - ZFS_AC_KERNEL_IN_COMPAT_SYSCALL -- ZFS_AC_KERNEL_KTIME_GET_COARSE_REAL_TS64 -+ ZFS_AC_KERNEL_KTIME - ZFS_AC_KERNEL_TOTALRAM_PAGES_FUNC - ZFS_AC_KERNEL_TOTALHIGH_PAGES - ZFS_AC_KERNEL_KSTRTOUL -diff --git a/include/spl/sys/time.h b/include/spl/sys/time.h -index 312415b7b..56fd725c0 100644 ---- a/include/spl/sys/time.h -+++ b/include/spl/sys/time.h -@@ -105,8 +105,13 @@ gethrestime_sec(void) - static inline hrtime_t - gethrtime(void) - { -+#if defined(HAVE_KTIME_GET_RAW_TS64) -+ struct timespec64 ts; -+ ktime_get_raw_ts64(&ts); -+#else - struct timespec ts; - getrawmonotonic(&ts); -+#endif - return (((hrtime_t)ts.tv_sec * NSEC_PER_SEC) + ts.tv_nsec); - } - --- -2.26.0 - - -From 6f38b244502f763d6e20290397ccb29d628499fa Mon Sep 17 00:00:00 2001 -From: Brian Behlendorf <behlendorf1@llnl.gov> -Date: Wed, 26 Feb 2020 13:18:07 -0800 -Subject: [PATCH 4/4] Linux 5.6 compat: time_t - -As part of the Linux kernel's y2038 changes the time_t type has been -fully retired. Callers are now required to use the time64_t type. - -Rather than move to the new type, I've removed the few remaining -places where a time_t is used in the kernel code. They've been -replaced with a uint64_t which is already how ZFS internally -handled these values. - -Going forward we should work towards updating the remaining user -space time_t consumers to the 64-bit interfaces. - -Reviewed-by: Matthew Macy <mmacy@freebsd.org> -Reviewed-by: Tony Hutter <hutter2@llnl.gov> -Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> -Closes #10052 -Closes #10064 -(cherry picked from commit 2c3a83701dd185cadb30db4556256534e2930c7d) ---- - include/spl/sys/time.h | 2 +- - include/sys/vdev_impl.h | 4 ++-- - lib/libspl/include/sys/time.h | 2 +- - module/zfs/vdev_initialize.c | 2 +- - module/zfs/vdev_trim.c | 2 +- - module/zfs/zfs_debug.c | 2 +- - 6 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/include/spl/sys/time.h b/include/spl/sys/time.h -index 56fd725c0..4309c300b 100644 ---- a/include/spl/sys/time.h -+++ b/include/spl/sys/time.h -@@ -85,7 +85,7 @@ gethrestime(inode_timespec_t *ts) - #endif - } - --static inline time_t -+static inline uint64_t - gethrestime_sec(void) - { - #if defined(HAVE_INODE_TIMESPEC64_TIMES) -diff --git a/include/sys/vdev_impl.h b/include/sys/vdev_impl.h -index f6f7bbb4b..090ba3fbc 100644 ---- a/include/sys/vdev_impl.h -+++ b/include/sys/vdev_impl.h -@@ -274,7 +274,7 @@ struct vdev { - range_tree_t *vdev_initialize_tree; /* valid while initializing */ - uint64_t vdev_initialize_bytes_est; - uint64_t vdev_initialize_bytes_done; -- time_t vdev_initialize_action_time; /* start and end time */ -+ uint64_t vdev_initialize_action_time; /* start and end time */ - - /* TRIM related */ - boolean_t vdev_trim_exit_wanted; -@@ -295,7 +295,7 @@ struct vdev { - uint64_t vdev_trim_rate; /* requested rate (bytes/sec) */ - uint64_t vdev_trim_partial; /* requested partial TRIM */ - uint64_t vdev_trim_secure; /* requested secure TRIM */ -- time_t vdev_trim_action_time; /* start and end time */ -+ uint64_t vdev_trim_action_time; /* start and end time */ - - /* for limiting outstanding I/Os (initialize and TRIM) */ - kmutex_t vdev_initialize_io_lock; -diff --git a/lib/libspl/include/sys/time.h b/lib/libspl/include/sys/time.h -index 291f2190a..c9f616504 100644 ---- a/lib/libspl/include/sys/time.h -+++ b/lib/libspl/include/sys/time.h -@@ -88,7 +88,7 @@ gethrestime(inode_timespec_t *ts) - ts->tv_nsec = tv.tv_usec * NSEC_PER_USEC; - } - --static inline time_t -+static inline uint64_t - gethrestime_sec(void) - { - struct timeval tv; -diff --git a/module/zfs/vdev_initialize.c b/module/zfs/vdev_initialize.c -index 9958a2958..8a3635969 100644 ---- a/module/zfs/vdev_initialize.c -+++ b/module/zfs/vdev_initialize.c -@@ -700,7 +700,7 @@ vdev_initialize_restart(vdev_t *vd) - vd->vdev_leaf_zap, VDEV_LEAF_ZAP_INITIALIZE_ACTION_TIME, - sizeof (timestamp), 1, ×tamp); - ASSERT(err == 0 || err == ENOENT); -- vd->vdev_initialize_action_time = (time_t)timestamp; -+ vd->vdev_initialize_action_time = timestamp; - - if (vd->vdev_initialize_state == VDEV_INITIALIZE_SUSPENDED || - vd->vdev_offline) { -diff --git a/module/zfs/vdev_trim.c b/module/zfs/vdev_trim.c -index 5ad47cccd..b7548fc4c 100644 ---- a/module/zfs/vdev_trim.c -+++ b/module/zfs/vdev_trim.c -@@ -1046,7 +1046,7 @@ vdev_trim_restart(vdev_t *vd) - vd->vdev_leaf_zap, VDEV_LEAF_ZAP_TRIM_ACTION_TIME, - sizeof (timestamp), 1, ×tamp); - ASSERT(err == 0 || err == ENOENT); -- vd->vdev_trim_action_time = (time_t)timestamp; -+ vd->vdev_trim_action_time = timestamp; - - if (vd->vdev_trim_state == VDEV_TRIM_SUSPENDED || - vd->vdev_offline) { -diff --git a/module/zfs/zfs_debug.c b/module/zfs/zfs_debug.c -index 538533d27..cf8bbb3ce 100644 ---- a/module/zfs/zfs_debug.c -+++ b/module/zfs/zfs_debug.c -@@ -27,7 +27,7 @@ - - typedef struct zfs_dbgmsg { - procfs_list_node_t zdm_node; -- time_t zdm_timestamp; -+ uint64_t zdm_timestamp; - int zdm_size; - char zdm_msg[1]; /* variable length allocation */ - } zfs_dbgmsg_t; --- -2.26.0 - @@ -1,27 +1,27 @@ -# Maintainer: Eli Schwartz <eschwartz@archlinux.org> +# Maintainer: Kevin Stolp <kevinstolp@gmail.com> +# Contributor: Eli Schwartz <eschwartz@archlinux.org> # Contributor: Iacopo Isimbaldi <isiachi@rhye.it> -# All my PKGBUILDs are managed at https://github.com/eli-schwartz/pkgbuilds - pkgname=zfs-dkms -pkgver=2.1.5 -pkgrel=1 +pkgver=2.2.3 +pkgrel=2 pkgdesc="Kernel modules for the Zettabyte File System." arch=('any') url="https://zfsonlinux.org/" license=('CDDL') -conflicts=('spl-dkms') -provides=("ZFS-MODULE=${pkgver}" "SPL-MODULE=${pkgver}" 'spl-dkms') +provides=("ZFS-MODULE=${pkgver}" "SPL-MODULE=${pkgver}") # ambiguous, provided for backwards compat, pls don't use provides+=('zfs') -replaces=('spl-dkms') source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-${pkgver}/zfs-${pkgver}.tar.gz"{,.asc} + "https://github.com/openzfs/zfs/commit/2b481b5477d3a95d0eab723c6639f7114e146ae1.patch" "0001-only-build-the-module-in-dkms.conf.patch") -sha256sums=('1913041e5c44ff07ca384346ad8145aeedf77e77cd1cea9ec5d533246691e10c' +sha256sums=('30a512f34ec5c841b8b2b32cc9c1a03fd49391b26c9164d3fb30573fb5d81ac3' 'SKIP' + 'b3444bbb71b508e12dcbce1a61d01275960f6c38b8db9c163aced83e4cd092c8' '8d5c31f883a906ab42776dcda79b6c89f904d8f356ade0dab5491578a6af55a5') -b2sums=('c6e3efd9c0cda91654767eaad0eaaa05cd9a5daf1cb0384c9c78b30062f5c29142ac37ab9dbdaf96c91456d11c317d782d3524ade293f03fda983e5992b79e49' +b2sums=('f83439aa929609191a048dd326b2a15e0f57c72d2901cbfb205b81a29aa42dab49b42eb61647ca3eaed17518b8c907e81343364bfecf83ed441271648f8efd4b' 'SKIP' + '245f489ba2f916e95fbbc9616ac7d9f6149dd3b6c63580b25c0af69aa2ad96d2ed28bf4e1446cbf7c8299f5c14de4712c931d3f4949bb8149d5a966310ca6977' '58dc2494e71b50833d44c126b72acad52e9817626542afbc245b7ba82009e8c8252ebde6023592aac42d9942207e7655c0a421da9067fbdd619746ebc372d791') validpgpkeys=('4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027' # Tony Hutter (GPG key for signing ZFS releases) <hutter2@llnl.gov> 'C33DF142657ED1F7C328A2960AB9E991C6AF658B') # Brian Behlendorf <behlendorf1@llnl.gov> @@ -31,6 +31,9 @@ prepare() { patch -p1 -i ../0001-only-build-the-module-in-dkms.conf.patch + # Apply patch to warn on unsupported kernel version. (https://github.com/openzfs/zfs/pull/15986) + patch -p1 -i ../2b481b5477d3a95d0eab723c6639f7114e146ae1.patch + # remove unneeded sections from module build sed -ri "/AC_CONFIG_FILES/,/]\)/{ /AC_CONFIG_FILES/n |