[blobfs][rac] Fix up tests after rebase
Change-Id: Id91a6df3be53b1bdbac56c46938aedc76d92a34a
diff --git a/zircon/system/ulib/blobfs/blobfs.cc b/zircon/system/ulib/blobfs/blobfs.cc
index 73009b3..21e69c0 100644
--- a/zircon/system/ulib/blobfs/blobfs.cc
+++ b/zircon/system/ulib/blobfs/blobfs.cc
@@ -150,10 +150,9 @@
// Construct the Blobfs object, without intensive validation, since it
// may require upgrades / journal replays to become valid.
- auto fs = std::unique_ptr<Blobfs>(new Blobfs(dispatcher, std::move(device), superblock,
- options->writability,
- options->write_compression_algorithm,
- std::move(vmex_resource)));
+ auto fs = std::unique_ptr<Blobfs>(
+ new Blobfs(dispatcher, std::move(device), superblock, options->writability,
+ options->write_compression_algorithm, std::move(vmex_resource)));
fs->block_info_ = std::move(block_info);
if (options->pager) {
@@ -569,7 +568,7 @@
WriteInfo(&builder);
if (zeroed_nodes_blocks > 0) {
storage::UnbufferedOperation operation = {
- .vmo = zx::unowned_vmo(allocator->GetNodeMapVmo().get()),
+ .vmo = zx::unowned_vmo(allocator->GetNodeMapVmo().get()),
{
.type = storage::OperationType::kWrite,
.vmo_offset = inoblks_old,
diff --git a/zircon/system/ulib/blobfs/compression/zstd-compressed-block-collection.cc b/zircon/system/ulib/blobfs/compression/zstd-compressed-block-collection.cc
index a565b57..69c2763 100644
--- a/zircon/system/ulib/blobfs/compression/zstd-compressed-block-collection.cc
+++ b/zircon/system/ulib/blobfs/compression/zstd-compressed-block-collection.cc
@@ -40,7 +40,7 @@
node_finder_(node_finder),
node_index_(node_index),
num_merkle_blocks_(num_merkle_blocks) {
- Inode* inode = node_finder->GetNode(node_index);
+ InodePtr inode = node_finder->GetNode(node_index);
ZX_DEBUG_ASSERT(inode != nullptr);
ZX_DEBUG_ASSERT(inode->block_count >= num_merkle_blocks);
const uint32_t num_data_blocks = inode->block_count - num_merkle_blocks;
diff --git a/zircon/system/ulib/blobfs/test/unit/zstd-seekable-blob-test.cc b/zircon/system/ulib/blobfs/test/unit/zstd-seekable-blob-test.cc
index d17b301..8c094b5 100644
--- a/zircon/system/ulib/blobfs/test/unit/zstd-seekable-blob-test.cc
+++ b/zircon/system/ulib/blobfs/test/unit/zstd-seekable-blob-test.cc
@@ -65,8 +65,8 @@
ASSERT_OK(FormatFilesystem(device.get()));
loop_.StartThread();
- ASSERT_OK(Blobfs::Create(loop_.dispatcher(), std::move(device), &options, zx::resource(),
- &fs_));
+ ASSERT_OK(
+ Blobfs::Create(loop_.dispatcher(), std::move(device), &options, zx::resource(), &fs_));
ASSERT_OK(ZSTDSeekableBlobCollection::Create(vmoid_registry(), space_manager(),
transaction_handler(), node_finder(),
&compressed_blob_collection_));
@@ -157,8 +157,8 @@
// Construct BlobFS with non-seekable ZSTD algorithm. This should cause errors in the seekable
// read path.
- ASSERT_OK(Blobfs::Create(loop_.dispatcher(), std::move(device), &options, zx::resource(),
- &fs_));
+ ASSERT_OK(
+ Blobfs::Create(loop_.dispatcher(), std::move(device), &options, zx::resource(), &fs_));
ASSERT_OK(ZSTDSeekableBlobCollection::Create(vmoid_registry(), space_manager(),
transaction_handler(), node_finder(),
@@ -171,7 +171,7 @@
void SetUp() {
// Write uncompressed to test block device-level seek and read.
MountOptions options;
- options.write_uncompressed = true;
+ options.write_compression_algorithm = CompressionAlgorithm::UNCOMPRESSED;
// Use a blob size that will have a "leftover byte" in an extra block to test block read edge
// case.
@@ -184,9 +184,8 @@
// Construct BlobFS with non-seekable ZSTD algorithm. This should cause errors in the seekable
// read path.
- ASSERT_OK(Blobfs::CreateWithWriteCompressionAlgorithm(
- loop_.dispatcher(), std::move(device), &options, CompressionAlgorithm::ZSTD_SEEKABLE,
- zx::resource(), &fs_));
+ ASSERT_OK(
+ Blobfs::Create(loop_.dispatcher(), std::move(device), &options, zx::resource(), &fs_));
ASSERT_OK(ZSTDSeekableBlobCollection::Create(vmoid_registry(), space_manager(),
transaction_handler(), node_finder(),
