aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColy Li <colyli@suse.de>2018-07-19 00:39:11 +0800
committerColy Li <colyli@suse.de>2018-07-19 00:39:11 +0800
commit46fd66ea45e9c512b92a962340456747b17ae901 (patch)
treefeff40e697fcc25784de8d8796ca352adf80c754
parente2637ec1441ee3b8517225a8f02f20463cf671b0 (diff)
downloadbcache-patches-46fd66ea45e9c512b92a962340456747b17ae901.tar.gz
for-test: remove old patches
-rw-r--r--for-test/libcrc64/old/0001-lib-crc64-add-crc64-option-to-lib-Kconfig.patch37
-rw-r--r--for-test/libcrc64/old/0002-lib-crc64-add-crc64-entries-into-lib-Makefile.patch57
-rw-r--r--for-test/libcrc64/old/0003-lib-crc64-add-64bits-CRC-calculation.patch226
-rw-r--r--for-test/libcrc64/old/0004-bcache-use-routines-from-lib-crc64.c-for-CRC64-calcu.patch254
4 files changed, 0 insertions, 574 deletions
diff --git a/for-test/libcrc64/old/0001-lib-crc64-add-crc64-option-to-lib-Kconfig.patch b/for-test/libcrc64/old/0001-lib-crc64-add-crc64-option-to-lib-Kconfig.patch
deleted file mode 100644
index 9a5d2a8..0000000
--- a/for-test/libcrc64/old/0001-lib-crc64-add-crc64-option-to-lib-Kconfig.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From d1ec7c2f3c4afa11cac6210805a2c6c2032f83ac Mon Sep 17 00:00:00 2001
-From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
-Date: Wed, 23 May 2018 13:23:32 +0800
-Subject: [PATCH 1/4] lib/crc64: add crc64 option to lib/Kconfig
-
-This patch adds crc64 option entry in lib/Kconfig. This patch is part of
-a patch originally written by Andy Shevchenko, Coly Li cherry-picks it
-and compose the commit log for a re-written crc64 source code.
-
-Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
-Signed-off-by: Coly Li <colyli@suse.de>
----
- lib/Kconfig | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/lib/Kconfig b/lib/Kconfig
-index 5fe577673b98..fd94ea64aab7 100644
---- a/lib/Kconfig
-+++ b/lib/Kconfig
-@@ -170,6 +170,14 @@ config CRC32_BIT
-
- endchoice
-
-+config CRC64
-+ tristate "CRC64 functions"
-+ help
-+ This option is provided for the case where no in-kernel-tree
-+ modules require CRC64 functions, but a module built outside
-+ the kernel tree does. Such modules that use library CRC64
-+ functions require M he
-+
- config CRC4
- tristate "CRC4 functions"
- help
---
-2.16.3
-
diff --git a/for-test/libcrc64/old/0002-lib-crc64-add-crc64-entries-into-lib-Makefile.patch b/for-test/libcrc64/old/0002-lib-crc64-add-crc64-entries-into-lib-Makefile.patch
deleted file mode 100644
index e3ea676..0000000
--- a/for-test/libcrc64/old/0002-lib-crc64-add-crc64-entries-into-lib-Makefile.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From dbe32fb05b960dd7df21740426d44151c6048879 Mon Sep 17 00:00:00 2001
-From: Coly Li <colyli@suse.de>
-Date: Wed, 23 May 2018 13:29:54 +0800
-Subject: [PATCH 2/4] lib/crc64: add crc64 entries into lib/Makefile
-
-This patch changes lib/Makefile for lib/gen_crc64table.c and lib/crc64.c.
-When Linux kernel is built, lib/gen_crc64table.c will be compiled to
-lib/gen_crc64table and executed. The output of execution is an array called
-as lookup table which contain 256 64bits-long numbers, this talbe is dumped
-into header file lib/crc64table.h. Then the header file is included by
-lib/crc64.c for normal 64bit crc calculation.
-
-Signed-off-by: Coly Li <colyli@suse.de>
----
- lib/Makefile | 11 +++++++++++
- 1 file changed, 11 insertions(+)
-
-diff --git a/lib/Makefile b/lib/Makefile
-index ce20696d5a92..21873fc4085b 100644
---- a/lib/Makefile
-+++ b/lib/Makefile
-@@ -107,6 +107,7 @@ obj-$(CONFIG_CRC16) += crc16.o
- obj-$(CONFIG_CRC_T10DIF)+= crc-t10dif.o
- obj-$(CONFIG_CRC_ITU_T) += crc-itu-t.o
- obj-$(CONFIG_CRC32) += crc32.o
-+obj-$(CONFIG_CRC64) += crc64.o
- obj-$(CONFIG_CRC32_SELFTEST) += crc32test.o
- obj-$(CONFIG_CRC4) += crc4.o
- obj-$(CONFIG_CRC7) += crc7.o
-@@ -223,7 +224,9 @@ obj-$(CONFIG_FONT_SUPPORT) += fonts/
- obj-$(CONFIG_PRIME_NUMBERS) += prime_numbers.o
-
- hostprogs-y := gen_crc32table
-+hostprogs-y += gen_crc64table
- clean-files := crc32table.h
-+clean-files += crc64table.h
-
- $(obj)/crc32.o: $(obj)/crc32table.h
-
-@@ -233,6 +236,14 @@ quiet_cmd_crc32 = GEN $@
- $(obj)/crc32table.h: $(obj)/gen_crc32table
- $(call cmd,crc32)
-
-+$(obj)/crc64.o: $(obj)/crc64table.h
-+
-+quiet_cmd_crc64 = GEN $@
-+ cmd_crc64 = $< > $@
-+
-+$(obj)/crc64table.h: $(obj)/gen_crc64table
-+ $(call cmd,crc64)
-+
- #
- # Build a fast OID lookip registry from include/linux/oid_registry.h
- #
---
-2.16.3
-
diff --git a/for-test/libcrc64/old/0003-lib-crc64-add-64bits-CRC-calculation.patch b/for-test/libcrc64/old/0003-lib-crc64-add-64bits-CRC-calculation.patch
deleted file mode 100644
index 7b3691e..0000000
--- a/for-test/libcrc64/old/0003-lib-crc64-add-64bits-CRC-calculation.patch
+++ /dev/null
@@ -1,226 +0,0 @@
-From 8a3836a1a82921d282b3025c73b6b71b8e7f1a41 Mon Sep 17 00:00:00 2001
-From: Coly Li <colyli@suse.de>
-Date: Wed, 23 May 2018 15:18:43 +0800
-Subject: [PATCH 3/4] lib/crc64: add 64bits CRC calculation
-
-This patch is a re-write of normal CRC64 implementation, like other
-numerous code in public domain. The CRC64 polynomical arithmetic follows
-ECMA-182 specification, inspired by CRC paper of Dr. Ross N. Williams
-(see http://www.ross.net/crc/download/crc_v3.txt) and other public domain
-implementations.
-
-- lib/gen_crc64table.c is the host application to generate crc64 lookup
-table (a.k.a POLY 0x42f0e1eba9ea369) into lib/crc64table.h
-- lib/crc64.c then includes lib/crc64table.h to reference the lookup table
-for CRC64 calculation.
-- include/linux/crc64.h has functions declaration exported by lib/crc64.c.
-
-Currently bcache (drivers/md/bcache) is the only user of lib/crc64.c, the
-original idea of moving crc64 code into lib/crc64.c was from Andy
-Shevchenko and Michael Lyle. Unfortunately the crc64 code from bcache is
-not pure GPL licensed (which is PostgreSQL license), so I have to rewrite
-from scratch for a GPL version.
-
-Signed-off-by: Coly Li <colyli@suse.de>
-Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
-Cc: Michael Lyle <mlyle@lyle.org>
-Cc: Kent Overstreet <kent.overstreet@gmail.com>
----
- include/linux/crc64.h | 15 +++++++++
- lib/crc64.c | 71 +++++++++++++++++++++++++++++++++++++++++++
- lib/gen_crc64table.c | 84 +++++++++++++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 170 insertions(+)
- create mode 100644 include/linux/crc64.h
- create mode 100644 lib/crc64.c
- create mode 100644 lib/gen_crc64table.c
-
-diff --git a/include/linux/crc64.h b/include/linux/crc64.h
-new file mode 100644
-index 000000000000..d626bf95c2f2
---- /dev/null
-+++ b/include/linux/crc64.h
-@@ -0,0 +1,15 @@
-+/* SPDX-License-Identifier: GPL-2.0 */
-+/*
-+ * crc64.h
-+ *
-+ * See lib/crc64.c for the related specification and polynomical arithmetic.
-+ */
-+#ifndef _LINUX_CRC64_H
-+#define _LINUX_CRC64_H
-+
-+#include <linux/types.h>
-+
-+__le64 crc64_le_update(__le64 crc, const void *_p, size_t len);
-+__le64 crc64_le(const void *p, size_t len);
-+
-+#endif /* _LINUX_CRC64_H */
-diff --git a/lib/crc64.c b/lib/crc64.c
-new file mode 100644
-index 000000000000..561a0a1c32ae
---- /dev/null
-+++ b/lib/crc64.c
-@@ -0,0 +1,71 @@
-+// SPDX-License-Identifier: GPL-2.0
-+/*
-+ * Normal 64bit CRC calculation.
-+ *
-+ * This is a basic crc64 implementation following ECMA-182 specification,
-+ * which can be found from,
-+ * http://www.ecma-international.org/publications/standards/Ecma-182.htm
-+ *
-+ * Dr. Ross N. Williams has a great document to introduce the idea of CRC
-+ * algorithm, here the CRC64 code is also inspired by the table-driven
-+ * algorithm and detail example from this paper. This paper can be found
-+ * from,
-+ * http://www.ross.net/crc/download/crc_v3.txt
-+ *
-+ * crc64table_le[256] is the lookup table of a table-driver 64bit CRC
-+ * calculation, which is generated by gen_crc64table.c in kernel build
-+ * time. The polynomial of crc64 arithmetic is from ECMA-182 specification
-+ * as well, which is defined as,
-+ *
-+ * x^64 + x^62 + x^57 + x^55 + x^54 + x^53 + x^52 + x^47 + x^46 + x^45 +
-+ * x^40 + x^39 + x^38 + x^37 + x^35 + x^33 + x^32 + x^31 + x^29 + x^27 +
-+ * x^24 + x^23 + x^22 + x^21 + x^19 + x^17 + x^13 + x^12 + x^10 + x^9 +
-+ * x^7 + x^4 + x + 1
-+ *
-+ * Copyright 2018 SUSE Linux.
-+ * Author: Coly Li <colyli@suse.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License version
-+ * 2 as published by the Free Software Foundation;
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ */
-+
-+#include <linux/module.h>
-+#include <uapi/linux/types.h>
-+#include "crc64table.h"
-+
-+MODULE_DESCRIPTION("CRC64 calculations");
-+MODULE_LICENSE("GPL");
-+
-+#define CRC64_ECMA182_START 0x0000000000000000ULL
-+
-+__le64 crc64_le_update(__le64 crc, const void *_p, size_t len)
-+{
-+ size_t i, t;
-+
-+ const unsigned char *p = _p;
-+
-+ for (i = 0; i < len; i++) {
-+ t = ((crc >> 56) ^ (__le64)(*p++)) & 0xFF;
-+ crc = crc64table_le[t] ^ (crc << 8);
-+ }
-+
-+ return crc;
-+}
-+EXPORT_SYMBOL_GPL(crc64_le_update);
-+
-+__le64 crc64_le(const void *p, size_t len)
-+{
-+ __le64 crc = CRC64_ECMA182_START;
-+
-+ crc = crc64_le_update(crc, p, len);
-+
-+ return (crc ^ 0xffffffffffffffffULL);
-+}
-+EXPORT_SYMBOL_GPL(crc64_le);
-+
-diff --git a/lib/gen_crc64table.c b/lib/gen_crc64table.c
-new file mode 100644
-index 000000000000..6cd6cd807b2a
---- /dev/null
-+++ b/lib/gen_crc64table.c
-@@ -0,0 +1,84 @@
-+// SPDX-License-Identifier: GPL-2.0
-+/*
-+ * Generate lookup table for the talbe-driven CRC64 calculation.
-+ *
-+ * gen_crc64table is executed in kernel build time and generates
-+ * lib/crc64table.h. This header is included by lib/crc64.c for
-+ * the table-driver CRC64 calculation.
-+ *
-+ * See lib/crc64.c for more information about which specification
-+ * and polynomical arithmetic that gen_crc64table.c follows to
-+ * generate the lookup table.
-+ *
-+ * Copyright 2018 SUSE Linux.
-+ * Author: Coly Li <colyli@suse.de>
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License version
-+ * 2 as published by the Free Software Foundation;
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ */
-+
-+#include <inttypes.h>
-+#include <linux/swab.h>
-+#include <stdio.h>
-+
-+#define CRC64_ECMA182_POLY 0x42F0E1EBA9EA3693ULL
-+
-+#ifdef __LITTLE_ENDIAN
-+# define cpu_to_le64(x) ((__le64)(x))
-+#else
-+# define cpu_to_le64(x) ((__le64)__swab64(x))
-+#endif
-+
-+static int64_t crc64_table[256] = {0,};
-+
-+static void generate_crc64_table(void)
-+{
-+ uint64_t i, j, c, crc;
-+
-+ for (i = 0; i < 256; i++) {
-+ crc = 0;
-+ c = i << 56;
-+
-+ for (j = 0; j < 8; j++) {
-+ if ((crc ^ c) & 0x8000000000000000ULL)
-+ crc = (crc << 1) ^ CRC64_ECMA182_POLY;
-+ else
-+ crc <<= 1;
-+ c <<= 1;
-+ }
-+
-+ crc64_table[i] = crc;
-+ }
-+
-+}
-+
-+static void print_crc64le_table(void)
-+{
-+ int i;
-+
-+ printf("/* this file is generated - do not edit */\n\n");
-+ printf("#include <uapi/linux/types.h>\n");
-+ printf("#include <linux/cache.h>\n\n");
-+ printf("static const __le64 ____cacheline_aligned crc64table_le[256] = {\n");
-+ for (i = 0; i < 256; i++) {
-+ printf("\t0x%016" PRIx64 "ULL", cpu_to_le64(crc64_table[i]));
-+ if (i & 0x1)
-+ printf(",\n");
-+ else
-+ printf(", ");
-+ }
-+ printf("};\n");
-+}
-+
-+int main(int argc, char *argv[])
-+{
-+ generate_crc64_table();
-+ print_crc64le_table();
-+ return 0;
-+}
---
-2.16.3
diff --git a/for-test/libcrc64/old/0004-bcache-use-routines-from-lib-crc64.c-for-CRC64-calcu.patch b/for-test/libcrc64/old/0004-bcache-use-routines-from-lib-crc64.c-for-CRC64-calcu.patch
deleted file mode 100644
index 778abc3..0000000
--- a/for-test/libcrc64/old/0004-bcache-use-routines-from-lib-crc64.c-for-CRC64-calcu.patch
+++ /dev/null
@@ -1,254 +0,0 @@
-From 673f027db562a90f5b4c6189eccab82052cd1549 Mon Sep 17 00:00:00 2001
-From: Coly Li <colyli@suse.de>
-Date: Wed, 23 May 2018 16:02:35 +0800
-Subject: [PATCH 4/4] bcache: use routines from lib/crc64.c for CRC64
- calculation
-
-This patch removes the PostgreSQL licennsed CRC64 code from bcache, and
-uses routinesfrom lib/crc64.c to do bcache CRC64 calculationn.
-
-Signed-off-by: Coly Li <colyli@suse.de>
-Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
-Cc: Michael Lyle <mlyle@lyle.org>
-Cc: Kent Overstreet <kent.overstreet@gmail.com>
----
- drivers/md/bcache/bcache.h | 3 +-
- drivers/md/bcache/btree.c | 2 +-
- drivers/md/bcache/request.c | 2 +-
- drivers/md/bcache/super.c | 5 +-
- drivers/md/bcache/util.c | 131 --------------------------------------------
- drivers/md/bcache/util.h | 5 +-
- 6 files changed, 8 insertions(+), 140 deletions(-)
-
-diff --git a/drivers/md/bcache/bcache.h b/drivers/md/bcache/bcache.h
-index 3a0cfb237af9..39cce593ef18 100644
---- a/drivers/md/bcache/bcache.h
-+++ b/drivers/md/bcache/bcache.h
-@@ -189,6 +189,7 @@
- #include <linux/types.h>
- #include <linux/workqueue.h>
- #include <linux/kthread.h>
-+#include <linux/crc64.h>
-
- #include "bset.h"
- #include "util.h"
-@@ -801,7 +802,7 @@ static inline bool ptr_available(struct cache_set *c, const struct bkey *k,
- * jset: The checksum is _always_ the first 8 bytes of these structs
- */
- #define csum_set(i) \
-- bch_crc64(((void *) (i)) + sizeof(uint64_t), \
-+ crc64_le(((void *) (i)) + sizeof(uint64_t), \
- ((void *) bset_bkey_last(i)) - \
- (((void *) (i)) + sizeof(uint64_t)))
-
-diff --git a/drivers/md/bcache/btree.c b/drivers/md/bcache/btree.c
-index 17936b2dc7d6..7867e65ed686 100644
---- a/drivers/md/bcache/btree.c
-+++ b/drivers/md/bcache/btree.c
-@@ -194,7 +194,7 @@ static uint64_t btree_csum_set(struct btree *b, struct bset *i)
- uint64_t crc = b->key.ptr[0];
- void *data = (void *) i + 8, *end = bset_bkey_last(i);
-
-- crc = bch_crc64_update(crc, data, end - data);
-+ crc = crc64_le_update(crc, data, end - data);
- return crc ^ 0xffffffffffffffffULL;
- }
-
-diff --git a/drivers/md/bcache/request.c b/drivers/md/bcache/request.c
-index 8e3e8655ed63..7a191b4bdeb6 100644
---- a/drivers/md/bcache/request.c
-+++ b/drivers/md/bcache/request.c
-@@ -45,7 +45,7 @@ static void bio_csum(struct bio *bio, struct bkey *k)
-
- bio_for_each_segment(bv, bio, iter) {
- void *d = kmap(bv.bv_page) + bv.bv_offset;
-- csum = bch_crc64_update(csum, d, bv.bv_len);
-+ csum = crc64_le_update(csum, d, bv.bv_len);
- kunmap(bv.bv_page);
- }
-
-diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c
-index 3dea06b41d43..696971ec6091 100644
---- a/drivers/md/bcache/super.c
-+++ b/drivers/md/bcache/super.c
-@@ -567,7 +567,7 @@ void bch_prio_write(struct cache *ca)
-
- p->next_bucket = ca->prio_buckets[i + 1];
- p->magic = pset_magic(&ca->sb);
-- p->csum = bch_crc64(&p->magic, bucket_bytes(ca) - 8);
-+ p->csum = crc64_le(&p->magic, bucket_bytes(ca) - 8);
-
- bucket = bch_bucket_alloc(ca, RESERVE_PRIO, true);
- BUG_ON(bucket == -1);
-@@ -617,7 +617,8 @@ static void prio_read(struct cache *ca, uint64_t bucket)
-
- prio_io(ca, bucket, REQ_OP_READ, 0);
-
-- if (p->csum != bch_crc64(&p->magic, bucket_bytes(ca) - 8))
-+ if (p->csum != crc64_le(&p->magic,
-+ bucket_bytes(ca) - 8))
- pr_warn("bad csum reading priorities");
-
- if (p->magic != pset_magic(&ca->sb))
-diff --git a/drivers/md/bcache/util.c b/drivers/md/bcache/util.c
-index 74febd5230df..cdf822c0ac1b 100644
---- a/drivers/md/bcache/util.c
-+++ b/drivers/md/bcache/util.c
-@@ -314,134 +314,3 @@ int bch_bio_alloc_pages(struct bio *bio, gfp_t gfp_mask)
-
- return 0;
- }
--
--/*
-- * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group (Any
-- * use permitted, subject to terms of PostgreSQL license; see.)
--
-- * If we have a 64-bit integer type, then a 64-bit CRC looks just like the
-- * usual sort of implementation. (See Ross Williams' excellent introduction
-- * A PAINLESS GUIDE TO CRC ERROR DETECTION ALGORITHMS, available from
-- * ftp://ftp.rocksoft.com/papers/crc_v3.txt or several other net sites.)
-- * If we have no working 64-bit type, then fake it with two 32-bit registers.
-- *
-- * The present implementation is a normal (not "reflected", in Williams'
-- * terms) 64-bit CRC, using initial all-ones register contents and a final
-- * bit inversion. The chosen polynomial is borrowed from the DLT1 spec
-- * (ECMA-182, available from http://www.ecma.ch/ecma1/STAND/ECMA-182.HTM):
-- *
-- * x^64 + x^62 + x^57 + x^55 + x^54 + x^53 + x^52 + x^47 + x^46 + x^45 +
-- * x^40 + x^39 + x^38 + x^37 + x^35 + x^33 + x^32 + x^31 + x^29 + x^27 +
-- * x^24 + x^23 + x^22 + x^21 + x^19 + x^17 + x^13 + x^12 + x^10 + x^9 +
-- * x^7 + x^4 + x + 1
--*/
--
--static const uint64_t crc_table[256] = {
-- 0x0000000000000000ULL, 0x42F0E1EBA9EA3693ULL, 0x85E1C3D753D46D26ULL,
-- 0xC711223CFA3E5BB5ULL, 0x493366450E42ECDFULL, 0x0BC387AEA7A8DA4CULL,
-- 0xCCD2A5925D9681F9ULL, 0x8E224479F47CB76AULL, 0x9266CC8A1C85D9BEULL,
-- 0xD0962D61B56FEF2DULL, 0x17870F5D4F51B498ULL, 0x5577EEB6E6BB820BULL,
-- 0xDB55AACF12C73561ULL, 0x99A54B24BB2D03F2ULL, 0x5EB4691841135847ULL,
-- 0x1C4488F3E8F96ED4ULL, 0x663D78FF90E185EFULL, 0x24CD9914390BB37CULL,
-- 0xE3DCBB28C335E8C9ULL, 0xA12C5AC36ADFDE5AULL, 0x2F0E1EBA9EA36930ULL,
-- 0x6DFEFF5137495FA3ULL, 0xAAEFDD6DCD770416ULL, 0xE81F3C86649D3285ULL,
-- 0xF45BB4758C645C51ULL, 0xB6AB559E258E6AC2ULL, 0x71BA77A2DFB03177ULL,
-- 0x334A9649765A07E4ULL, 0xBD68D2308226B08EULL, 0xFF9833DB2BCC861DULL,
-- 0x388911E7D1F2DDA8ULL, 0x7A79F00C7818EB3BULL, 0xCC7AF1FF21C30BDEULL,
-- 0x8E8A101488293D4DULL, 0x499B3228721766F8ULL, 0x0B6BD3C3DBFD506BULL,
-- 0x854997BA2F81E701ULL, 0xC7B97651866BD192ULL, 0x00A8546D7C558A27ULL,
-- 0x4258B586D5BFBCB4ULL, 0x5E1C3D753D46D260ULL, 0x1CECDC9E94ACE4F3ULL,
-- 0xDBFDFEA26E92BF46ULL, 0x990D1F49C77889D5ULL, 0x172F5B3033043EBFULL,
-- 0x55DFBADB9AEE082CULL, 0x92CE98E760D05399ULL, 0xD03E790CC93A650AULL,
-- 0xAA478900B1228E31ULL, 0xE8B768EB18C8B8A2ULL, 0x2FA64AD7E2F6E317ULL,
-- 0x6D56AB3C4B1CD584ULL, 0xE374EF45BF6062EEULL, 0xA1840EAE168A547DULL,
-- 0x66952C92ECB40FC8ULL, 0x2465CD79455E395BULL, 0x3821458AADA7578FULL,
-- 0x7AD1A461044D611CULL, 0xBDC0865DFE733AA9ULL, 0xFF3067B657990C3AULL,
-- 0x711223CFA3E5BB50ULL, 0x33E2C2240A0F8DC3ULL, 0xF4F3E018F031D676ULL,
-- 0xB60301F359DBE0E5ULL, 0xDA050215EA6C212FULL, 0x98F5E3FE438617BCULL,
-- 0x5FE4C1C2B9B84C09ULL, 0x1D14202910527A9AULL, 0x93366450E42ECDF0ULL,
-- 0xD1C685BB4DC4FB63ULL, 0x16D7A787B7FAA0D6ULL, 0x5427466C1E109645ULL,
-- 0x4863CE9FF6E9F891ULL, 0x0A932F745F03CE02ULL, 0xCD820D48A53D95B7ULL,
-- 0x8F72ECA30CD7A324ULL, 0x0150A8DAF8AB144EULL, 0x43A04931514122DDULL,
-- 0x84B16B0DAB7F7968ULL, 0xC6418AE602954FFBULL, 0xBC387AEA7A8DA4C0ULL,
-- 0xFEC89B01D3679253ULL, 0x39D9B93D2959C9E6ULL, 0x7B2958D680B3FF75ULL,
-- 0xF50B1CAF74CF481FULL, 0xB7FBFD44DD257E8CULL, 0x70EADF78271B2539ULL,
-- 0x321A3E938EF113AAULL, 0x2E5EB66066087D7EULL, 0x6CAE578BCFE24BEDULL,
-- 0xABBF75B735DC1058ULL, 0xE94F945C9C3626CBULL, 0x676DD025684A91A1ULL,
-- 0x259D31CEC1A0A732ULL, 0xE28C13F23B9EFC87ULL, 0xA07CF2199274CA14ULL,
-- 0x167FF3EACBAF2AF1ULL, 0x548F120162451C62ULL, 0x939E303D987B47D7ULL,
-- 0xD16ED1D631917144ULL, 0x5F4C95AFC5EDC62EULL, 0x1DBC74446C07F0BDULL,
-- 0xDAAD56789639AB08ULL, 0x985DB7933FD39D9BULL, 0x84193F60D72AF34FULL,
-- 0xC6E9DE8B7EC0C5DCULL, 0x01F8FCB784FE9E69ULL, 0x43081D5C2D14A8FAULL,
-- 0xCD2A5925D9681F90ULL, 0x8FDAB8CE70822903ULL, 0x48CB9AF28ABC72B6ULL,
-- 0x0A3B7B1923564425ULL, 0x70428B155B4EAF1EULL, 0x32B26AFEF2A4998DULL,
-- 0xF5A348C2089AC238ULL, 0xB753A929A170F4ABULL, 0x3971ED50550C43C1ULL,
-- 0x7B810CBBFCE67552ULL, 0xBC902E8706D82EE7ULL, 0xFE60CF6CAF321874ULL,
-- 0xE224479F47CB76A0ULL, 0xA0D4A674EE214033ULL, 0x67C58448141F1B86ULL,
-- 0x253565A3BDF52D15ULL, 0xAB1721DA49899A7FULL, 0xE9E7C031E063ACECULL,
-- 0x2EF6E20D1A5DF759ULL, 0x6C0603E6B3B7C1CAULL, 0xF6FAE5C07D3274CDULL,
-- 0xB40A042BD4D8425EULL, 0x731B26172EE619EBULL, 0x31EBC7FC870C2F78ULL,
-- 0xBFC9838573709812ULL, 0xFD39626EDA9AAE81ULL, 0x3A28405220A4F534ULL,
-- 0x78D8A1B9894EC3A7ULL, 0x649C294A61B7AD73ULL, 0x266CC8A1C85D9BE0ULL,
-- 0xE17DEA9D3263C055ULL, 0xA38D0B769B89F6C6ULL, 0x2DAF4F0F6FF541ACULL,
-- 0x6F5FAEE4C61F773FULL, 0xA84E8CD83C212C8AULL, 0xEABE6D3395CB1A19ULL,
-- 0x90C79D3FEDD3F122ULL, 0xD2377CD44439C7B1ULL, 0x15265EE8BE079C04ULL,
-- 0x57D6BF0317EDAA97ULL, 0xD9F4FB7AE3911DFDULL, 0x9B041A914A7B2B6EULL,
-- 0x5C1538ADB04570DBULL, 0x1EE5D94619AF4648ULL, 0x02A151B5F156289CULL,
-- 0x4051B05E58BC1E0FULL, 0x87409262A28245BAULL, 0xC5B073890B687329ULL,
-- 0x4B9237F0FF14C443ULL, 0x0962D61B56FEF2D0ULL, 0xCE73F427ACC0A965ULL,
-- 0x8C8315CC052A9FF6ULL, 0x3A80143F5CF17F13ULL, 0x7870F5D4F51B4980ULL,
-- 0xBF61D7E80F251235ULL, 0xFD913603A6CF24A6ULL, 0x73B3727A52B393CCULL,
-- 0x31439391FB59A55FULL, 0xF652B1AD0167FEEAULL, 0xB4A25046A88DC879ULL,
-- 0xA8E6D8B54074A6ADULL, 0xEA16395EE99E903EULL, 0x2D071B6213A0CB8BULL,
-- 0x6FF7FA89BA4AFD18ULL, 0xE1D5BEF04E364A72ULL, 0xA3255F1BE7DC7CE1ULL,
-- 0x64347D271DE22754ULL, 0x26C49CCCB40811C7ULL, 0x5CBD6CC0CC10FAFCULL,
-- 0x1E4D8D2B65FACC6FULL, 0xD95CAF179FC497DAULL, 0x9BAC4EFC362EA149ULL,
-- 0x158E0A85C2521623ULL, 0x577EEB6E6BB820B0ULL, 0x906FC95291867B05ULL,
-- 0xD29F28B9386C4D96ULL, 0xCEDBA04AD0952342ULL, 0x8C2B41A1797F15D1ULL,
-- 0x4B3A639D83414E64ULL, 0x09CA82762AAB78F7ULL, 0x87E8C60FDED7CF9DULL,
-- 0xC51827E4773DF90EULL, 0x020905D88D03A2BBULL, 0x40F9E43324E99428ULL,
-- 0x2CFFE7D5975E55E2ULL, 0x6E0F063E3EB46371ULL, 0xA91E2402C48A38C4ULL,
-- 0xEBEEC5E96D600E57ULL, 0x65CC8190991CB93DULL, 0x273C607B30F68FAEULL,
-- 0xE02D4247CAC8D41BULL, 0xA2DDA3AC6322E288ULL, 0xBE992B5F8BDB8C5CULL,
-- 0xFC69CAB42231BACFULL, 0x3B78E888D80FE17AULL, 0x7988096371E5D7E9ULL,
-- 0xF7AA4D1A85996083ULL, 0xB55AACF12C735610ULL, 0x724B8ECDD64D0DA5ULL,
-- 0x30BB6F267FA73B36ULL, 0x4AC29F2A07BFD00DULL, 0x08327EC1AE55E69EULL,
-- 0xCF235CFD546BBD2BULL, 0x8DD3BD16FD818BB8ULL, 0x03F1F96F09FD3CD2ULL,
-- 0x41011884A0170A41ULL, 0x86103AB85A2951F4ULL, 0xC4E0DB53F3C36767ULL,
-- 0xD8A453A01B3A09B3ULL, 0x9A54B24BB2D03F20ULL, 0x5D45907748EE6495ULL,
-- 0x1FB5719CE1045206ULL, 0x919735E51578E56CULL, 0xD367D40EBC92D3FFULL,
-- 0x1476F63246AC884AULL, 0x568617D9EF46BED9ULL, 0xE085162AB69D5E3CULL,
-- 0xA275F7C11F7768AFULL, 0x6564D5FDE549331AULL, 0x279434164CA30589ULL,
-- 0xA9B6706FB8DFB2E3ULL, 0xEB46918411358470ULL, 0x2C57B3B8EB0BDFC5ULL,
-- 0x6EA7525342E1E956ULL, 0x72E3DAA0AA188782ULL, 0x30133B4B03F2B111ULL,
-- 0xF7021977F9CCEAA4ULL, 0xB5F2F89C5026DC37ULL, 0x3BD0BCE5A45A6B5DULL,
-- 0x79205D0E0DB05DCEULL, 0xBE317F32F78E067BULL, 0xFCC19ED95E6430E8ULL,
-- 0x86B86ED5267CDBD3ULL, 0xC4488F3E8F96ED40ULL, 0x0359AD0275A8B6F5ULL,
-- 0x41A94CE9DC428066ULL, 0xCF8B0890283E370CULL, 0x8D7BE97B81D4019FULL,
-- 0x4A6ACB477BEA5A2AULL, 0x089A2AACD2006CB9ULL, 0x14DEA25F3AF9026DULL,
-- 0x562E43B4931334FEULL, 0x913F6188692D6F4BULL, 0xD3CF8063C0C759D8ULL,
-- 0x5DEDC41A34BBEEB2ULL, 0x1F1D25F19D51D821ULL, 0xD80C07CD676F8394ULL,
-- 0x9AFCE626CE85B507ULL,
--};
--
--uint64_t bch_crc64_update(uint64_t crc, const void *_data, size_t len)
--{
-- const unsigned char *data = _data;
--
-- while (len--) {
-- int i = ((int) (crc >> 56) ^ *data++) & 0xFF;
-- crc = crc_table[i] ^ (crc << 8);
-- }
--
-- return crc;
--}
--
--uint64_t bch_crc64(const void *data, size_t len)
--{
-- uint64_t crc = 0xffffffffffffffffULL;
--
-- crc = bch_crc64_update(crc, data, len);
--
-- return crc ^ 0xffffffffffffffffULL;
--}
-diff --git a/drivers/md/bcache/util.h b/drivers/md/bcache/util.h
-index 268024529edd..a68298bd777c 100644
---- a/drivers/md/bcache/util.h
-+++ b/drivers/md/bcache/util.h
-@@ -11,6 +11,7 @@
- #include <linux/ratelimit.h>
- #include <linux/vmalloc.h>
- #include <linux/workqueue.h>
-+#include <linux/crc64.h>
-
- #include "closure.h"
-
-@@ -566,8 +567,4 @@ static inline sector_t bdev_sectors(struct block_device *bdev)
- {
- return bdev->bd_inode->i_size >> 9;
- }
--
--uint64_t bch_crc64_update(uint64_t, const void *, size_t);
--uint64_t bch_crc64(const void *, size_t);
--
- #endif /* _BCACHE_UTIL_H */
---
-2.16.3