Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

btrfs

Browse Source 
* Fixed coding style for all files under /src/add-ons/kernel/file_systems/btrfs
* rewrote crc_table.cpp to generate CRCTable.cpp that conforms to coding style.

Change-Id: I90fcc143320c7a7e9a6dc174f0ad82f40bb8a9b6
Reviewed-on: https://review.haiku-os.org/c/1194
Reviewed-by: Jérôme Duval <jerome.duval@gmail.com>
This commit is contained in:
brjhaiku 2019-03-13 16:29:58 +05:30 committed by Jérôme Duval
parent ad38b80fd5
commit f10ebdb1f7
9 changed files with 84 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/add-ons/kernel/file_systems/btrfs/BTree.cpp
View File

@ -57,6 +57,7 @@ BTree::Node::Keep()
fNode = NULL;
}
void
BTree::Node::Unset()
{
@ -96,7 +97,7 @@ status_t
BTree::Node::SearchSlot(const btrfs_key& key, int* slot, btree_traversing type)
const
{
//binary search for item slot in a node
// binary search for item slot in a node
int entrySize = sizeof(btrfs_entry);
if (Level() != 0) {
// internal node
@ -117,7 +118,7 @@ BTree::Node::SearchSlot(const btrfs_key& key, int* slot, btree_traversing type)
low = mid + 1;
else {
*slot = mid;
return B_OK; //if key is in node
return B_OK; // if key is in node
}
}
@ -244,7 +245,7 @@ BTree::Node::Copy(const Node* origin, uint32 start, uint32 end, int length)
length = -origin->_CalculateSpace(0, start - 1, 2);
_Copy(origin, 0, start, end, length);
} else if (length < 0) {
//removing all items in [start, end]
// removing all items in [start, end]
if (start > 0)
_Copy(origin, 0, 0, start - 1, 0); // <-- [start,...
if (end + 1 < origin->ItemCount()) {
@ -254,7 +255,7 @@ BTree::Node::Copy(const Node* origin, uint32 start, uint32 end, int length)
_Copy(origin, start, end + 1, origin->ItemCount() - 1, length);
}
} else {
//inserting in [start, end] - make a hole for later
// inserting in [start, end] - make a hole for later
if (start > 0)
_Copy(origin, 0, 0, start - 1, 0);
if (start < origin->ItemCount()) {

2
src/add-ons/kernel/file_systems/btrfs/BTree.h
View File

@ -165,7 +165,7 @@ public:
private:
Node(const Node&);
Node& operator=(const Node&);
//no implementation
// no implementation
void _Copy(const Node* origin, uint32 at, uint32 from, uint32 to,
int length) const;

75
src/add-ons/kernel/file_systems/btrfs/CRCTable.cpp
View File

@ -12,38 +12,49 @@
//! CRC 03667067501 table, as generated by crc_table.cpp
static uint32 kCrcTable[256] = {
0x00000000, 0xf26b8303, 0xe13b70f7, 0x1350f3f4, 0xc79a971f, 0x35f1141c, 0x26a1e7e8, 0xd4ca64eb,
0x8ad958cf, 0x78b2dbcc, 0x6be22838, 0x9989ab3b, 0x4d43cfd0, 0xbf284cd3, 0xac78bf27, 0x5e133c24,
0x105ec76f, 0xe235446c, 0xf165b798, 0x030e349b, 0xd7c45070, 0x25afd373, 0x36ff2087, 0xc494a384,
0x9a879fa0, 0x68ec1ca3, 0x7bbcef57, 0x89d76c54, 0x5d1d08bf, 0xaf768bbc, 0xbc267848, 0x4e4dfb4b,
0x20bd8ede, 0xd2d60ddd, 0xc186fe29, 0x33ed7d2a, 0xe72719c1, 0x154c9ac2, 0x061c6936, 0xf477ea35,
0xaa64d611, 0x580f5512, 0x4b5fa6e6, 0xb93425e5, 0x6dfe410e, 0x9f95c20d, 0x8cc531f9, 0x7eaeb2fa,
0x30e349b1, 0xc288cab2, 0xd1d83946, 0x23b3ba45, 0xf779deae, 0x05125dad, 0x1642ae59, 0xe4292d5a,
0xba3a117e, 0x4851927d, 0x5b016189, 0xa96ae28a, 0x7da08661, 0x8fcb0562, 0x9c9bf696, 0x6ef07595,
0x417b1dbc, 0xb3109ebf, 0xa0406d4b, 0x522bee48, 0x86e18aa3, 0x748a09a0, 0x67dafa54, 0x95b17957,
0xcba24573, 0x39c9c670, 0x2a993584, 0xd8f2b687, 0x0c38d26c, 0xfe53516f, 0xed03a29b, 0x1f682198,
0x5125dad3, 0xa34e59d0, 0xb01eaa24, 0x42752927, 0x96bf4dcc, 0x64d4cecf, 0x77843d3b, 0x85efbe38,
0xdbfc821c, 0x2997011f, 0x3ac7f2eb, 0xc8ac71e8, 0x1c661503, 0xee0d9600, 0xfd5d65f4, 0x0f36e6f7,
0x61c69362, 0x93ad1061, 0x80fde395, 0x72966096, 0xa65c047d, 0x5437877e, 0x4767748a, 0xb50cf789,
0xeb1fcbad, 0x197448ae, 0x0a24bb5a, 0xf84f3859, 0x2c855cb2, 0xdeeedfb1, 0xcdbe2c45, 0x3fd5af46,
0x7198540d, 0x83f3d70e, 0x90a324fa, 0x62c8a7f9, 0xb602c312, 0x44694011, 0x5739b3e5, 0xa55230e6,
0xfb410cc2, 0x092a8fc1, 0x1a7a7c35, 0xe811ff36, 0x3cdb9bdd, 0xceb018de, 0xdde0eb2a, 0x2f8b6829,
0x82f63b78, 0x709db87b, 0x63cd4b8f, 0x91a6c88c, 0x456cac67, 0xb7072f64, 0xa457dc90, 0x563c5f93,
0x082f63b7, 0xfa44e0b4, 0xe9141340, 0x1b7f9043, 0xcfb5f4a8, 0x3dde77ab, 0x2e8e845f, 0xdce5075c,
0x92a8fc17, 0x60c37f14, 0x73938ce0, 0x81f80fe3, 0x55326b08, 0xa759e80b, 0xb4091bff, 0x466298fc,
0x1871a4d8, 0xea1a27db, 0xf94ad42f, 0x0b21572c, 0xdfeb33c7, 0x2d80b0c4, 0x3ed04330, 0xccbbc033,
0xa24bb5a6, 0x502036a5, 0x4370c551, 0xb11b4652, 0x65d122b9, 0x97baa1ba, 0x84ea524e, 0x7681d14d,
0x2892ed69, 0xdaf96e6a, 0xc9a99d9e, 0x3bc21e9d, 0xef087a76, 0x1d63f975, 0x0e330a81, 0xfc588982,
0xb21572c9, 0x407ef1ca, 0x532e023e, 0xa145813d, 0x758fe5d6, 0x87e466d5, 0x94b49521, 0x66df1622,
0x38cc2a06, 0xcaa7a905, 0xd9f75af1, 0x2b9cd9f2, 0xff56bd19, 0x0d3d3e1a, 0x1e6dcdee, 0xec064eed,
0xc38d26c4, 0x31e6a5c7, 0x22b65633, 0xd0ddd530, 0x0417b1db, 0xf67c32d8, 0xe52cc12c, 0x1747422f,
0x49547e0b, 0xbb3ffd08, 0xa86f0efc, 0x5a048dff, 0x8ecee914, 0x7ca56a17, 0x6ff599e3, 0x9d9e1ae0,
0xd3d3e1ab, 0x21b862a8, 0x32e8915c, 0xc083125f, 0x144976b4, 0xe622f5b7, 0xf5720643, 0x07198540,
0x590ab964, 0xab613a67, 0xb831c993, 0x4a5a4a90, 0x9e902e7b, 0x6cfbad78, 0x7fab5e8c, 0x8dc0dd8f,
0xe330a81a, 0x115b2b19, 0x020bd8ed, 0xf0605bee, 0x24aa3f05, 0xd6c1bc06, 0xc5914ff2, 0x37faccf1,
0x69e9f0d5, 0x9b8273d6, 0x88d28022, 0x7ab90321, 0xae7367ca, 0x5c18e4c9, 0x4f48173d, 0xbd23943e,
0xf36e6f75, 0x0105ec76, 0x12551f82, 0xe03e9c81, 0x34f4f86a, 0xc69f7b69, 0xd5cf889d, 0x27a40b9e,
0x79b737ba, 0x8bdcb4b9, 0x988c474d, 0x6ae7c44e, 0xbe2da0a5, 0x4c4623a6, 0x5f16d052, 0xad7d5351
0x00000000, 0xf26b8303, 0xe13b70f7, 0x1350f3f4, 0xc79a971f, 0x35f1141c,
0x26a1e7e8, 0xd4ca64eb, 0x8ad958cf, 0x78b2dbcc, 0x6be22838, 0x9989ab3b,
0x4d43cfd0, 0xbf284cd3, 0xac78bf27, 0x5e133c24, 0x105ec76f, 0xe235446c,
0xf165b798, 0x030e349b, 0xd7c45070, 0x25afd373, 0x36ff2087, 0xc494a384,
0x9a879fa0, 0x68ec1ca3, 0x7bbcef57, 0x89d76c54, 0x5d1d08bf, 0xaf768bbc,
0xbc267848, 0x4e4dfb4b, 0x20bd8ede, 0xd2d60ddd, 0xc186fe29, 0x33ed7d2a,
0xe72719c1, 0x154c9ac2, 0x061c6936, 0xf477ea35, 0xaa64d611, 0x580f5512,
0x4b5fa6e6, 0xb93425e5, 0x6dfe410e, 0x9f95c20d, 0x8cc531f9, 0x7eaeb2fa,
0x30e349b1, 0xc288cab2, 0xd1d83946, 0x23b3ba45, 0xf779deae, 0x05125dad,
0x1642ae59, 0xe4292d5a, 0xba3a117e, 0x4851927d, 0x5b016189, 0xa96ae28a,
0x7da08661, 0x8fcb0562, 0x9c9bf696, 0x6ef07595, 0x417b1dbc, 0xb3109ebf,
0xa0406d4b, 0x522bee48, 0x86e18aa3, 0x748a09a0, 0x67dafa54, 0x95b17957,
0xcba24573, 0x39c9c670, 0x2a993584, 0xd8f2b687, 0x0c38d26c, 0xfe53516f,
0xed03a29b, 0x1f682198, 0x5125dad3, 0xa34e59d0, 0xb01eaa24, 0x42752927,
0x96bf4dcc, 0x64d4cecf, 0x77843d3b, 0x85efbe38, 0xdbfc821c, 0x2997011f,
0x3ac7f2eb, 0xc8ac71e8, 0x1c661503, 0xee0d9600, 0xfd5d65f4, 0x0f36e6f7,
0x61c69362, 0x93ad1061, 0x80fde395, 0x72966096, 0xa65c047d, 0x5437877e,
0x4767748a, 0xb50cf789, 0xeb1fcbad, 0x197448ae, 0x0a24bb5a, 0xf84f3859,
0x2c855cb2, 0xdeeedfb1, 0xcdbe2c45, 0x3fd5af46, 0x7198540d, 0x83f3d70e,
0x90a324fa, 0x62c8a7f9, 0xb602c312, 0x44694011, 0x5739b3e5, 0xa55230e6,
0xfb410cc2, 0x092a8fc1, 0x1a7a7c35, 0xe811ff36, 0x3cdb9bdd, 0xceb018de,
0xdde0eb2a, 0x2f8b6829, 0x82f63b78, 0x709db87b, 0x63cd4b8f, 0x91a6c88c,
0x456cac67, 0xb7072f64, 0xa457dc90, 0x563c5f93, 0x082f63b7, 0xfa44e0b4,
0xe9141340, 0x1b7f9043, 0xcfb5f4a8, 0x3dde77ab, 0x2e8e845f, 0xdce5075c,
0x92a8fc17, 0x60c37f14, 0x73938ce0, 0x81f80fe3, 0x55326b08, 0xa759e80b,
0xb4091bff, 0x466298fc, 0x1871a4d8, 0xea1a27db, 0xf94ad42f, 0x0b21572c,
0xdfeb33c7, 0x2d80b0c4, 0x3ed04330, 0xccbbc033, 0xa24bb5a6, 0x502036a5,
0x4370c551, 0xb11b4652, 0x65d122b9, 0x97baa1ba, 0x84ea524e, 0x7681d14d,
0x2892ed69, 0xdaf96e6a, 0xc9a99d9e, 0x3bc21e9d, 0xef087a76, 0x1d63f975,
0x0e330a81, 0xfc588982, 0xb21572c9, 0x407ef1ca, 0x532e023e, 0xa145813d,
0x758fe5d6, 0x87e466d5, 0x94b49521, 0x66df1622, 0x38cc2a06, 0xcaa7a905,
0xd9f75af1, 0x2b9cd9f2, 0xff56bd19, 0x0d3d3e1a, 0x1e6dcdee, 0xec064eed,
0xc38d26c4, 0x31e6a5c7, 0x22b65633, 0xd0ddd530, 0x0417b1db, 0xf67c32d8,
0xe52cc12c, 0x1747422f, 0x49547e0b, 0xbb3ffd08, 0xa86f0efc, 0x5a048dff,
0x8ecee914, 0x7ca56a17, 0x6ff599e3, 0x9d9e1ae0, 0xd3d3e1ab, 0x21b862a8,
0x32e8915c, 0xc083125f, 0x144976b4, 0xe622f5b7, 0xf5720643, 0x07198540,
0x590ab964, 0xab613a67, 0xb831c993, 0x4a5a4a90, 0x9e902e7b, 0x6cfbad78,
0x7fab5e8c, 0x8dc0dd8f, 0xe330a81a, 0x115b2b19, 0x020bd8ed, 0xf0605bee,
0x24aa3f05, 0xd6c1bc06, 0xc5914ff2, 0x37faccf1, 0x69e9f0d5, 0x9b8273d6,
0x88d28022, 0x7ab90321, 0xae7367ca, 0x5c18e4c9, 0x4f48173d, 0xbd23943e,
0xf36e6f75, 0x0105ec76, 0x12551f82, 0xe03e9c81, 0x34f4f86a, 0xc69f7b69,
0xd5cf889d, 0x27a40b9e, 0x79b737ba, 0x8bdcb4b9, 0x988c474d, 0x6ae7c44e,
0xbe2da0a5, 0x4c4623a6, 0x5f16d052, 0xad7d5351
};

4
src/add-ons/kernel/file_systems/btrfs/ExtentAllocator.cpp
View File

@ -610,8 +610,8 @@ status_t
ExtentAllocator::_Allocate(uint64& found, uint64 start, uint64 size,
uint64 type)
{
TRACE("ExtentAllocator::_Allocate() start %" B_PRIu64 " size %" B_PRIu64 " type %"
B_PRIu64 "\n", start, size, type);
TRACE("ExtentAllocator::_Allocate() start %" B_PRIu64 " size %" B_PRIu64
" type %" B_PRIu64 "\n", start, size, type);
CachedExtent* chosen;
status_t status;
while (true) {

2
src/add-ons/kernel/file_systems/btrfs/ExtentAllocator.h
View File

@ -69,7 +69,7 @@ struct TreeDefinition {
int Compare(const Value* a, const Value* b) const
{
int comp = Compare(a->offset, b);
//TODO: check more conditions here if necessary
// TODO: check more conditions here if necessary
return comp;
}
};

2
src/add-ons/kernel/file_systems/btrfs/Journal.cpp
View File

@ -50,7 +50,7 @@ Journal::_TransactionDone(bool success)
}
cache_end_transaction(fVolume->BlockCache(), fTransactionID,
&_TransactionWritten, this);
//cache_sync_transaction(fVolume->BlockCache(), fTransactionID);
// cache_sync_transaction(fVolume->BlockCache(), fTransactionID);
return B_OK;
}

2
src/add-ons/kernel/file_systems/btrfs/btrfs.h
View File

@ -81,7 +81,7 @@ struct btrfs_key {
void SetType(uint8 key_type) { type = key_type; }
void SetOffset(uint64 off) { offset = B_HOST_TO_LENDIAN_INT64(off); }
int32 Compare(const btrfs_key& key) const;
//implemented in BTree.cpp
// implemented in BTree.cpp
} _PACKED;

49
src/add-ons/kernel/file_systems/btrfs/crc_table.cpp
View File

@ -1,20 +1,21 @@
//----------------------------------------------------------------------
// This software is part of the OpenBeOS distribution and is covered
// by the MIT License.
//
// Copyright (c) 2003 Tyler Dauwalder, tyler@dauwalder.net
//---------------------------------------------------------------------
/*
* This software is part of the OpenBeOS distribution and is covered
* by the MIT License.
*
* Copyright (c) 2003 Tyler Dauwalder, tyler@dauwalder.net
*/
/*! \file crc_table.cpp
/* file crc_table.cpp
*
* Standalone program to generate the CRC table used for calculating
* UDF tag id CRC values.
*
* This code based off of crc code in UDF-2.50 specs, as permitted.
* See UDF-2.50 6.5 for more information.
*
* Reflected version by Jéme Duval
*/
Standalone program to generate the CRC table used for calculating
UDF tag id CRC values.
This code based off of crc code in UDF-2.50 specs, as permitted.
See UDF-2.50 6.5 for more information.
Reflected version by Jéme Duval
*/
#include "system_dependencies.h"
@ -22,12 +23,13 @@
typedef unsigned int uint32 ;
uint32
reflect32 (uint32 b)
{
uint32 rw = 0;
for (int i = 0; i < 32; i++){
for (int i = 0; i < 32; i++) {
if (b & 1)
rw |= 1 << (31 - i);
b >>= 1;
@ -44,14 +46,10 @@ main(int argc, char* argv[]) {
fprintf(stderr, "USAGE: crc_table <octal polynomial=3667067501 for btrfs>\n");
return 0;
}
sscanf(argv[1], "%lo", &poly);
printf("//! CRC 0%o table, as generated by crc_table.cpp\n", poly);
printf("static uint32 crc_table[256] = { \n");
printf("static uint32 kCrcTable[256] = {\n\t");
for (int n = 0; n < 256; n++) {
if (n % 8 == 0)
printf(" ");
crc = reflect32(n);
for (int i = 0; i < 8; i++) {
if (crc & 0x80000000)
@ -60,10 +58,11 @@ main(int argc, char* argv[]) {
crc <<= 1;
}
crc = reflect32(crc);
printf("0x%08x%s ", crc, (n != 255 ? "," : ""));
if (n % 8 == 7)
printf("\n");
printf("0x%08x%s%s", crc, (n != 255 ? "," : ""), (n % 6 != 5 ? " " : ""));
if (n % 6 == 5)
printf("\n\t");
}
printf("};\n");
printf("\n};\n");
return 0;
}

10
src/add-ons/kernel/file_systems/btrfs/kernel_interface.cpp
View File

@ -251,7 +251,8 @@ btrfs_read_pages(fs_volume* _volume, fs_vnode* _node, void* _cookie,
static status_t
btrfs_io(fs_volume* _volume, fs_vnode* _node, void* _cookie, io_request* request)
btrfs_io(fs_volume* _volume, fs_vnode* _node, void* _cookie,
io_request* request)
{
Volume* volume = (Volume*)_volume->private_volume;
Inode* inode = (Inode*)_node->private_node;
@ -647,7 +648,8 @@ btrfs_rewind_dir(fs_volume* /*_volume*/, fs_vnode* /*node*/, void* _cookie)
static status_t
btrfs_close_dir(fs_volume * /*_volume*/, fs_vnode * /*node*/, void * /*_cookie*/)
btrfs_close_dir(fs_volume * /*_volume*/, fs_vnode * /*node*/,
void * /*_cookie*/)
{
return B_OK;
}
@ -701,8 +703,7 @@ btrfs_free_attr_dir_cookie(fs_volume* _volume, fs_vnode* _node, void* _cookie)
static status_t
btrfs_read_attr_dir(fs_volume* _volume, fs_vnode* _node,
void* _cookie, struct dirent* dirent, size_t bufferSize,
uint32* _num)
void* _cookie, struct dirent* dirent, size_t bufferSize, uint32* _num)
{
TRACE("%s()\n", __FUNCTION__);
AttributeIterator* iterator = (AttributeIterator*)_cookie;
@ -832,6 +833,7 @@ btrfs_remove_attr(fs_volume* _volume, fs_vnode* vnode,
return EROFS;
}
// #pragma mark -