aboutsummaryrefslogtreecommitdiff
path: root/sys/contrib/openzfs/module/lua
diff options
context:
space:
mode:
authorMartin Matuska <mm@FreeBSD.org>2021-02-16 00:39:34 +0000
committerMartin Matuska <mm@FreeBSD.org>2021-02-16 01:46:28 +0000
commit184c1b943937986c81e1996d999d21626ec7a4ff (patch)
treef7321df93d0bd5ffb8cf9245c84745dac7e81ce1 /sys/contrib/openzfs/module/lua
parent10fc4c3218381fef7189a5b8d46a757cd1989dff (diff)
parent83dd4a9252fd2044038a399d7afc68259d483b8e (diff)
downloadsrc-184c1b943937986c81e1996d999d21626ec7a4ff.tar.gz
src-184c1b943937986c81e1996d999d21626ec7a4ff.zip
zfs: merge OpenZFS master-436ab35a5
- speed up writing to ZFS pools without ZIL devices (aa755b3) - speed up importing ZFS pools (2d8f72d, a0e0199, cf0977a) ... MFC after: 2 weeks Reviewed by: mjg (partial) Tested by: pho Differential Revision: https://reviews.freebsd.org/D28677
Diffstat (limited to 'sys/contrib/openzfs/module/lua')
-rw-r--r--sys/contrib/openzfs/module/lua/ldebug.c1
-rw-r--r--sys/contrib/openzfs/module/lua/ldo.c1
2 files changed, 0 insertions, 2 deletions
diff --git a/sys/contrib/openzfs/module/lua/ldebug.c b/sys/contrib/openzfs/module/lua/ldebug.c
index 2e1efa4e7250..da005c44376e 100644
--- a/sys/contrib/openzfs/module/lua/ldebug.c
+++ b/sys/contrib/openzfs/module/lua/ldebug.c
@@ -324,7 +324,6 @@ static void kname (Proto *p, int pc, int c, const char **name) {
if (ISK(c)) { /* is 'c' a constant? */
TValue *kvalue = &p->k[INDEXK(c)];
if (ttisstring(kvalue)) { /* literal constant? */
- // cppcheck-suppress autoVariables
*name = svalue(kvalue); /* it is its own name */
return;
}
diff --git a/sys/contrib/openzfs/module/lua/ldo.c b/sys/contrib/openzfs/module/lua/ldo.c
index 474fe659bcef..f3c3dcb4d81a 100644
--- a/sys/contrib/openzfs/module/lua/ldo.c
+++ b/sys/contrib/openzfs/module/lua/ldo.c
@@ -196,7 +196,6 @@ int luaD_rawrunprotected (lua_State *L, Pfunc f, void *ud) {
struct lua_longjmp lj;
lj.status = LUA_OK;
lj.previous = L->errorJmp; /* chain new error handler */
- // cppcheck-suppress autoVariables
L->errorJmp = &lj;
LUAI_TRY(L, &lj,
(*f)(L, ud);