diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2021-08-08 01:57:07 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2021-08-08 02:01:26 +0000 |
| commit | 1f88aa09417f1cfb3929fd37531b1ab51213c2d6 (patch) | |
| tree | 34f3bb9d2e1f27e013383c9dc3b4d4ff8da2434d /sys/contrib/openzfs/module/lua | |
| parent | b0dafb1b6f352a90cf164210598e778ecedaea48 (diff) | |
| parent | f3678d70ff8f98d67caf377ec0326c9a6c7bcf29 (diff) | |
| download | src-1f88aa09417f1cfb3929fd37531b1ab51213c2d6.tar.gz src-1f88aa09417f1cfb3929fd37531b1ab51213c2d6.zip | |
zfs: merge openzfs/zfs@f3678d70f (master) into main
Notable upstream pull request merges:
#12339 Read past end of argv array in zpool_do_import()
#12365 Fixes in persistent L2ARC
#12383 Fixes for KMSAN reports
#12425 Avoid small buffer copying on write
#12428 Fix unfortunate NULL in spa_update_dspace
#12446 Allow disabling of unmapped I/O on FreeBSD
Obtained from: OpenZFS
OpenZFS commit: f3678d70ff8f98d67caf377ec0326c9a6c7bcf29
Diffstat (limited to 'sys/contrib/openzfs/module/lua')
| -rw-r--r-- | sys/contrib/openzfs/module/lua/llex.c | 2 | ||||
| -rw-r--r-- | sys/contrib/openzfs/module/lua/ltable.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sys/contrib/openzfs/module/lua/llex.c b/sys/contrib/openzfs/module/lua/llex.c index 50c301f599f1..0c3488a551f6 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/ltable.c b/sys/contrib/openzfs/module/lua/ltable.c index f60418721bef..0ba462cfd885 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 */ |