Blame device-mapper-persistent-data-fix-cache-check-exclusive-open.patch
|
 |
854d454 |
VERSION | 2 +-
|
|
|
854d454 |
caching/cache_check.cc | 7 ++++---
|
|
|
854d454 |
2 files changed, 5 insertions(+), 4 deletions(-)
|
|
|
854d454 |
|
|
|
854d454 |
diff --git a/VERSION b/VERSION
|
|
|
854d454 |
index cb0c939..7d85683 100644
|
|
|
854d454 |
--- a/VERSION
|
|
|
854d454 |
+++ b/VERSION
|
|
|
854d454 |
@@ -1 +1 @@
|
|
|
854d454 |
-0.5.2
|
|
|
854d454 |
+0.5.4
|
|
|
854d454 |
diff --git a/caching/cache_check.cc b/caching/cache_check.cc
|
|
|
854d454 |
index 005159e..9bd34be 100644
|
|
|
854d454 |
--- a/caching/cache_check.cc
|
|
|
854d454 |
+++ b/caching/cache_check.cc
|
|
|
854d454 |
@@ -220,7 +220,9 @@ namespace {
|
|
|
854d454 |
write_superblock(bm, sb);
|
|
|
854d454 |
}
|
|
|
854d454 |
|
|
|
854d454 |
- error_state metadata_check(block_manager<>::ptr bm, flags const &fs) {
|
|
|
854d454 |
+ error_state metadata_check(string const &path, flags const &fs) {
|
|
|
854d454 |
+ block_manager<>::ptr bm = open_bm(path, block_manager<>::READ_ONLY);
|
|
|
854d454 |
+
|
|
|
854d454 |
nested_output out(cerr, 2);
|
|
|
854d454 |
if (fs.quiet_)
|
|
|
854d454 |
out.disable();
|
|
|
854d454 |
@@ -295,8 +297,7 @@ namespace {
|
|
|
854d454 |
throw runtime_error(msg.str());
|
|
|
854d454 |
}
|
|
|
854d454 |
|
|
|
854d454 |
- block_manager<>::ptr bm = open_bm(path, block_manager<>::READ_ONLY);
|
|
|
854d454 |
- err = metadata_check(bm, fs);
|
|
|
854d454 |
+ err = metadata_check(path, fs);
|
|
|
854d454 |
|
|
|
854d454 |
bool success = false;
|
|
|
854d454 |
|