diff options
| author | Kaho Ng <ngkaho1234@gmail.com> | 2016-05-12 22:38:59 +0800 |
|---|---|---|
| committer | Kaho Ng <ngkaho1234@gmail.com> | 2016-05-13 21:20:12 +0800 |
| commit | 61098c719f30316c4bac054170c262d0419849a9 (patch) | |
| tree | f87271c3e6e26606f46b667f8e066f3d34c8ed6f /src | |
| parent | 5cdc17dc795e0a21486c97b5a34c8dff4bd60444 (diff) | |
ext4_xattr: Changes to EA metadata handling macros
- Move them from include/ext4_types.h to include/ext4_xattr.h
- Use ext4_inode_get_extra_isize to better handle extra_isize field
of inodes.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ext4_xattr.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/ext4_xattr.c b/src/ext4_xattr.c index f177eaa..e1c9274 100644 --- a/src/ext4_xattr.c +++ b/src/ext4_xattr.c @@ -272,7 +272,8 @@ static void *ext4_xattr_entry_data(struct ext4_xattr_ref *xattr_ref, struct ext4_xattr_entry *first_entry; int16_t inode_size = ext4_get16(&xattr_ref->fs->sb, inode_size); - header = EXT4_XATTR_IHDR(xattr_ref->inode_ref->inode); + header = EXT4_XATTR_IHDR(&xattr_ref->fs->sb, + xattr_ref->inode_ref->inode); first_entry = EXT4_XATTR_IFIRST(header); ret = ((char *)first_entry + to_le16(entry->e_value_offs)); @@ -346,7 +347,8 @@ static int ext4_xattr_inode_fetch(struct ext4_xattr_ref *xattr_ref) uint16_t extra_isize = ext4_inode_get_extra_isize(&xattr_ref->fs->sb, xattr_ref->inode_ref->inode); - header = EXT4_XATTR_IHDR(xattr_ref->inode_ref->inode); + header = EXT4_XATTR_IHDR(&xattr_ref->fs->sb, + xattr_ref->inode_ref->inode); entry = EXT4_XATTR_IFIRST(header); size_rem = inode_size - EXT4_GOOD_OLD_INODE_SIZE - @@ -635,7 +637,8 @@ static int ext4_xattr_write_to_disk(struct ext4_xattr_ref *xattr_ref) inode_size_rem = ext4_xattr_inode_space(xattr_ref); block_size_rem = ext4_xattr_block_space(xattr_ref); if (inode_size_rem > sizeof(struct ext4_xattr_ibody_header)) { - ibody_header = EXT4_XATTR_IHDR(xattr_ref->inode_ref->inode); + ibody_header = EXT4_XATTR_IHDR(&xattr_ref->fs->sb, + xattr_ref->inode_ref->inode); entry = EXT4_XATTR_IFIRST(ibody_header); } |
