ext4_inode: deal with i_extra_isize depending on inode size

[lwext4.git] / src / ext4_inode.c

diff --git a/src/ext4_inode.c b/src/ext4_inode.c
index c64ddbc765688cc0b2b2208fbd917e02cdb9756c..13473f72515e57f28d81ec28413cf2ba25136a71 100644 (file)
--- a/src/ext4_inode.c
+++ b/src/ext4_inode.c
@@ -273,7 +273,8 @@ void ext4_inode_set_generation(struct ext4_inode *inode, uint32_t gen)
 uint16_t ext4_inode_get_extra_isize(struct ext4_sblock *sb,
                                    struct ext4_inode *inode)
 {
-       if (ext4_sb_feature_ro_com(sb, EXT4_FRO_COM_EXTRA_ISIZE))
+       uint16_t inode_size = ext4_get16(sb, inode_size);
+       if (inode_size > EXT4_GOOD_OLD_INODE_SIZE)
                return to_le16(inode->extra_isize);
        else
                return 0;
@@ -283,7 +284,8 @@ void ext4_inode_set_extra_isize(struct ext4_sblock *sb,
                                struct ext4_inode *inode,
                                uint16_t size)
 {
-       if (ext4_sb_feature_ro_com(sb, EXT4_FRO_COM_EXTRA_ISIZE))
+       uint16_t inode_size = ext4_get16(sb, inode_size);
+       if (inode_size > EXT4_GOOD_OLD_INODE_SIZE)
                inode->extra_isize = to_le16(size);
 }
 
@@ -328,6 +330,26 @@ void ext4_inode_set_indirect_block(struct ext4_inode *inode, uint32_t idx,
        inode->blocks[idx + EXT4_INODE_INDIRECT_BLOCK] = to_le32(block);
 }
 
+uint32_t ext4_inode_get_dev(struct ext4_inode *inode)
+{
+       uint32_t dev_0, dev_1;
+       dev_0 = ext4_inode_get_direct_block(inode, 0);
+       dev_1 = ext4_inode_get_direct_block(inode, 1);
+
+       if (dev_0)
+               return dev_0;
+       else
+               return dev_1;
+}
+
+void ext4_inode_set_dev(struct ext4_inode *inode, uint32_t dev)
+{
+       if (dev & ~0xFFFF)
+               ext4_inode_set_direct_block(inode, 1, dev);
+       else
+               ext4_inode_set_direct_block(inode, 0, dev);
+}
+
 uint32_t ext4_inode_type(struct ext4_sblock *sb, struct ext4_inode *inode)
 {
        return (ext4_inode_get_mode(sb, inode) & EXT4_INODE_MODE_TYPE_MASK);