|
@@ -3700,6 +3700,16 @@ static blkcnt_t ext4_inode_blocks(struct ext4_inode *raw_inode,
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+static inline void ext4_iget_extra_inode(struct inode *inode,
|
|
|
+ struct ext4_inode *raw_inode,
|
|
|
+ struct ext4_inode_info *ei)
|
|
|
+{
|
|
|
+ __le32 *magic = (void *)raw_inode +
|
|
|
+ EXT4_GOOD_OLD_INODE_SIZE + ei->i_extra_isize;
|
|
|
+ if (*magic == cpu_to_le32(EXT4_XATTR_MAGIC))
|
|
|
+ ext4_set_inode_state(inode, EXT4_STATE_XATTR);
|
|
|
+}
|
|
|
+
|
|
|
struct inode *ext4_iget(struct super_block *sb, unsigned long ino)
|
|
|
{
|
|
|
struct ext4_iloc iloc;
|
|
@@ -3842,11 +3852,7 @@ struct inode *ext4_iget(struct super_block *sb, unsigned long ino)
|
|
|
ei->i_extra_isize = sizeof(struct ext4_inode) -
|
|
|
EXT4_GOOD_OLD_INODE_SIZE;
|
|
|
} else {
|
|
|
- __le32 *magic = (void *)raw_inode +
|
|
|
- EXT4_GOOD_OLD_INODE_SIZE +
|
|
|
- ei->i_extra_isize;
|
|
|
- if (*magic == cpu_to_le32(EXT4_XATTR_MAGIC))
|
|
|
- ext4_set_inode_state(inode, EXT4_STATE_XATTR);
|
|
|
+ ext4_iget_extra_inode(inode, raw_inode, ei);
|
|
|
}
|
|
|
}
|
|
|
|