ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "libsnapshot: Don't force-unmap in DeleteSnapshot()."

Browse source
This commit is contained in:
David Anderson 2019-08-07 20:24:46 +00:00 • committed by Gerrit Code Review
commit 36acd1d246
3 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
fs_mgr/libsnapshot/include/libsnapshot/snapshot.h
View file

@ -170,9 +170,8 @@ class SnapshotManager final {
bool MapSnapshot(LockedFile* lock, const std::string& name, const std::string& base_device,
const std::chrono::milliseconds& timeout_ms, std::string* dev_path);
// Remove the backing copy-on-write image for the named snapshot. If the
// device is still mapped, this will attempt an Unmap, and fail if the
// unmap fails.
// Remove the backing copy-on-write image for the named snapshot. The
// caller is responsible for ensuring that the snapshot is unmapped.
bool DeleteSnapshot(LockedFile* lock, const std::string& name);
// Unmap a snapshot device previously mapped with MapSnapshotDevice().

5
fs_mgr/libsnapshot/snapshot.cpp
View file

@ -300,11 +300,6 @@ bool SnapshotManager::DeleteSnapshot(LockedFile* lock, const std::string& name)
CHECK(lock);
if (!EnsureImageManager()) return false;
if (!UnmapSnapshot(lock, name)) {
LOG(ERROR) << "Snapshot could not be unmapped for deletion: " << name;
return false;
}
// Take the snapshot's lock after Unmap, since it will also try to lock.
auto status_file = OpenSnapshotStatusFile(name, O_RDONLY, LOCK_EX);
if (!status_file) return false;

3
fs_mgr/libsnapshot/snapshot_test.cpp
View file

@ -104,7 +104,7 @@ TEST_F(SnapshotTest, CreateSnapshot) {
ASSERT_EQ(snapshots.size(), 1);
ASSERT_EQ(snapshots[0], "test-snapshot");
// Scope so delete can re-acquire the status file lock.
// Scope so delete can re-acquire the snapshot file lock.
{
auto file = sm->OpenSnapshotStatusFile("test-snapshot", O_RDONLY, LOCK_SH);
ASSERT_NE(file, nullptr);
@ -116,6 +116,7 @@ TEST_F(SnapshotTest, CreateSnapshot) {
ASSERT_EQ(status.snapshot_size, kDeviceSize);
}
ASSERT_TRUE(sm->UnmapSnapshot(lock_.get(), "test-snapshot"));
ASSERT_TRUE(sm->DeleteSnapshot(lock_.get(), "test-snapshot"));
}