diff options
| -rw-r--r-- | include/Makefile.am | 1 | ||||
| -rw-r--r-- | include/cityhash.h (renamed from include/sys/cityhash.h) | 0 | ||||
| -rw-r--r-- | include/sys/Makefile.am | 1 | ||||
| -rw-r--r-- | lib/libzfs/Makefile.am | 1 | ||||
| -rw-r--r-- | module/zcommon/Makefile.in | 1 | ||||
| -rw-r--r-- | module/zcommon/cityhash.c (renamed from module/zfs/cityhash.c) | 6 | ||||
| -rw-r--r-- | module/zfs/Makefile.in | 1 | ||||
| -rw-r--r-- | module/zfs/arc.c | 2 | ||||
| -rw-r--r-- | module/zfs/dbuf.c | 2 | ||||
| -rw-r--r-- | module/zfs/zio.c | 2 |
10 files changed, 11 insertions, 6 deletions
diff --git a/include/Makefile.am b/include/Makefile.am index 5b37dc765..9591d4423 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1,6 +1,7 @@ SUBDIRS = sys os COMMON_H = \ + $(top_srcdir)/include/cityhash.h \ $(top_srcdir)/include/zfeature_common.h \ $(top_srcdir)/include/zfs_comutil.h \ $(top_srcdir)/include/zfs_deleg.h \ diff --git a/include/sys/cityhash.h b/include/cityhash.h index 33c3b7bc2..33c3b7bc2 100644 --- a/include/sys/cityhash.h +++ b/include/cityhash.h diff --git a/include/sys/Makefile.am b/include/sys/Makefile.am index bcfa12fca..82165170a 100644 --- a/include/sys/Makefile.am +++ b/include/sys/Makefile.am @@ -14,7 +14,6 @@ COMMON_H = \ $(top_srcdir)/include/sys/bptree.h \ $(top_srcdir)/include/sys/btree.h \ $(top_srcdir)/include/sys/bqueue.h \ - $(top_srcdir)/include/sys/cityhash.h \ $(top_srcdir)/include/sys/dataset_kstats.h \ $(top_srcdir)/include/sys/dbuf.h \ $(top_srcdir)/include/sys/ddt.h \ diff --git a/lib/libzfs/Makefile.am b/lib/libzfs/Makefile.am index da42307bb..2747a7e9b 100644 --- a/lib/libzfs/Makefile.am +++ b/lib/libzfs/Makefile.am @@ -38,6 +38,7 @@ endif KERNEL_C = \ algs/sha2/sha2.c \ + cityhash.c \ zfeature_common.c \ zfs_comutil.c \ zfs_deleg.c \ diff --git a/module/zcommon/Makefile.in b/module/zcommon/Makefile.in index b2e34f2e9..01e0692eb 100644 --- a/module/zcommon/Makefile.in +++ b/module/zcommon/Makefile.in @@ -11,6 +11,7 @@ ccflags-y := $(ZFS_MODULE_CFLAGS) $(ZFS_MODULE_CPPFLAGS) # Suppress unused-value warnings in sparc64 architecture headers ccflags-$(CONFIG_SPARC64) += -Wno-unused-value +$(MODULE)-objs += cityhash.o $(MODULE)-objs += zfeature_common.o $(MODULE)-objs += zfs_comutil.o $(MODULE)-objs += zfs_deleg.o diff --git a/module/zfs/cityhash.c b/module/zcommon/cityhash.c index 2b62edad0..413a96df2 100644 --- a/module/zfs/cityhash.c +++ b/module/zcommon/cityhash.c @@ -22,7 +22,7 @@ * Copyright (c) 2017 by Delphix. All rights reserved. */ -#include <sys/cityhash.h> +#include <cityhash.h> #define HASH_K1 0xb492b66fbe98f273ULL #define HASH_K2 0x9ae16a3b2f90404fULL @@ -61,3 +61,7 @@ cityhash4(uint64_t w1, uint64_t w2, uint64_t w3, uint64_t w4) a + rotate(b + HASH_K2, 18) + c, mul)); } + +#if defined(_KERNEL) +EXPORT_SYMBOL(cityhash4); +#endif diff --git a/module/zfs/Makefile.in b/module/zfs/Makefile.in index 1ba7db27b..6737336ca 100644 --- a/module/zfs/Makefile.in +++ b/module/zfs/Makefile.in @@ -22,7 +22,6 @@ $(MODULE)-objs += bpobj.o $(MODULE)-objs += bptree.o $(MODULE)-objs += btree.o $(MODULE)-objs += bqueue.o -$(MODULE)-objs += cityhash.o $(MODULE)-objs += dataset_kstats.o $(MODULE)-objs += dbuf.o $(MODULE)-objs += dbuf_stats.o diff --git a/module/zfs/arc.c b/module/zfs/arc.c index 6c9164f76..c6b194183 100644 --- a/module/zfs/arc.c +++ b/module/zfs/arc.c @@ -299,7 +299,7 @@ #include <sys/arc_impl.h> #include <sys/trace_zfs.h> #include <sys/aggsum.h> -#include <sys/cityhash.h> +#include <cityhash.h> #ifndef _KERNEL /* set with ZFS_DEBUG=watch, to enable watchpoints on frozen buffers */ diff --git a/module/zfs/dbuf.c b/module/zfs/dbuf.c index d7f5e1ee3..be6a76830 100644 --- a/module/zfs/dbuf.c +++ b/module/zfs/dbuf.c @@ -48,7 +48,7 @@ #include <sys/callb.h> #include <sys/abd.h> #include <sys/vdev.h> -#include <sys/cityhash.h> +#include <cityhash.h> #include <sys/spa_impl.h> kstat_t *dbuf_ksp; diff --git a/module/zfs/zio.c b/module/zfs/zio.c index de2e8e767..b9a3ddcf2 100644 --- a/module/zfs/zio.c +++ b/module/zfs/zio.c @@ -47,7 +47,7 @@ #include <sys/trace_zfs.h> #include <sys/abd.h> #include <sys/dsl_crypt.h> -#include <sys/cityhash.h> +#include <cityhash.h> /* * ========================================================================== |