aboutsummaryrefslogtreecommitdiff
path: root/sys/contrib/openzfs/module/lua
diff options
context:
space:
mode:
authorMartin Matuska <mm@FreeBSD.org>2021-09-15 15:30:07 +0000
committerMartin Matuska <mm@FreeBSD.org>2021-09-15 15:30:53 +0000
commit53b70c86d93c1e4d3c76f1282e94154e88780d7e (patch)
tree7de40c23766ddb80ad4b37a1140b302dbe96a92f /sys/contrib/openzfs/module/lua
parent6e8272f317b899438165108a72fa04a4995611bd (diff)
parent4a1195ca5041cbff2a6b025a31937fef84876c52 (diff)
downloadsrc-53b70c86d93c1e4d3c76f1282e94154e88780d7e.tar.gz
src-53b70c86d93c1e4d3c76f1282e94154e88780d7e.zip
zfs: merge openzfs/zfs@4a1195ca5 (master) into main
Notable upstream pull request merges: #11312 Temporarily use root credentials to mount snapshots in .zfs #12246 arc: Drop an incorrect assert #12443 Fixed data integrity issue when underlying disk returns error to zfs #12522 Compressed receive with different ashift can result in incorrect PSIZE on disk #12535 Verify embedded blkptr's in arc_read() #12541 Allow sending corrupt snapshots even if metadata is corrupted Obtained from: OpenZFS OpenZFS commit: 4a1195ca5041cbff2a6b025a31937fef84876c52
Diffstat (limited to 'sys/contrib/openzfs/module/lua')
-rw-r--r--sys/contrib/openzfs/module/lua/lcode.c4
-rw-r--r--sys/contrib/openzfs/module/lua/lgc.c2
-rw-r--r--sys/contrib/openzfs/module/lua/llex.c2
-rw-r--r--sys/contrib/openzfs/module/lua/lstrlib.c2
-rw-r--r--sys/contrib/openzfs/module/lua/ltable.c2
5 files changed, 8 insertions, 4 deletions
diff --git a/sys/contrib/openzfs/module/lua/lcode.c b/sys/contrib/openzfs/module/lua/lcode.c
index ae9a3d91d810..4d88c792a281 100644
--- a/sys/contrib/openzfs/module/lua/lcode.c
+++ b/sys/contrib/openzfs/module/lua/lcode.c
@@ -8,6 +8,10 @@
#define lcode_c
#define LUA_CORE
+#if defined(HAVE_IMPLICIT_FALLTHROUGH)
+#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
+#endif
+
#include <sys/lua/lua.h>
#include "lcode.h"
diff --git a/sys/contrib/openzfs/module/lua/lgc.c b/sys/contrib/openzfs/module/lua/lgc.c
index 55feb24119d3..227ad723a0b8 100644
--- a/sys/contrib/openzfs/module/lua/lgc.c
+++ b/sys/contrib/openzfs/module/lua/lgc.c
@@ -676,7 +676,7 @@ static void freeobj (lua_State *L, GCObject *o) {
case LUA_TUSERDATA: luaM_freemem(L, o, sizeudata(gco2u(o))); break;
case LUA_TSHRSTR:
G(L)->strt.nuse--;
- /* FALLTHROUGH */
+ fallthrough;
case LUA_TLNGSTR: {
luaM_freemem(L, o, sizestring(gco2ts(o)));
break;
diff --git a/sys/contrib/openzfs/module/lua/llex.c b/sys/contrib/openzfs/module/lua/llex.c
index 0c3488a551f6..f2c9bf826c82 100644
--- a/sys/contrib/openzfs/module/lua/llex.c
+++ b/sys/contrib/openzfs/module/lua/llex.c
@@ -477,7 +477,7 @@ static int llex (LexState *ls, SemInfo *seminfo) {
else if (!lisdigit(ls->current)) return '.';
/* else go through */
}
- /* FALLTHROUGH */
+ fallthrough;
case '0': case '1': case '2': case '3': case '4':
case '5': case '6': case '7': case '8': case '9': {
read_numeral(ls, seminfo);
diff --git a/sys/contrib/openzfs/module/lua/lstrlib.c b/sys/contrib/openzfs/module/lua/lstrlib.c
index 12027757bf53..46e3d8fb35bb 100644
--- a/sys/contrib/openzfs/module/lua/lstrlib.c
+++ b/sys/contrib/openzfs/module/lua/lstrlib.c
@@ -501,7 +501,7 @@ static const char *match (MatchState *ms, const char *s, const char *p) {
}
case '+': /* 1 or more repetitions */
s++; /* 1 match already done */
- /* FALLTHROUGH */
+ fallthrough;
case '*': /* 0 or more repetitions */
s = max_expand(ms, s, p, ep);
break;
diff --git a/sys/contrib/openzfs/module/lua/ltable.c b/sys/contrib/openzfs/module/lua/ltable.c
index 0ba462cfd885..f6872babc6e7 100644
--- a/sys/contrib/openzfs/module/lua/ltable.c
+++ b/sys/contrib/openzfs/module/lua/ltable.c
@@ -492,7 +492,7 @@ const TValue *luaH_get (Table *t, const TValue *key) {
return luaH_getint(t, k); /* use specialized version */
/* else go through */
}
- /* FALLTHROUGH */
+ fallthrough;
default: {
Node *n = mainposition(t, key);
do { /* check whether `key' is somewhere in the chain */