diff options
| author | Karel Zak <kzak@redhat.com> | 2025-02-18 13:08:03 +0100 |
|---|---|---|
| committer | Karel Zak <kzak@redhat.com> | 2025-02-18 13:08:03 +0100 |
| commit | 26a1ec07e153e714e4cf1c49f83e346bd2892877 (patch) | |
| tree | f5a2009f5f81a03203a9278dc515f5ebe227d90b /libmount/src | |
| parent | ec40f63e1cb1c2b0b93338e1de4b9ffe04efabe1 (diff) | |
| download | util-linux-26a1ec07e153e714e4cf1c49f83e346bd2892877.tar.gz | |
libmount: fix table_init_listmount()
Addresses: 8ab1890df4481ddabfa34a8c7fbed09fdd818eba
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'libmount/src')
| -rw-r--r-- | libmount/src/tab_listmount.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/libmount/src/tab_listmount.c b/libmount/src/tab_listmount.c index 1ccdf2e77e..c9725a23c5 100644 --- a/libmount/src/tab_listmount.c +++ b/libmount/src/tab_listmount.c @@ -81,7 +81,7 @@ struct libmnt_listmnt { static int table_init_listmount(struct libmnt_table *tb, size_t stepsiz) { - struct libmnt_listmnt *ls = NULL;; + struct libmnt_listmnt *ls; if (!tb) return -EINVAL; @@ -120,18 +120,18 @@ static int table_init_listmount(struct libmnt_table *tb, size_t stepsiz) ls->list = (uint64_t *) (x + sizeof(struct libmnt_listmnt)); ls->stepsiz = stepsiz; ls->id = LSMT_ROOT; /* default */ - } - /* reuse old setting */ - if (tb->lsmnt && ls != tb->lsmnt) { - ls->id = tb->lsmnt->id; - ls->ns = tb->lsmnt->ns; - ls->last = tb->lsmnt->last; - ls->enabled = tb->lsmnt->enabled; - ls->reverse = tb->lsmnt->reverse; - free(tb->lsmnt); + /* reuse old setting */ + if (tb->lsmnt) { + ls->id = tb->lsmnt->id; + ls->ns = tb->lsmnt->ns; + ls->last = tb->lsmnt->last; + ls->enabled = tb->lsmnt->enabled; + ls->reverse = tb->lsmnt->reverse; - tb->lsmnt = ls; + free(tb->lsmnt); + } + tb->lsmnt = ls;; } DBG(TAB, ul_debugobj(tb, "listmount: init [step=%zu]", ls->stepsiz)); |