From 8b258a005ba6852209ec7af5b373a69f437abfaa Mon Sep 17 00:00:00 2001 From: Peter Rajnoha Date: Wed, 30 Mar 2016 13:06:12 +0200 Subject: [PATCH] dev-cache: dev_cache_index_devs fn is available unconditionally The new dev_cache_index_devs fn was under ifdef UDEV_SYNC_SUPPORT by mistake, move it out of this ifdef. --- lib/device/dev-cache.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/lib/device/dev-cache.c b/lib/device/dev-cache.c index 1729aba3b..50ef2f29f 100644 --- a/lib/device/dev-cache.c +++ b/lib/device/dev-cache.c @@ -777,6 +777,24 @@ static int _insert_file(const char *path) return 1; } +int dev_cache_index_devs(void) +{ + struct btree_iter *iter = btree_first(_cache.devices); + struct device *dev; + int r = 1; + + while (iter) { + dev = btree_get_data(iter); + + if (!_index_dev_by_vgid_and_lvid(dev)) + r = 0; + + iter = btree_next(iter); + } + + return r; +} + #ifdef UDEV_SYNC_SUPPORT static int _device_in_udev_db(const dev_t d) @@ -854,24 +872,6 @@ bad: return 0; } -int dev_cache_index_devs(void) -{ - struct btree_iter *iter = btree_first(_cache.devices); - struct device *dev; - int r = 1; - - while (iter) { - dev = btree_get_data(iter); - - if (!_index_dev_by_vgid_and_lvid(dev)) - r = 0; - - iter = btree_next(iter); - } - - return r; -} - static void _insert_dirs(struct dm_list *dirs) { struct dir_list *dl; -- 2.43.5