diff --git a/Kernel/FileSystem/FATFS/Inode.cpp b/Kernel/FileSystem/FATFS/Inode.cpp index 0dd89ea2103..7f0862e03d6 100644 --- a/Kernel/FileSystem/FATFS/Inode.cpp +++ b/Kernel/FileSystem/FATFS/Inode.cpp @@ -29,21 +29,21 @@ FATInode::FATInode(FATFS& fs, FATEntry entry, FATEntryLocation inode_metadata_lo , m_inode_metadata_location(inode_metadata_location) , m_filename(move(filename)) { - dbgln_if(FAT_DEBUG, "FATFS: Creating inode {} with filename \"{}\"", index(), m_filename); + dbgln_if(FAT_DEBUG, "FATInode[{}]::FATInode(): Creating inode with filename \"{}\"", identifier(), m_filename); } ErrorOr> FATInode::compute_cluster_list(FATFS& fs, u32 first_cluster) { VERIFY(m_inode_lock.is_locked()); - dbgln_if(FAT_DEBUG, "FATFS: computing block list starting with cluster {}", first_cluster); + dbgln_if(FAT_DEBUG, "FATInode::compute_cluster_list(): computing block list starting with cluster {}", first_cluster); u32 cluster = first_cluster; Vector cluster_list; while (cluster < fs.end_of_chain_marker()) { - dbgln_if(FAT_DEBUG, "FATFS: Appending cluster {} to cluster chain starting with {}", cluster, first_cluster); + dbgln_if(FAT_DEBUG, "FATInode::compute_cluster_list(): Appending cluster {} to cluster chain starting with {}", cluster, first_cluster); TRY(cluster_list.try_append(cluster)); @@ -74,14 +74,14 @@ ErrorOr> FATInode::get_block_list() { VERIFY(m_inode_lock.is_locked()); - dbgln_if(FAT_DEBUG, "FATFS: getting block list for inode {}", index()); + dbgln_if(FAT_DEBUG, "FATInode[{}]::get_block_list(): getting block list", identifier()); Vector block_list; for (auto cluster : m_cluster_list) { auto span = fs().first_block_of_cluster(cluster); for (size_t i = 0; i < span.number_of_sectors; i++) { - dbgln_if(FAT_DEBUG, "FATFS: Appending block {} to inode {}'s block list", BlockBasedFileSystem::BlockIndex { span.start_block.value() + i }, index()); + dbgln_if(FAT_DEBUG, "FATInode[{}]::get_block_list(): Appending block {} to block list", identifier(), BlockBasedFileSystem::BlockIndex { span.start_block.value() + i }); TRY(block_list.try_append(BlockBasedFileSystem::BlockIndex { span.start_block.value() + i })); } } @@ -95,7 +95,7 @@ ErrorOr> FATInode::read_block_list() auto block_list = TRY(get_block_list()); - dbgln_if(FAT_DEBUG, "FATFS: reading block list for inode {} ({} blocks)", index(), block_list.size()); + dbgln_if(FAT_DEBUG, "FATInode[{}]::read_block_list(): reading block list ({} blocks)", identifier(), block_list.size()); auto builder = TRY(KBufferBuilder::try_create()); @@ -104,7 +104,7 @@ ErrorOr> FATInode::read_block_list() auto buf = UserOrKernelBuffer::for_kernel_buffer(buffer); for (BlockBasedFileSystem::BlockIndex block : block_list) { - dbgln_if(FAT_DEBUG, "FATFS: reading block: {}", block); + dbgln_if(FAT_DEBUG, "FATInode[{}]::read_block_list(): reading block: {}", identifier(), block); TRY(fs().read_block(block, &buf, sizeof(buffer))); TRY(builder.append((char const*)buffer, fs().m_device_block_size)); } @@ -133,13 +133,13 @@ ErrorOr> FATInode::traverse(Function(RefPtrsize() / sizeof(FATEntry); i++) { auto* entry = reinterpret_cast(blocks->data() + i * sizeof(FATEntry)); if (entry->filename[0] == end_entry_byte) { - dbgln_if(FAT_DEBUG, "FATFS: Found end entry"); + dbgln_if(FAT_DEBUG, "FATInode[{}]::traverse(): Found end entry", identifier()); return nullptr; } else if (static_cast(entry->filename[0]) == unused_entry_byte) { - dbgln_if(FAT_DEBUG, "FATFS: Found unused entry"); + dbgln_if(FAT_DEBUG, "FATInode[{}]::traverse(): Found unused entry", identifier()); lfn_entries.clear(); } else if (entry->attributes == FATAttributes::LongFileName) { - dbgln_if(FAT_DEBUG, "FATFS: Found LFN entry"); + dbgln_if(FAT_DEBUG, "FATInode[{}]::traverse(): Found LFN entry", identifier()); TRY(lfn_entries.try_append(*reinterpret_cast(entry))); } else if ((entry->first_cluster_high << 16 | entry->first_cluster_low) <= 1 && entry->file_size > 0) { // Because clusters 0 and 1 are reserved, only empty files (size == 0 files) @@ -148,7 +148,7 @@ ErrorOr> FATInode::traverse(Function(RefPtr> FATInode::traverse(Function(RefPtr FATInode::read_bytes_locked(off_t offset, size_t size, UserOrKernelBuffer& buffer, OpenFileDescription*) const { - dbgln_if(FAT_DEBUG, "FATFS: Reading inode {}: size: {} offset: {}", identifier().index(), size, offset); + dbgln_if(FAT_DEBUG, "FATInode[{}]::read_bytes_locked(): Reading {} bytes at offset {}", identifier(), size, offset); VERIFY(offset >= 0); if (offset >= m_entry.file_size) return 0;