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

btrfs: Fix btrfs_dir_entry doesn't read data from disk correctly.

Browse Source
This commit is contained in:
hyche
2018-01-16 16:21:46 +00:00
committed by Adrien Destugues
parent 483c45843d
commit 3f43dd8710
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/file_systems/btrfs/btrfs.h
+3 -3
View File
@@ -356,8 +356,8 @@ struct btrfs_dir_entry {
uint16 data_length; uint16 data_length;
uint16 name_length; uint16 name_length;
uint8 type; uint8 type;
uint8* name; uint8 name[];
uint8* data; // attribute data // if attribute data exists, it goes here
uint16 DataLength() const { return B_LENDIAN_TO_HOST_INT16(data_length); } uint16 DataLength() const { return B_LENDIAN_TO_HOST_INT16(data_length); }
uint16 NameLength() const { return B_LENDIAN_TO_HOST_INT16(name_length); } uint16 NameLength() const { return B_LENDIAN_TO_HOST_INT16(name_length); }
ino_t InodeID() const { return location.ObjectID(); } ino_t InodeID() const { return location.ObjectID(); }
@@ -369,7 +369,7 @@ struct btrfs_dir_entry {
{ {
data_length = B_HOST_TO_LENDIAN_INT16(dataLength); data_length = B_HOST_TO_LENDIAN_INT16(dataLength);
if (data != NULL) if (data != NULL)
memcpy(this->data, data, dataLength); memcpy(&name[name_length], data, dataLength);
} }
void SetName(const char* name, uint16 nameLength) void SetName(const char* name, uint16 nameLength)
{ {