summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-09-27 21:16:24 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-09-27 21:16:24 +0200
commitc127e59bee3e26d8059683dcb919006b6a76e90c (patch)
treee6e2f24543341501fcdbb72785c05bdd299b053a /fs
parentc307aaf3eb47969105887e4e8991ec00960a7ce8 (diff)
parent9e796c9db93b4840d1b00e550eea26db7cb741e2 (diff)
downloadlinux-stable-c127e59bee3e26d8059683dcb919006b6a76e90c.tar.gz
linux-stable-c127e59bee3e26d8059683dcb919006b6a76e90c.tar.bz2
linux-stable-c127e59bee3e26d8059683dcb919006b6a76e90c.zip
Merge tag 'for_v4.19-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
Jan writes: "an ext2 patch fixing fsync(2) for DAX mounts." * tag 'for_v4.19-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs: ext2, dax: set ext2_dax_aops for dax files
Diffstat (limited to 'fs')
-rw-r--r--fs/ext2/inode.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c
index 7f7ee18fe179..e4bb9386c045 100644
--- a/fs/ext2/inode.c
+++ b/fs/ext2/inode.c
@@ -1448,6 +1448,7 @@ struct inode *ext2_iget (struct super_block *sb, unsigned long ino)
}
inode->i_blocks = le32_to_cpu(raw_inode->i_blocks);
ei->i_flags = le32_to_cpu(raw_inode->i_flags);
+ ext2_set_inode_flags(inode);
ei->i_faddr = le32_to_cpu(raw_inode->i_faddr);
ei->i_frag_no = raw_inode->i_frag;
ei->i_frag_size = raw_inode->i_fsize;
@@ -1517,7 +1518,6 @@ struct inode *ext2_iget (struct super_block *sb, unsigned long ino)
new_decode_dev(le32_to_cpu(raw_inode->i_block[1])));
}
brelse (bh);
- ext2_set_inode_flags(inode);
unlock_new_inode(inode);
return inode;