i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BTRFS: Add some missing constants

Browse Source 
Chunk tree objectID is 3,
256 is the objectID of first created subvolume in fs tree,
    and also of first chunk tree (item in chunk tree).

Signed-off-by: Adrien Destugues <[email protected]>
This commit is contained in:
hyche
2017-07-24 12:25:37 +02:00
committed by Adrien Destugues
parent 1481c49cd1
commit bd2dab1c73
2 changed files with 26 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/file_systems/btrfs/Volume.cpp
+2 -2
View File
@@ -389,7 +389,7 @@ Volume::Mount(const char* deviceName, uint32 flags)
return B_NO_MEMORY; return B_NO_MEMORY;
// ready // ready
status = get_vnode(fFSVolume, BTRFS_OBJECT_ID_CHUNK_TREE, status = get_vnode(fFSVolume, BTRFS_FIRST_SUBVOLUME,
(void**)&fRootNode); (void**)&fRootNode);
if (status != B_OK) { if (status != B_OK) {
ERROR("could not create root node: get_vnode() failed!\n"); ERROR("could not create root node: get_vnode() failed!\n");
@@ -492,7 +492,7 @@ Volume::FindBlock(off_t logical, off_t& physical)
btrfs_key search_key; btrfs_key search_key;
search_key.SetOffset(logical); search_key.SetOffset(logical);
search_key.SetType(BTRFS_KEY_TYPE_CHUNK_ITEM); search_key.SetType(BTRFS_KEY_TYPE_CHUNK_ITEM);
search_key.SetObjectID(BTRFS_OBJECT_ID_CHUNK_TREE); search_key.SetObjectID(BTRFS_OBJECT_ID_FIRST_CHUNK_TREE);
btrfs_chunk* chunk; btrfs_chunk* chunk;
size_t chunk_length; size_t chunk_length;
status_t status = fChunkTree->FindPrevious(search_key, (void**)&chunk, status_t status = fChunkTree->FindPrevious(search_key, (void**)&chunk,
src/add-ons/kernel/file_systems/btrfs/btrfs.h
+3 -1
View File
@@ -304,14 +304,16 @@ struct btrfs_extent_data {
#define BTRFS_SUPER_BLOCK_MAGIC "_BHRfS_M" #define BTRFS_SUPER_BLOCK_MAGIC "_BHRfS_M"
#define BTRFS_FIRST_SUBVOLUME 256
#define BTRFS_OBJECT_ID_ROOT_TREE 1 #define BTRFS_OBJECT_ID_ROOT_TREE 1
#define BTRFS_OBJECT_ID_EXTENT_TREE 2 #define BTRFS_OBJECT_ID_EXTENT_TREE 2
#define BTRFS_OBJECT_ID_CHUNK_TREE 3
#define BTRFS_OBJECT_ID_DEV_TREE 4 #define BTRFS_OBJECT_ID_DEV_TREE 4
#define BTRFS_OBJECT_ID_FS_TREE 5 #define BTRFS_OBJECT_ID_FS_TREE 5
#define BTRFS_OBJECT_ID_ROOT_TREE_DIR 6 #define BTRFS_OBJECT_ID_ROOT_TREE_DIR 6
#define BTRFS_OBJECT_ID_CHECKSUM_TREE 7 #define BTRFS_OBJECT_ID_CHECKSUM_TREE 7
#define BTRFS_OBJECT_ID_CHUNK_TREE 256 #define BTRFS_OBJECT_ID_FIRST_CHUNK_TREE 256
#define BTRFS_KEY_TYPE_CHUNK_ITEM 228 #define BTRFS_KEY_TYPE_CHUNK_ITEM 228
#define BTRFS_KEY_TYPE_DIR_ITEM 84 #define BTRFS_KEY_TYPE_DIR_ITEM 84