From 5fb44dff84ebd514be162d3bd37c46cf1eb58dea Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Sat, 26 Oct 2019 17:48:11 -0400 Subject: [PATCH] Revert "btrfs: update superblock checksum on write" This reverts commit caf05af5dd9364af5fc808921f8b0c3a43736aaf. --- src/add-ons/kernel/file_systems/btrfs/CRCTable.cpp | 2 +- src/add-ons/kernel/file_systems/btrfs/Volume.cpp | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/add-ons/kernel/file_systems/btrfs/CRCTable.cpp b/src/add-ons/kernel/file_systems/btrfs/CRCTable.cpp index 7c3e42b380..3b16ecdba3 100644 --- a/src/add-ons/kernel/file_systems/btrfs/CRCTable.cpp +++ b/src/add-ons/kernel/file_systems/btrfs/CRCTable.cpp @@ -66,7 +66,7 @@ static uint32 kCrcTable[256] = { \param data Pointer to the byte stream. \param length Length of the byte stream in bytes. - \return The crc checksum. + \return The crc checksum, or 0 if an error occurred. */ uint32 calculate_crc(uint32 crc, uint8* data, uint16 length) diff --git a/src/add-ons/kernel/file_systems/btrfs/Volume.cpp b/src/add-ons/kernel/file_systems/btrfs/Volume.cpp index e3bead5c23..311a001c51 100644 --- a/src/add-ons/kernel/file_systems/btrfs/Volume.cpp +++ b/src/add-ons/kernel/file_systems/btrfs/Volume.cpp @@ -656,9 +656,7 @@ Volume::FindBlock(off_t logical, off_t& physical) status_t Volume::WriteSuperBlock() { - fSuperBlock.checksum = calculate_crc((uint32)~1, - (uint8 *)(*(&fSuperBlock + sizeof(fSuperBlock.checksum))), - sizeof(fSuperBlock) - sizeof(fSuperBlock.checksum)); + // TODO(lesderid): Calculate checksum if (write_pos(fDevice, BTRFS_SUPER_BLOCK_OFFSET, &fSuperBlock, sizeof(btrfs_super_block))