]> granicus.if.org Git - zfs/commitdiff
Linux 5.3: Fix switch() fall though compiler errors
authorTony Hutter <hutter2@llnl.gov>
Wed, 21 Aug 2019 16:29:23 +0000 (09:29 -0700)
committerTony Hutter <hutter2@llnl.gov>
Wed, 25 Sep 2019 18:27:50 +0000 (11:27 -0700)
Fix some switch() fall-though compiler errors:

    abd.c:1504:9: error: this statement may fall through

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Tony Hutter <hutter2@llnl.gov>
Closes #9170

module/lua/llex.c
module/zfs/abd.c
module/zfs/vdev_raidz_math_scalar.c

index 8760155d05460468f23c65aae1f39f8b87af02ba..50c301f599f1384f6ef3ffa872502b38567c18b8 100644 (file)
@@ -431,9 +431,12 @@ static int llex (LexState *ls, SemInfo *seminfo) {
         if (sep >= 0) {
           read_long_string(ls, seminfo, sep);
           return TK_STRING;
-        }
-        else if (sep == -1) return '[';
-        else lexerror(ls, "invalid long string delimiter", TK_STRING);
+        } else if (sep == -1) {
+               return '[';
+        } else {
+               lexerror(ls, "invalid long string delimiter", TK_STRING);
+               break;
+       }
       }
       case '=': {
         next(ls);
index 9041bd8b18412e32e8d22c3483f79bf0a1c17a7c..32b2c842c0dffdf3565d4088d6f1f2bf212743c8 100644 (file)
@@ -1370,8 +1370,10 @@ abd_raidz_gen_iterate(abd_t **cabds, abd_t *dabd,
                switch (parity) {
                        case 3:
                                len = MIN(caiters[2].iter_mapsize, len);
+                               /* falls through */
                        case 2:
                                len = MIN(caiters[1].iter_mapsize, len);
+                               /* falls through */
                        case 1:
                                len = MIN(caiters[0].iter_mapsize, len);
                }
@@ -1461,9 +1463,11 @@ abd_raidz_rec_iterate(abd_t **cabds, abd_t **tabds,
                        case 3:
                                len = MIN(xiters[2].iter_mapsize, len);
                                len = MIN(citers[2].iter_mapsize, len);
+                               /* falls through */
                        case 2:
                                len = MIN(xiters[1].iter_mapsize, len);
                                len = MIN(citers[1].iter_mapsize, len);
+                               /* falls through */
                        case 1:
                                len = MIN(xiters[0].iter_mapsize, len);
                                len = MIN(citers[0].iter_mapsize, len);
index a693bff63ffb9a0f22a926e70b8350b02acb2c26..cd742e146ca66fa9f1fb8438a6c71408495ddc5b 100644 (file)
@@ -142,6 +142,7 @@ static const struct {
                a.b[6] = mul_lt[a.b[6]];                                \
                a.b[5] = mul_lt[a.b[5]];                                \
                a.b[4] = mul_lt[a.b[4]];                                \
+               /* falls through */                                     \
        case 4:                                                         \
                a.b[3] = mul_lt[a.b[3]];                                \
                a.b[2] = mul_lt[a.b[2]];                                \