aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ext4/inode.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/ext4/inode.c')
-rw-r--r--fs/ext4/inode.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 5a8979259c9a..a5b4ce40cc66 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -1255,8 +1255,7 @@ int ext4_get_blocks(handle_t *handle, struct inode *inode, sector_t block,
1255 * i_data's format changing. Force the migrate 1255 * i_data's format changing. Force the migrate
1256 * to fail by clearing migrate flags 1256 * to fail by clearing migrate flags
1257 */ 1257 */
1258 EXT4_I(inode)->i_flags = EXT4_I(inode)->i_flags & 1258 EXT4_I(inode)->i_state &= ~EXT4_STATE_EXT_MIGRATE;
1259 ~EXT4_EXT_MIGRATE;
1260 } 1259 }
1261 } 1260 }
1262 1261
@@ -4596,8 +4595,7 @@ static int ext4_do_update_inode(handle_t *handle,
4596 if (ext4_inode_blocks_set(handle, raw_inode, ei)) 4595 if (ext4_inode_blocks_set(handle, raw_inode, ei))
4597 goto out_brelse; 4596 goto out_brelse;
4598 raw_inode->i_dtime = cpu_to_le32(ei->i_dtime); 4597 raw_inode->i_dtime = cpu_to_le32(ei->i_dtime);
4599 /* clear the migrate flag in the raw_inode */ 4598 raw_inode->i_flags = cpu_to_le32(ei->i_flags);
4600 raw_inode->i_flags = cpu_to_le32(ei->i_flags & ~EXT4_EXT_MIGRATE);
4601 if (EXT4_SB(inode->i_sb)->s_es->s_creator_os != 4599 if (EXT4_SB(inode->i_sb)->s_es->s_creator_os !=
4602 cpu_to_le32(EXT4_OS_HURD)) 4600 cpu_to_le32(EXT4_OS_HURD))
4603 raw_inode->i_file_acl_high = 4601 raw_inode->i_file_acl_high =