hardcoresushi/libcryfs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge commit '3e7af232e743dde44c699a72c4bde56995e2f9e9' into develop

Browse Source
This commit is contained in:
Sebastian Messmer 2015-11-16 22:05:40 -08:00
commit 142881a70f
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/cli/Cli.cpp
View File

@ -61,7 +61,6 @@ using boost::chrono::milliseconds;
//TODO Support files > 4GB
//TODO Improve parallelity.
//TODO Did deadlock in bonnie++ second run (in the create files sequentially) - maybe also in a later run or different step?
//TODO Improve error message when root blob wasn't found.
//TODO Replace ASSERTs with other error handling when it is not a programming error but an environment influence (e.g. a block is missing)
namespace cryfs {

16
src/filesystem/CryDevice.cpp
View File

@ -39,6 +39,7 @@ using cryfs::parallelaccessfsblobstore::FileBlobRef;
using cryfs::parallelaccessfsblobstore::DirBlobRef;
using cryfs::parallelaccessfsblobstore::SymlinkBlobRef;
using cryfs::parallelaccessfsblobstore::FsBlobRef;
using namespace cpputils::logging;
namespace bf = boost::filesystem;
@ -101,7 +102,10 @@ unique_ref<DirBlobRef> CryDevice::LoadDirBlob(const bf::path &path) {
unique_ref<FsBlobRef> CryDevice::LoadBlob(const bf::path &path) {
auto currentBlob = _fsBlobStore->load(_rootKey);
ASSERT(currentBlob != none, "rootDir not found");
if (currentBlob == none) {
LOG(ERROR) << "Could not load root blob. Is the base directory accessible?";
throw FuseErrnoException(EIO);
}
for (const bf::path &component : path.relative_path()) {
auto currentDir = dynamic_pointer_move<DirBlobRef>(*currentBlob);
@ -142,13 +146,19 @@ unique_ref<SymlinkBlobRef> CryDevice::CreateSymlinkBlob(const bf::path &target)
unique_ref<FsBlobRef> CryDevice::LoadBlob(const blockstore::Key &key) {
auto blob = _fsBlobStore->load(key);
ASSERT(blob != none, "Blob not found");
if (blob == none) {
LOG(ERROR) << "Could not load blob " << key.ToString() << ". Is the root directory accessible?";
throw FuseErrnoException(EIO);
}
return std::move(*blob);
}
void CryDevice::RemoveBlob(const blockstore::Key &key) {
auto blob = _fsBlobStore->load(key);
ASSERT(blob != none, "Blob not found");
if (blob == none) {
LOG(ERROR) << "Could not load blob " << key.ToString() << ". Is the root directory accessible?";
throw FuseErrnoException(EIO);
}
_fsBlobStore->remove(std::move(*blob));
}