Burer/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

[xfs] Support XFS nrext64 feature bit

Browse Source 
This feature is _not_ enabled by default by mkfs.xfs at the moment.
That said, make KolibriOS ready for the future. By the way, fix two
bugs in support of XFSv5 disk format.

git-svn-id: svn://kolibrios.org@9889 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Ivan Baravy 2023-01-02 00:55:53 +00:00
parent df7f78788c
commit 06d05066a3
2 changed files with 56 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -162,6 +162,7 @@ proc xfs_create_partition uses ebx esi edi
mov [edi+XFS.version], eax mov [edi+XFS.version], eax
mov [edi+XFS.conv_time_to_kos_epoch], xfs._.conv_time_to_kos_epoch mov [edi+XFS.conv_time_to_kos_epoch], xfs._.conv_time_to_kos_epoch
mov [edi+XFS.nextents_offset], xfs_inode.di_core.di_nextents
movbe eax, [ebx+xfs_sb.sb_features2] movbe eax, [ebx+xfs_sb.sb_features2]
mov [edi+XFS.features2], eax mov [edi+XFS.features2], eax
@ -203,6 +204,10 @@ proc xfs_create_partition uses ebx esi edi
test [edi+XFS.features_incompat], XFS_SB_FEAT_INCOMPAT_BIGTIME test [edi+XFS.features_incompat], XFS_SB_FEAT_INCOMPAT_BIGTIME
jz @f ; no bigtime jz @f ; no bigtime
mov [edi+XFS.conv_time_to_kos_epoch], xfs._.conv_bigtime_to_kos_epoch mov [edi+XFS.conv_time_to_kos_epoch], xfs._.conv_bigtime_to_kos_epoch
@@:
test [edi+XFS.features_incompat], XFS_SB_FEAT_INCOMPAT_NREXT64
jz @f ; no bigtime
mov [edi+XFS.nextents_offset], xfs_inode.di_core.di_big_nextents.lo_be
@@: @@:
.vcommon: .vcommon:
@ -305,7 +310,6 @@ proc xfs_create_partition uses ebx esi edi
; we do need XFS.blocksize bytes for single inode ; we do need XFS.blocksize bytes for single inode
; minimal file system structure is block, inodes are packed in blocks ; minimal file system structure is block, inodes are packed in blocks
; FIXME
mov eax, [edi+XFS.blocksize] mov eax, [edi+XFS.blocksize]
call malloc call malloc
mov [edi+XFS.cur_inode], eax mov [edi+XFS.cur_inode], eax
@ -675,7 +679,8 @@ proc xfs._.readdir_leaf_node uses esi, _inode_data, _out_buf
mov [ebp+XFS.entries_read], 0 mov [ebp+XFS.entries_read], 0
mov eax, ebx mov eax, ebx
add eax, [ebp+XFS.inode_core_size] add eax, [ebp+XFS.inode_core_size]
movbe edx, [ebx+xfs_inode.di_core.di_nextents] mov edx, [ebp+XFS.nextents_offset]
movbe edx, [ebx+edx]
mov ecx, [ebp+XFS.dir2_leaf_offset_blocks.lo] mov ecx, [ebp+XFS.dir2_leaf_offset_blocks.lo]
mov [ebp+XFS.offset_begin.lo], ecx mov [ebp+XFS.offset_begin.lo], ecx
mov ecx, [ebp+XFS.dir2_leaf_offset_blocks.hi] mov ecx, [ebp+XFS.dir2_leaf_offset_blocks.hi]
@ -692,7 +697,8 @@ proc xfs._.readdir_leaf_node uses esi, _inode_data, _out_buf
mov [ebp+XFS.entries_left_in_dir], eax mov [ebp+XFS.entries_left_in_dir], eax
add [_out_buf], sizeof.bdfe_hdr add [_out_buf], sizeof.bdfe_hdr
mov [ebp+XFS.entries_read], 0 mov [ebp+XFS.entries_read], 0
movbe edx, [ebx+xfs_inode.di_core.di_nextents] mov edx, [ebp+XFS.nextents_offset]
movbe edx, [ebx+edx]
mov eax, ebx mov eax, ebx
add eax, [ebp+XFS.inode_core_size] add eax, [ebp+XFS.inode_core_size]
lea ecx, [_out_buf] lea ecx, [_out_buf]
@ -775,7 +781,6 @@ proc xfs._.dir_btree_skip_read uses ebx ecx edx esi edi, _cur_dirblock, _offset_
mov eax, ebx mov eax, ebx
add eax, [ebp+XFS.dirblocksize] add eax, [ebp+XFS.dirblocksize]
mov [ebp+XFS.max_dirblockaddr], eax mov [ebp+XFS.max_dirblockaddr], eax
; add ebx, xfs_dir2_block.u
add ebx, [ebp+XFS.dir_block_size] add ebx, [ebp+XFS.dir_block_size]
.next: .next:
movi eax, ERROR_SUCCESS movi eax, ERROR_SUCCESS
@ -797,13 +802,14 @@ proc xfs._.readdir_btree uses esi, _inode_data, _out_buf
mov [ebp+XFS.cur_inode_save], ebx mov [ebp+XFS.cur_inode_save], ebx
mov [ebp+XFS.entries_read], 0 mov [ebp+XFS.entries_read], 0
mov eax, [ebp+XFS.inodesize] mov eax, [ebp+XFS.inodesize]
sub eax, xfs_inode.di_u sub eax, [ebp+XFS.inode_core_size]
movzx ecx, [ebx+xfs_inode.di_core.di_forkoff] movzx ecx, [ebx+xfs_inode.di_core.di_forkoff]
jecxz @f jecxz @f
shl ecx, 3 shl ecx, 3
mov eax, ecx mov eax, ecx
@@: @@:
lea edx, [ebx+xfs_inode.di_u] mov edx, ebx
add edx, [ebp+XFS.inode_core_size]
mov ecx, [ebp+XFS.dir2_leaf_offset_blocks.lo] mov ecx, [ebp+XFS.dir2_leaf_offset_blocks.lo]
mov [ebp+XFS.offset_begin.lo], ecx mov [ebp+XFS.offset_begin.lo], ecx
mov ecx, [ebp+XFS.dir2_leaf_offset_blocks.hi] mov ecx, [ebp+XFS.dir2_leaf_offset_blocks.hi]
@ -820,13 +826,14 @@ proc xfs._.readdir_btree uses esi, _inode_data, _out_buf
mov [ebp+XFS.entries_read], 0 mov [ebp+XFS.entries_read], 0
add [_out_buf], sizeof.bdfe_hdr add [_out_buf], sizeof.bdfe_hdr
mov eax, [ebp+XFS.inodesize] mov eax, [ebp+XFS.inodesize]
sub eax, xfs_inode.di_u sub eax, [ebp+XFS.inode_core_size]
movzx ecx, [ebx+xfs_inode.di_core.di_forkoff] movzx ecx, [ebx+xfs_inode.di_core.di_forkoff]
jecxz @f jecxz @f
shl ecx, 3 shl ecx, 3
mov eax, ecx mov eax, ecx
@@: @@:
lea edx, [ebx+xfs_inode.di_u] mov edx, ebx
add edx, [ebp+XFS.inode_core_size]
mov [ebp+XFS.offset_begin.lo], 0 mov [ebp+XFS.offset_begin.lo], 0
mov [ebp+XFS.offset_begin.hi], 0 mov [ebp+XFS.offset_begin.hi], 0
mov ecx, [ebp+XFS.dir2_leaf_offset_blocks.lo] mov ecx, [ebp+XFS.dir2_leaf_offset_blocks.lo]
@ -1048,7 +1055,8 @@ proc xfs._.get_inode_by_addr uses ebx esi edi, _inode_buf
jz .btree jz .btree
jmp .error jmp .error
.extents: .extents:
movbe ecx, [ebx+xfs_inode.di_core.di_nextents] mov ecx, [ebp+XFS.nextents_offset]
movbe ecx, [ebx+ecx]
add ebx, [ebp+XFS.inode_core_size] add ebx, [ebp+XFS.inode_core_size]
mov [ebp+XFS.offset_begin.lo], eax mov [ebp+XFS.offset_begin.lo], eax
mov [ebp+XFS.offset_begin.hi], edx mov [ebp+XFS.offset_begin.hi], edx
@ -1081,7 +1089,8 @@ endp
proc xfs._.lookup_leaf uses ebx esi edi, _name, _len proc xfs._.lookup_leaf uses ebx esi edi, _name, _len
movbe ecx, [ebx+xfs_inode.di_core.di_nextents] mov ecx, [ebp+XFS.nextents_offset]
movbe ecx, [ebx+ecx]
add ebx, [ebp+XFS.inode_core_size] add ebx, [ebp+XFS.inode_core_size]
mov eax, [ebp+XFS.dir2_leaf_offset_blocks.lo] mov eax, [ebp+XFS.dir2_leaf_offset_blocks.lo]
mov [ebp+XFS.offset_begin.lo], ecx mov [ebp+XFS.offset_begin.lo], ecx
@ -1124,15 +1133,15 @@ endl
mov [ebp+XFS.cur_inode_save], ebx mov [ebp+XFS.cur_inode_save], ebx
stdcall xfs_hashname, [_name+4], [_len] stdcall xfs_hashname, [_name+4], [_len]
mov [.hash], eax mov [.hash], eax
mov eax, ebx mov edx, [ebp+XFS.nextents_offset]
add eax, [ebp+XFS.inode_core_size] movbe edx, [ebx+edx]
movbe edx, [ebx+xfs_inode.di_core.di_nextents]
mov esi, [ebp+XFS.dir2_leaf_offset_blocks.lo] mov esi, [ebp+XFS.dir2_leaf_offset_blocks.lo]
.begin: .begin:
mov ebx, [ebp+XFS.cur_inode_save] mov ebx, [ebp+XFS.cur_inode_save]
mov eax, ebx mov eax, ebx
add eax, [ebp+XFS.inode_core_size] add eax, [ebp+XFS.inode_core_size]
movbe edx, [ebx+xfs_inode.di_core.di_nextents] mov edx, [ebp+XFS.nextents_offset]
movbe edx, [ebx+edx]
mov ebx, eax mov ebx, eax
mov [ebp+XFS.offset_begin.lo], esi mov [ebp+XFS.offset_begin.lo], esi
mov [ebp+XFS.offset_begin.hi], 0 mov [ebp+XFS.offset_begin.hi], 0
@ -1214,9 +1223,9 @@ endl
test ecx, ecx test ecx, ecx
jnz @f jnz @f
mov ecx, [ebp+XFS.inodesize] mov ecx, [ebp+XFS.inodesize]
sub ecx, xfs_inode.di_u sub ecx, [ebp+XFS.inode_core_size]
@@: @@:
add ebx, xfs_inode.di_u 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 cmp [ebx+xfs_da_intnode.hdr.info.magic], XFS_DA_NODE_MAGIC
@ -1445,7 +1454,7 @@ endp
proc xfs._.extent_unpack uses eax ebx ecx edx, _extent_data proc xfs._.extent_unpack uses eax ebx ecx edx, _extent_data
; extents come as packet 128bit bitfields ; extents come as packed 128bit bitfields
; unpack them to access internal fields ; unpack them to access internal fields
; write result to the XFS.extent structure ; write result to the XFS.extent structure
mov ebx, [_extent_data] mov ebx, [_extent_data]
@ -1783,7 +1792,8 @@ endl
.extent_list: .extent_list:
mov eax, ebx mov eax, ebx
add eax, [ebp+XFS.inode_core_size] add eax, [ebp+XFS.inode_core_size]
movbe edx, [ebx+xfs_inode.di_core.di_nextents] mov edx, [ebp+XFS.nextents_offset]
movbe edx, [ebx+edx]
mov ecx, [.offset_begin.lo] mov ecx, [.offset_begin.lo]
mov [ebp+XFS.offset_begin.lo], ecx mov [ebp+XFS.offset_begin.lo], ecx
mov ecx, [.offset_begin.hi] mov ecx, [.offset_begin.hi]
@ -1922,13 +1932,13 @@ proc xfs._.long_btree.seek uses ebx esi edi, _ptr, _size
jmp .common jmp .common
.not_root: .not_root:
mov esi, [ebp+XFS.blocksize] mov esi, [ebp+XFS.blocksize]
sub esi, sizeof.xfs_bmbt_block sub esi, [ebp+XFS.bmbt_block_size]
shr esi, 4 shr esi, 4
shl esi, 3 shl esi, 3
movzx eax, [ebx+xfs_bmbt_block.bb_level] movzx eax, [ebx+xfs_bmbt_block.bb_level]
movzx ecx, [ebx+xfs_bmbt_block.bb_numrecs] movzx ecx, [ebx+xfs_bmbt_block.bb_numrecs]
xchg cl, ch xchg cl, ch
add ebx, sizeof.xfs_bmbt_block add ebx, [ebp+XFS.bmbt_block_size]
.common: .common:
test eax, eax test eax, eax
jz .leaf jz .leaf
@ -2129,7 +2139,8 @@ endp
proc xfs._.get_last_dirblock uses ecx proc xfs._.get_last_dirblock uses ecx
movbe eax, [ebx+xfs_inode.di_core.di_nextents] mov eax, [ebp+XFS.nextents_offset]
movbe eax, [ebx+eax]
assert (sizeof.xfs_bmbt_rec AND (sizeof.xfs_bmbt_rec - 1)) = 0 assert (sizeof.xfs_bmbt_rec AND (sizeof.xfs_bmbt_rec - 1)) = 0
shl eax, BSF sizeof.xfs_bmbt_rec shl eax, BSF sizeof.xfs_bmbt_rec
add eax, [ebp+XFS.inode_core_size] add eax, [ebp+XFS.inode_core_size]

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

