diff options
| author | Zdenek Kabelac <zkabelac@redhat.com> | 2014-12-06 23:56:14 +0100 |
|---|---|---|
| committer | Zdenek Kabelac <zkabelac@redhat.com> | 2015-11-16 01:16:11 +0100 |
| commit | dccbc3b621cdac035802cb9f60438a389acadcad (patch) | |
| tree | ddad9a61a78cb5f74a792c0d004ef759983d6905 | |
| parent | 5a4676fea9808f348b9bbda46c03dce298eef6e5 (diff) | |
| download | lvm2-dccbc3b621cdac035802cb9f60438a389acadcad.tar.gz | |
cleanup: simplify dev_cache_exit
Just set whole _cache struct into unitialized state just
like with lib init start usage.
Lists are initialized with dev_cache_init().
| -rw-r--r-- | lib/device/dev-cache.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/lib/device/dev-cache.c b/lib/device/dev-cache.c index 185b3945f..7626cebbd 100644 --- a/lib/device/dev-cache.c +++ b/lib/device/dev-cache.c @@ -819,23 +819,13 @@ int dev_cache_exit(void) if ((num_open = _check_for_open_devices(1)) > 0) log_error(INTERNAL_ERROR "%d device(s) were left open and have been closed.", num_open); - if (_cache.preferred_names_matcher) - _cache.preferred_names_matcher = NULL; - - if (_cache.mem) { + if (_cache.mem) dm_pool_destroy(_cache.mem); - _cache.mem = NULL; - } - if (_cache.names) { + if (_cache.names) dm_hash_destroy(_cache.names); - _cache.names = NULL; - } - _cache.devices = NULL; - _cache.has_scanned = 0; - dm_list_init(&_cache.dirs); - dm_list_init(&_cache.files); + memset(&_cache, 0, sizeof(_cache)); return (!num_open); } |