f833623b17
blktrace: backport upstream bugfix patches Signed-off-by: Zhiqiang Liu <liuzhiqiang26@huawei.com>
68 lines
2.1 KiB
Diff
68 lines
2.1 KiB
Diff
From 9967365e47e90511b89d2f20bb1d5c91c31cc610 Mon Sep 17 00:00:00 2001
|
|
From: Jens Axboe <axboe@kernel.dk>
|
|
Date: Sun, 5 Nov 2017 08:52:21 -0700
|
|
Subject: [PATCH 01/15] jhash: fix annoying gcc fall through warnings
|
|
|
|
Signed-off-by: Jens Axboe <axboe@kernel.dk>
|
|
---
|
|
jhash.h | 34 ++++++++++++++++------------------
|
|
1 file changed, 16 insertions(+), 18 deletions(-)
|
|
|
|
diff --git a/jhash.h b/jhash.h
|
|
index 4cebd23..a4d3106 100644
|
|
--- a/jhash.h
|
|
+++ b/jhash.h
|
|
@@ -73,22 +73,21 @@ static inline u32 jhash(const void *key, u32 length, u32 initval)
|
|
k += 12;
|
|
}
|
|
|
|
- /* last block: affect all 32 bits of (c) */
|
|
- /* all the case statements fall through */
|
|
+ /* Last block: affect all 32 bits of (c) */
|
|
switch (length) {
|
|
- case 12: c += (u32)k[11]<<24;
|
|
- case 11: c += (u32)k[10]<<16;
|
|
- case 10: c += (u32)k[9]<<8;
|
|
- case 9 : c += k[8];
|
|
- case 8 : b += (u32)k[7]<<24;
|
|
- case 7 : b += (u32)k[6]<<16;
|
|
- case 6 : b += (u32)k[5]<<8;
|
|
- case 5 : b += k[4];
|
|
- case 4 : a += (u32)k[3]<<24;
|
|
- case 3 : a += (u32)k[2]<<16;
|
|
- case 2 : a += (u32)k[1]<<8;
|
|
- case 1 : a += k[0];
|
|
- __jhash_final(a, b, c);
|
|
+ case 12: c += (u32)k[11]<<24; /* fall through */
|
|
+ case 11: c += (u32)k[10]<<16; /* fall through */
|
|
+ case 10: c += (u32)k[9]<<8; /* fall through */
|
|
+ case 9: c += k[8]; /* fall through */
|
|
+ case 8: b += (u32)k[7]<<24; /* fall through */
|
|
+ case 7: b += (u32)k[6]<<16; /* fall through */
|
|
+ case 6: b += (u32)k[5]<<8; /* fall through */
|
|
+ case 5: b += k[4]; /* fall through */
|
|
+ case 4: a += (u32)k[3]<<24; /* fall through */
|
|
+ case 3: a += (u32)k[2]<<16; /* fall through */
|
|
+ case 2: a += (u32)k[1]<<8; /* fall through */
|
|
+ case 1: a += k[0];
|
|
+ __jhash_final(a, b, c);
|
|
case 0 :
|
|
break;
|
|
}
|
|
@@ -117,10 +116,9 @@ static inline u32 jhash2(u32 *k, u32 length, u32 initval)
|
|
}
|
|
|
|
/* handle the last 3 u32's */
|
|
- /* all the case statements fall through */
|
|
switch (length) {
|
|
- case 3: c += k[2];
|
|
- case 2: b += k[1];
|
|
+ case 3: c += k[2]; /* fall through */
|
|
+ case 2: b += k[1]; /* fall through */
|
|
case 1: a += k[0];
|
|
__jhash_final(a, b, c);
|
|
case 0: /* case 0: nothing left to add */
|
|
--
|
|
1.8.3.1
|
|
|