rolffokkens pushed to bcache-tools (master). "Now builds on Fedora 22 / gcc 5.1.1"

notifications at fedoraproject.org notifications at fedoraproject.org
Fri May 22 18:27:58 UTC 2015


From f8b57f5cb123e99eac15994c8d4dabfa8581844e Mon Sep 17 00:00:00 2001
From: Rolf Fokkens <rolf.fokkens at target-holding.nl>
Date: Fri, 22 May 2015 20:26:49 +0200
Subject: Now builds on Fedora 22 / gcc 5.1.1


diff --git a/bcache-tools-1.0.8-crc64.patch b/bcache-tools-1.0.8-crc64.patch
new file mode 100644
index 0000000..9b11d80
--- /dev/null
+++ b/bcache-tools-1.0.8-crc64.patch
@@ -0,0 +1,55 @@
+diff -ruN bcache-tools-1.0.8.orig/bcache.c bcache-tools-1.0.8/bcache.c
+--- bcache-tools-1.0.8.orig/bcache.c	2014-12-04 23:51:24.000000000 +0100
++++ bcache-tools-1.0.8/bcache.c	2015-05-22 19:40:41.039355096 +0200
+@@ -26,7 +26,7 @@
+  * x^7 + x^4 + x + 1
+ */
+ 
+-static const uint64_t crc_table[256] = {
++const uint64_t crc_table[256] = {
+ 	0x0000000000000000ULL, 0x42F0E1EBA9EA3693ULL, 0x85E1C3D753D46D26ULL,
+ 	0xC711223CFA3E5BB5ULL, 0x493366450E42ECDFULL, 0x0BC387AEA7A8DA4CULL,
+ 	0xCCD2A5925D9681F9ULL, 0x8E224479F47CB76AULL, 0x9266CC8A1C85D9BEULL,
+@@ -114,16 +114,3 @@
+ 	0x5DEDC41A34BBEEB2ULL, 0x1F1D25F19D51D821ULL, 0xD80C07CD676F8394ULL,
+ 	0x9AFCE626CE85B507ULL
+ };
+-
+-inline uint64_t crc64(const void *_data, size_t len)
+-{
+-	uint64_t crc = 0xFFFFFFFFFFFFFFFFULL;
+-	const unsigned char *data = _data;
+-
+-	while (len--) {
+-		int i = ((int) (crc >> 56) ^ *data++) & 0xFF;
+-		crc = crc_table[i] ^ (crc << 8);
+-	}
+-
+-	return crc ^ 0xFFFFFFFFFFFFFFFFULL;
+-}
+diff -ruN bcache-tools-1.0.8.orig/bcache.h bcache-tools-1.0.8/bcache.h
+--- bcache-tools-1.0.8.orig/bcache.h	2014-12-04 23:51:24.000000000 +0100
++++ bcache-tools-1.0.8/bcache.h	2015-05-22 19:40:34.924320569 +0200
+@@ -115,7 +115,20 @@
+ #define BDEV_STATE_DIRTY	2U
+ #define BDEV_STATE_STALE	3U
+ 
+-uint64_t crc64(const void *_data, size_t len);
++extern const uint64_t crc_table[];
++
++inline uint64_t crc64(const void *_data, size_t len)
++{
++        uint64_t crc = 0xFFFFFFFFFFFFFFFFULL;
++        const unsigned char *data = _data;
++
++        while (len--) {
++                int i = ((int) (crc >> 56) ^ *data++) & 0xFF;
++                crc = crc_table[i] ^ (crc << 8);
++        }
++
++        return crc ^ 0xFFFFFFFFFFFFFFFFULL;
++}
+ 
+ #define node(i, j)		((void *) ((i)->d + (j)))
+ #define end(i)			node(i, (i)->keys)
+Binary files bcache-tools-1.0.8.orig/bcache-register and bcache-tools-1.0.8/bcache-register differ
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/bcache-tools.git/commit/?h=master&id=f8b57f5cb123e99eac15994c8d4dabfa8581844e


More information about the scm-commits mailing list