@ -83,14 +83,17 @@ XFS_SB_VERSION2_SUPPORTED = XFS_SB_VERSION2_LAZYSBCOUNTBIT OR \
XFS_SB_VERSION2_CRCBIT OR \ XFS_SB_VERSION2_CRCBIT OR \
XFS_SB_VERSION2_FTYPE XFS_SB_VERSION2_FTYPE
XFS_SB_FEAT_INCOMPAT_FTYPE = 1 ; filetype in dirent XFS_SB_FEAT_INCOMPAT_FTYPE = 0x01 ; filetype in dirent
XFS_SB_FEAT_INCOMPAT_SPINODES = 2 ; sparse inode chunks XFS_SB_FEAT_INCOMPAT_SPINODES = 0x02 ; sparse inode chunks
XFS_SB_FEAT_INCOMPAT_META_UUID = 4 ; metadata UUID XFS_SB_FEAT_INCOMPAT_META_UUID = 0x04 ; metadata UUID
XFS_SB_FEAT_INCOMPAT_BIGTIME = 8 ; large timestamps XFS_SB_FEAT_INCOMPAT_BIGTIME = 0x08 ; large timestamps
XFS_SB_FEAT_INCOMPAT_SUPPORTED = XFS_SB_FEAT_INCOMPAT_FTYPE OR \ XFS_SB_FEAT_INCOMPAT_NEEDSREPAIR = 0x10 ; e.g. for upgrade to nrext64
XFS_SB_FEAT_INCOMPAT_SPINODES OR \ XFS_SB_FEAT_INCOMPAT_NREXT64 = 0x20 ; 64bit extent counters
XFS_SB_FEAT_INCOMPAT_META_UUID OR \ XFS_SB_FEAT_INCOMPAT_SUPPORTED = XFS_SB_FEAT_INCOMPAT_FTYPE OR \
XFS_SB_FEAT_INCOMPAT_BIGTIME XFS_SB_FEAT_INCOMPAT_SPINODES OR \
XFS_SB_FEAT_INCOMPAT_META_UUID OR \
XFS_SB_FEAT_INCOMPAT_BIGTIME OR \
XFS_SB_FEAT_INCOMPAT_NREXT64
; bitfield lengths for packed extent ; bitfield lengths for packed extent
; MSB to LSB / left to right ; MSB to LSB / left to right
@ -210,17 +213,24 @@ struct xfs_dinode_core
di_uid dd ? ; owner's user id di_uid dd ? ; owner's user id
di_gid dd ? ; owner's group id di_gid dd ? ; owner's group id
di_nlink dd ? ; number of links to file di_nlink dd ? ; number of links to file
di_projid dw ? ; owner's project id di_projid dd ? ; owner's project id
di_pad rb 8 ; unused, zeroed space di_big_nextents DQ ? ; iff NREXT64 is set
di_flushiter dw ? ; incremented on flush
di_atime DQ ; time last accessed di_atime DQ ; time last accessed
di_mtime DQ ; time last modified di_mtime DQ ; time last modified
di_ctime DQ ; time created/inode modified di_ctime DQ ; time created/inode modified
di_size DQ ? ; number of bytes in file di_size DQ ? ; number of bytes in file
di_nblocks DQ ? ; number of direct & btree blocks used di_nblocks DQ ? ; number of direct & btree blocks used
di_extsize dd ? ; basic/minimum extent size for file di_extsize dd ? ; basic/minimum extent size for file
di_nextents dd ? ; number of extents in data fork union
di_anextents dw ? ; number of extents in attribute fork struct
di_nextents dd ? ; number of extents in data fork
di_anextents dw ? ; number of extents in attribute fork
ends
struct
di_big_anextents dd ? ; attr extent counter is 32bit for NREXT64
di_nrext64_pad dw ?
ends
ends
di_forkoff db ? ; attr fork offs, <<3 for 64b align di_forkoff db ? ; attr fork offs, <<3 for 64b align
di_aformat db ? ; format of attr fork's data di_aformat db ? ; format of attr fork's data
di_dmevmask dd ? ; DMIG event mask di_dmevmask dd ? ; DMIG event mask
@ -469,25 +479,6 @@ ends
struct xfs_inode struct xfs_inode
di_core xfs_dinode_core ; main info, aka core di_core xfs_dinode_core ; main info, aka core
union
di_u db ? ; data fork inode part
dir2_sf xfs_dir2_sf
bmx xfs_dir2_bmx
ends
; di_a db ? ; data attribute
ends
struct xfs_agf
agf_magicnum dd ? ; magic number == XFS_AGF_MAGIC
agf_versionnum dd ? ; header version == XFS_AGF_VERSION
agf_seqno dd ? ; sequence # starting from 0
agf_length dd ? ; size in blocks of AG
agf_roots dd ?
agf_levels dd ?
agf_flfirst dd ?
agf_fllast dd ?
agf_flcount dd ?
agf_freeblks dd ? ; free blocks in AG
ends ends
; internal data for every XFS partition ; internal data for every XFS partition
@ -534,6 +525,7 @@ struct XFS PARTITION
da_node_size dd ? da_node_size dd ?
da_blkinfo_size dd ? da_blkinfo_size dd ?
conv_time_to_kos_epoch dd ? conv_time_to_kos_epoch dd ?
nextents_offset dd ?
; helpers, temporary vars, etc ; helpers, temporary vars, etc
; should go to file descriptor and local vars? ; should go to file descriptor and local vars?
cur_block dd ? cur_block dd ?