diff options
| author | David Teigland <teigland@redhat.com> | 2022-05-27 12:38:43 -0500 |
|---|---|---|
| committer | David Teigland <teigland@redhat.com> | 2022-05-27 12:38:43 -0500 |
| commit | 9dfa6f38793f6b5f7de2a4148ab2f7790e3c39da (patch) | |
| tree | f14b6c6db6a28d9a9f04b71dc4a75b3e31d54d48 | |
| parent | a30013ff4f5981afd7778597172e0e834ca99cd4 (diff) | |
| download | lvm2-9dfa6f38793f6b5f7de2a4148ab2f7790e3c39da.tar.gz | |
devices file: move clean up after command is run
devices_file_exit wasn't being called between lvm_shell
commands, so the file lock wouldn't be released.
| -rw-r--r-- | lib/commands/toolcontext.c | 2 | ||||
| -rw-r--r-- | tools/lvmcmdline.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/lib/commands/toolcontext.c b/lib/commands/toolcontext.c index 4cb81bf94..2666d7b42 100644 --- a/lib/commands/toolcontext.c +++ b/lib/commands/toolcontext.c @@ -1905,7 +1905,6 @@ int refresh_toolcontext(struct cmd_context *cmd) _destroy_segtypes(&cmd->segtypes); _destroy_formats(cmd, &cmd->formats); - devices_file_exit(cmd); if (!dev_cache_exit()) stack; _destroy_dev_types(cmd); @@ -2034,7 +2033,6 @@ void destroy_toolcontext(struct cmd_context *cmd) _destroy_segtypes(&cmd->segtypes); _destroy_formats(cmd, &cmd->formats); _destroy_filters(cmd); - devices_file_exit(cmd); dev_cache_exit(); _destroy_dev_types(cmd); _destroy_tags(cmd); diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c index 1e3547ed7..b052d698f 100644 --- a/tools/lvmcmdline.c +++ b/tools/lvmcmdline.c @@ -3305,6 +3305,7 @@ int lvm_run_command(struct cmd_context *cmd, int argc, char **argv) hints_exit(cmd); lvmcache_destroy(cmd, 1, 1); label_scan_destroy(cmd); + devices_file_exit(cmd); if ((config_string_cft = remove_config_tree_by_source(cmd, CONFIG_STRING))) dm_config_destroy(config_string_cft); |