label: code deduplication

diff --git a/lib/label/label.c b/lib/label/label.c
index 8e68f9303a4acd533afc472601f339c970a44a27..6c86e9ab2db9f5301831b2a1aa43597c3f16cd39 100644 (file)
--- a/lib/label/label.c
+++ b/lib/label/label.c
@@ -1060,10 +1060,7 @@ int label_scan(struct cmd_context *cmd)
                 * label_scan should not generally be called a second time,
                 * so this will usually not be true.
                 */
-               if (_in_bcache(dev)) {
-                       _invalidate_fd(scan_bcache, dev->bcache_fd);
-                       _scan_dev_close(dev);
-               }
+               label_scan_invalidate(dev);
        };
        dev_iter_destroy(iter);
 
@@ -1232,12 +1229,8 @@ int label_scan_devs(struct cmd_context *cmd, struct dev_filter *f, struct dm_lis
                        return 0;
        }
 
-       dm_list_iterate_items(devl, devs) {
-               if (_in_bcache(devl->dev)) {
-                       _invalidate_fd(scan_bcache, devl->dev->bcache_fd);
-                       _scan_dev_close(devl->dev);
-               }
-       }
+       dm_list_iterate_items(devl, devs)
+               label_scan_invalidate(devl->dev);
 
        _scan_list(cmd, f, devs, NULL);
 
@@ -1260,10 +1253,7 @@ int label_scan_devs_rw(struct cmd_context *cmd, struct dev_filter *f, struct dm_
        }
 
        dm_list_iterate_items(devl, devs) {
-               if (_in_bcache(devl->dev)) {
-                       _invalidate_fd(scan_bcache, devl->dev->bcache_fd);
-                       _scan_dev_close(devl->dev);
-               }
+               label_scan_invalidate(devl->dev);
                /*
                 * With this flag set, _scan_dev_open() done by
                 * _scan_list() will do open RW
@@ -1282,10 +1272,7 @@ int label_scan_devs_excl(struct dm_list *devs)
        int failed = 0;
 
        dm_list_iterate_items(devl, devs) {
-               if (_in_bcache(devl->dev)) {
-                       _invalidate_fd(scan_bcache, devl->dev->bcache_fd);
-                       _scan_dev_close(devl->dev);
-               }
+               label_scan_invalidate(devl->dev);
                /*
                 * With this flag set, _scan_dev_open() done by
                 * _scan_list() will do open EXCL
@@ -1384,10 +1371,7 @@ int label_read(struct device *dev)
        dm_list_init(&one_dev);
        dm_list_add(&one_dev, &devl->list);
 
-       if (_in_bcache(dev)) {
-               _invalidate_fd(scan_bcache, dev->bcache_fd);
-               _scan_dev_close(dev);
-       }
+       label_scan_invalidate(dev);
 
        _scan_list(NULL, NULL, &one_dev, &failed);
 
@@ -1665,4 +1649,3 @@ void dev_unset_last_byte(struct device *dev)
 {
        bcache_unset_last_byte(scan_bcache, dev->bcache_fd);
 }
-