emo/thin-provisioning-tools
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[cache_check] Don't even open the dev writeable if

Browse Source 
--clear-needs-check-flag is not set
This commit is contained in:
Joe Thornber 2017-03-27 08:58:56 -04:00
parent b0e0432737
commit 13323bd52c
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
caching/cache_check.cc
View File

@ -219,7 +219,8 @@ namespace {
write_superblock(bm, sb); write_superblock(bm, sb);
} }
error_state metadata_check(string const &path, flags const &fs) { error_state metadata_check(string const &path, flags const &fs,
bool &needs_check_set) {
block_manager<>::ptr bm = open_bm(path, block_manager<>::READ_ONLY); block_manager<>::ptr bm = open_bm(path, block_manager<>::READ_ONLY);
nested_output out(cerr, 2); nested_output out(cerr, 2);
@ -243,6 +244,8 @@ namespace {
superblock sb = read_superblock(bm); superblock sb = read_superblock(bm);
transaction_manager::ptr tm = open_tm(bm); transaction_manager::ptr tm = open_tm(bm);
needs_check_set = sb.flags.get_flag(superblock_flags::NEEDS_CHECK);
if (fs.check_mappings_) { if (fs.check_mappings_) {
out << "examining mapping array" << end_message(); out << "examining mapping array" << end_message();
{ {
@ -294,6 +297,7 @@ namespace {
int check(string const &path, flags const &fs) { int check(string const &path, flags const &fs) {
error_state err; error_state err;
bool needs_check_set;
struct stat info = guarded_stat(path); struct stat info = guarded_stat(path);
if (!S_ISREG(info.st_mode) && !S_ISBLK(info.st_mode)) { if (!S_ISREG(info.st_mode) && !S_ISBLK(info.st_mode)) {
@ -302,7 +306,7 @@ namespace {
throw runtime_error(msg.str()); throw runtime_error(msg.str());
} }
err = metadata_check(path, fs); err = metadata_check(path, fs, needs_check_set);
bool success = false; bool success = false;
@ -311,7 +315,7 @@ namespace {
else else
success = (err == NO_ERROR) ? true : false; success = (err == NO_ERROR) ? true : false;
if (success && fs.clear_needs_check_on_success_) if (success && fs.clear_needs_check_on_success_ && needs_check_set)
clear_needs_check(path); clear_needs_check(path);
return err == NO_ERROR ? 0 : 1; return err == NO_ERROR ? 0 : 1;