diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2021-12-19 15:21:10 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2021-12-19 15:25:26 +0000 |
| commit | 3aa1cabca37db4ef3da06e92af17688783ccb00c (patch) | |
| tree | ac6e97937df069c532ea8f3d18eb2429789be8ae /sys/contrib/openzfs/module/lua/lstrlib.c | |
| parent | 19592949abd2953a3c00cda59231113d29d4dd63 (diff) | |
| parent | af88d47f1ee86fae4abcfe0dabca67ea3c94d377 (diff) | |
zfs: merge openzfs/zfs@af88d47f1 (zfs-2.1-release) into stable/13
OpenZFS release 2.1.2
Notable upstream pull request merges:
#12668 FreeBSD: Catch up with recent VFS changes
#12704 Fix some FreeBSD VOPs to synchronize properly with teardown
#12717 VOP_RENAME fixes for FreeBSD
#12724 Fix lseek(SEEK_DATA/SEEK_HOLE) mmap consistency
#12745 Restore dirty dnode detection logic
#12770 ZFS send/recv with ashift 9->12 leads to data corruption
#12828 FreeBSD: Add vop_standard_writecount_nomsyn
#12828 FreeBSD: Catch up with more VFS changes
Obtained from: OpenZFS
OpenZFS commit: af88d47f1ee86fae4abcfe0dabca67ea3c94d377
OpenZFS tag: zfs-2.1.2
Relnotes: yes
Diffstat (limited to 'sys/contrib/openzfs/module/lua/lstrlib.c')
| -rw-r--r-- | sys/contrib/openzfs/module/lua/lstrlib.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |