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

Merge branch 'heinz-changes' of github.com:jthornber/thin-provisioning-tools into rhel6.3-maintenance

Browse Source
This commit is contained in:
Joe Thornber 2012-03-13 14:06:21 +00:00
commit 21405ab76f
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
metadata.cc
View File

@ -65,8 +65,8 @@ namespace {
if (r) if (r)
throw runtime_error("Couldn't stat dev path"); throw runtime_error("Couldn't stat dev path");
if (S_ISREG(info.st_mode)) if (S_ISREG(info.st_mode) && info.st_size)
nr_blocks = div_down<block_address>(info.st_size, MD_BLOCK_SIZE); nr_blocks = div_up<block_address>(info.st_size, MD_BLOCK_SIZE);
else if (S_ISBLK(info.st_mode)) { else if (S_ISBLK(info.st_mode)) {
// To get the size of a block device we need to // To get the size of a block device we need to

2
thin_check.cc
View File

@ -41,7 +41,7 @@ namespace {
} }
} catch (std::exception &e) { } catch (std::exception &e) {
if (!quiet) if (!quiet)
cerr << e.what(); cerr << e.what() << endl;
return 1; return 1;
} }