KolibriOS/kolibrios
12
4
Fork 11
Code Issues 78 Pull Requests 5 Projects Releases Activity

[xfs] Fix lookup of v5 dirs

Browse Source 
git-svn-id: svn://kolibrios.org@10007 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Ivan Baravy 2024-04-01 02:38:53 +00:00
parent 6c4f535ed8
commit 31193af81e
2 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
kernel/trunk/fs/xfs.asm
View File

@ -180,6 +180,8 @@ proc xfs_create_partition uses ebx esi edi
mov [edi+XFS.dir_leafn_magic], XFS_DIR2_LEAFN_MAGIC mov [edi+XFS.dir_leafn_magic], XFS_DIR2_LEAFN_MAGIC
mov [edi+XFS.da_node_magic], XFS_DA_NODE_MAGIC mov [edi+XFS.da_node_magic], XFS_DA_NODE_MAGIC
mov [edi+XFS.bmap_magic], XFS_BMAP_MAGIC mov [edi+XFS.bmap_magic], XFS_BMAP_MAGIC
mov [edi+XFS.dirx_leaf_ents_offset], xfs_dir2_leaf.ents
mov [edi+XFS.dirx_leaf_hdr_count_offset], xfs_dir2_leaf_hdr.count
mov [edi+XFS.dir_block_size], sizeof.xfs_dir2_data_hdr mov [edi+XFS.dir_block_size], sizeof.xfs_dir2_data_hdr
mov [edi+XFS.bmbt_block_size], sizeof.xfs_bmbt_block mov [edi+XFS.bmbt_block_size], sizeof.xfs_bmbt_block
mov [edi+XFS.da_blkinfo_size], sizeof.xfs_da_blkinfo mov [edi+XFS.da_blkinfo_size], sizeof.xfs_da_blkinfo
@ -198,6 +200,8 @@ proc xfs_create_partition uses ebx esi edi
mov [edi+XFS.dir_leafn_magic], XFS_DIR3_LEAFN_MAGIC mov [edi+XFS.dir_leafn_magic], XFS_DIR3_LEAFN_MAGIC
mov [edi+XFS.da_node_magic], XFS_DA3_NODE_MAGIC mov [edi+XFS.da_node_magic], XFS_DA3_NODE_MAGIC
mov [edi+XFS.bmap_magic], XFS_BMAP3_MAGIC mov [edi+XFS.bmap_magic], XFS_BMAP3_MAGIC
mov [edi+XFS.dirx_leaf_ents_offset], xfs_dir3_leaf.ents
mov [edi+XFS.dirx_leaf_hdr_count_offset], xfs_dir3_leaf_hdr.count
mov [edi+XFS.dir_block_size], sizeof.xfs_dir3_data_hdr mov [edi+XFS.dir_block_size], sizeof.xfs_dir3_data_hdr
mov [edi+XFS.bmbt_block_size], sizeof.xfs_bmbt3_block mov [edi+XFS.bmbt_block_size], sizeof.xfs_bmbt3_block
mov [edi+XFS.da_blkinfo_size], sizeof.xfs_da3_blkinfo mov [edi+XFS.da_blkinfo_size], sizeof.xfs_da3_blkinfo
@ -1012,7 +1016,8 @@ proc xfs._.lookup_block uses esi, _name, _len
mov eax, ebx mov eax, ebx
mov ebx, [ebp+XFS.cur_dirblock] mov ebx, [ebp+XFS.cur_dirblock]
stdcall xfs._.extent_unpack, eax stdcall xfs._.extent_unpack, eax
stdcall xfs._.read_dirblock, [ebp+XFS.extent.br_startblock.lo], [ebp+XFS.extent.br_startblock.hi], ebx stdcall xfs._.read_dirblock, [ebp+XFS.extent.br_startblock.lo], \
[ebp+XFS.extent.br_startblock.hi], ebx
jnz .error jnz .error
mov eax, [ebp+XFS.dir_block_magic] mov eax, [ebp+XFS.dir_block_magic]
cmp [ebx+xfs_dir2_block.hdr.magic], eax cmp [ebx+xfs_dir2_block.hdr.magic], eax
@ -1097,7 +1102,8 @@ proc xfs._.lookup_leaf uses ebx esi edi, _name, _len
mov eax, [ebp+XFS.dir2_leaf_offset_blocks.hi] mov eax, [ebp+XFS.dir2_leaf_offset_blocks.hi]
mov [ebp+XFS.offset_begin.hi], ecx mov [ebp+XFS.offset_begin.hi], ecx
stdcall xfs._.extent_list.seek, ecx stdcall xfs._.extent_list.seek, ecx
stdcall xfs._.read_dirblock, [ebp+XFS.extent.br_startblock.lo], [ebp+XFS.extent.br_startblock.hi], [ebp+XFS.cur_dirblock] stdcall xfs._.read_dirblock, [ebp+XFS.extent.br_startblock.lo], \
[ebp+XFS.extent.br_startblock.hi], [ebp+XFS.cur_dirblock]
jnz .error jnz .error
mov ebx, [ebp+XFS.cur_dirblock] mov ebx, [ebp+XFS.cur_dirblock]
movzx eax, [ebp+XFS.dir_leaf1_magic] movzx eax, [ebp+XFS.dir_leaf1_magic]
@ -1228,24 +1234,29 @@ endl
add ebx, [ebp+XFS.inode_core_size] add ebx, [ebp+XFS.inode_core_size]
stdcall xfs._.btree_read_block, ebx, ecx, eax, edx, [ebp+XFS.cur_dirblock] stdcall xfs._.btree_read_block, ebx, ecx, eax, edx, [ebp+XFS.cur_dirblock]
mov ebx, [ebp+XFS.cur_dirblock] mov ebx, [ebp+XFS.cur_dirblock]
cmp [ebx+xfs_da_intnode.hdr.info.magic], XFS_DA_NODE_MAGIC movzx eax, [ebp+XFS.da_node_magic]
cmp [ebx+xfs_da_blkinfo.magic], ax
jz .next_level jz .next_level
cmp [ebx+xfs_dir2_leaf.hdr.info.magic], XFS_DIR2_LEAFN_MAGIC movzx eax, [ebp+XFS.dir_leafn_magic]
cmp [ebx+xfs_da_blkinfo.magic], ax
jz .leafn jz .leafn
cmp [ebx+xfs_dir2_leaf.hdr.info.magic], XFS_DIR2_LEAF1_MAGIC movzx eax, [ebp+XFS.dir_leaf1_magic]
cmp [ebx+xfs_da_blkinfo.magic], ax
jnz .error jnz .error
mov eax, [.hash] mov eax, [.hash]
movzx ecx, [ebx+xfs_dir2_leaf.hdr.count] mov ecx, [ebp+XFS.dirx_leaf_hdr_count_offset]
movzx ecx, word[ebx+ecx]
xchg cl, ch xchg cl, ch
add ebx, xfs_dir2_leaf.ents add ebx, [ebp+XFS.dirx_leaf_ents_offset]
stdcall xfs._.get_addr_by_hash, ebx, ecx stdcall xfs._.get_addr_by_hash, ebx, ecx
jnz .error jnz .error
mov ebx, [ebp+XFS.cur_dirblock] mov ebx, [ebp+XFS.cur_dirblock]
jmp .got_addr jmp .got_addr
.leafn: .leafn:
movzx ecx, [ebx+xfs_dir2_leaf.hdr.count] mov ecx, [ebp+XFS.dirx_leaf_hdr_count_offset]
movzx ecx, word[ebx+ecx]
xchg cl, ch xchg cl, ch
add ebx, xfs_dir2_leaf.ents add ebx, [ebp+XFS.dirx_leaf_ents_offset]
mov eax, [.hash] mov eax, [.hash]
stdcall xfs._.get_addr_by_hash, ebx, ecx stdcall xfs._.get_addr_by_hash, ebx, ecx
jnz .error jnz .error
@ -2028,7 +2039,8 @@ proc xfs._.btree_read_block uses ebx esi edi, _tree, _size, _block_lo, _block_hi
mov eax, [_block_hi] mov eax, [_block_hi]
mov [ebp+XFS.offset_begin.hi], eax mov [ebp+XFS.offset_begin.hi], eax
stdcall xfs._.extent_list.seek, ecx stdcall xfs._.extent_list.seek, ecx
stdcall xfs._.read_dirblock, [ebp+XFS.extent.br_startblock.lo], [ebp+XFS.extent.br_startblock.hi], [_buf] stdcall xfs._.read_dirblock, [ebp+XFS.extent.br_startblock.lo], \
[ebp+XFS.extent.br_startblock.hi], [_buf]
.error: .error:
.quit: .quit:
ret ret

2
kernel/trunk/fs/xfs.inc
View File

@ -517,6 +517,8 @@ struct XFS PARTITION
dir_leafn_magic dw ? dir_leafn_magic dw ?
da_node_magic dw ? da_node_magic dw ?
bmap_magic dd ? bmap_magic dd ?
dirx_leaf_ents_offset dd ?
dirx_leaf_hdr_count_offset dd ?
bmbt_block_size dd ? bmbt_block_size dd ?
dir_block_size dd ? dir_block_size dd ?
dir_data_size dd ? dir_data_size dd ?