From 78b24dee19dd491331d764f584477e37111f3681 Mon Sep 17 00:00:00 2001 From: Joe Thornber Date: Tue, 8 Sep 2015 10:12:56 +0100 Subject: [PATCH 1/2] [era_invalidate] Don't open in exclusive mode if using a metadata snap. Patch from bobk-rey on github --- era/era_invalidate.cc | 2 +- man8/era_invalidate.8 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/era/era_invalidate.cc b/era/era_invalidate.cc index c81b5af..20490a0 100644 --- a/era/era_invalidate.cc +++ b/era/era_invalidate.cc @@ -152,7 +152,7 @@ namespace { int invalidate(string const &dev, string const &output, flags const &fs) { try { set blocks; - block_manager<>::ptr bm = open_bm(dev, block_manager<>::READ_ONLY); + block_manager<>::ptr bm = open_bm(dev, block_manager<>::READ_ONLY, !fs.metadata_snapshot_); if (fs.metadata_snapshot_) { superblock sb = read_superblock(bm); diff --git a/man8/era_invalidate.8 b/man8/era_invalidate.8 index 2e67d4a..9bc6994 100644 --- a/man8/era_invalidate.8 +++ b/man8/era_invalidate.8 @@ -11,7 +11,7 @@ era_invalidate \- Provide a list of blocks that have changed since a particular .B era_invalidate Examines era metadata and lists blocks that may have changed since a given era. -This tool cannot be run on live metadata. +This tool cannot be run on live metadata unless the \fB\-\-metadata\-snap\fP option is used. .SH OPTIONS .IP "\fB\-h, \-\-help\fP" From 2b12854ecdd87eacb26c0abeff4d842724732a73 Mon Sep 17 00:00:00 2001 From: Joe Thornber Date: Tue, 8 Sep 2015 10:20:42 +0100 Subject: [PATCH 2/2] bump version to 0.5.6 --- CHANGES | 5 +++++ VERSION | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 72986d0..ee92eee 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,8 @@ +v0.5.6 +====== + +era_invalidate may be run on live metadata if the --metadata-snap option is given. + v0.5.5 ====== diff --git a/VERSION b/VERSION index d1d899f..b49b253 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.5.5 +0.5.6