Add and use dev_open_readonly and variations.

diff --git a/WHATS_NEW b/WHATS_NEW
index af15c9d1d43b997da1a5bc83613ab3c9c90f6db9..735902660ded35b0a4a9cd0ab653ed5c87cd146a 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.02.86 -  
 =================================
+  Add and use dev_open_readonly and variations.
   Do not log a superfluous stack message when the lv is properly processed.
   Do not issue an error message when unable to remove .cache on read-only fs.
   Avoid memlock size mismatch by preallocating stdio line buffers.

diff --git a/lib/config/config.c b/lib/config/config.c
index 9fb2bf61d52738f34b434bb8678b83c2a36514b9..1003073a171020b40cc6d9082d4073a07cf815bf 100644 (file)
--- a/lib/config/config.c
+++ b/lib/config/config.c
@@ -295,7 +295,7 @@ int read_config_file(struct config_tree *cft)
                if (!(c->dev = dev_create_file(c->filename, NULL, NULL, 1)))
                        return_0;
 
-               if (!dev_open_flags(c->dev, O_RDONLY, 0, 0)) {
+               if (!dev_open_readonly_buffered(c->dev)) {
                        c->dev = 0;
                        return_0;
                }

diff --git a/lib/device/dev-io.c b/lib/device/dev-io.c
index 154b2ccebb19768b518fc2032461032e6da2a01e..16aad38c4ae1c44c6916e2944da9831062c4dec0 100644 (file)
--- a/lib/device/dev-io.c
+++ b/lib/device/dev-io.c
@@ -556,6 +556,21 @@ int dev_open(struct device *dev)
        return dev_open_flags(dev, flags, 1, 0);
 }
 
+int dev_open_readonly(struct device *dev)
+{
+       return dev_open_flags(dev, O_RDONLY, 1, 0);
+}
+
+int dev_open_readonly_buffered(struct device *dev)
+{
+       return dev_open_flags(dev, O_RDONLY, 0, 0);
+}
+
+int dev_open_readonly_quiet(struct device *dev)
+{
+       return dev_open_flags(dev, O_RDONLY, 1, 1);
+}
+
 int dev_test_excl(struct device *dev)
 {
        int flags;

diff --git a/lib/device/device.h b/lib/device/device.h
index dc4d50ab31bb001326e9dc56987c1d1d18117e91..8c32a03b422f9d26b0dba2ecd0f6b28a58377815 100644 (file)
--- a/lib/device/device.h
+++ b/lib/device/device.h
@@ -74,6 +74,9 @@ int dev_discard_blocks(struct device *dev, uint64_t offset_bytes, uint64_t size_
 int dev_open(struct device *dev);
 int dev_open_quiet(struct device *dev);
 int dev_open_flags(struct device *dev, int flags, int direct, int quiet);
+int dev_open_readonly(struct device *dev);
+int dev_open_readonly_buffered(struct device *dev);
+int dev_open_readonly_quiet(struct device *dev);
 int dev_close(struct device *dev);
 int dev_close_immediate(struct device *dev);
 void dev_close_all(void);

diff --git a/lib/filters/filter.c b/lib/filters/filter.c
index 1c043fcdf673f86aba049f642ceeddf90eb3618f..a9b99a5388067ea77bc71287b3894ee674b6a1f2 100644 (file)
--- a/lib/filters/filter.c
+++ b/lib/filters/filter.c
@@ -147,7 +147,7 @@ static int _passes_lvm_type_device_filter(struct dev_filter *f __attribute__((un
        }
 
        /* Check it's accessible */
-       if (!dev_open_flags(dev, O_RDONLY, 1, 1)) {
+       if (!dev_open_readonly_quiet(dev)) {
                log_debug("%s: Skipping: open failed", name);
                return 0;
        }