ext4: serialize unlocked dio reads with truncate

[firefly-linux-kernel-4.4.55.git] / fs / ext4 / inode.c

diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index bdd399bc2abf69b23426d34ccf39b83ae15334e4..0bfc63331467130689bd8dcb285479234cc40191 100644 (file)
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -4283,7 +4283,6 @@ int ext4_setattr(struct dentry *dentry, struct iattr *attr)
        }
 
        if (attr->ia_valid & ATTR_SIZE) {
-               inode_dio_wait(inode);
 
                if (!(ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS))) {
                        struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb);
@@ -4332,8 +4331,12 @@ int ext4_setattr(struct dentry *dentry, struct iattr *attr)
        }
 
        if (attr->ia_valid & ATTR_SIZE) {
-               if (attr->ia_size != i_size_read(inode))
+               if (attr->ia_size != i_size_read(inode)) {
                        truncate_setsize(inode, attr->ia_size);
+                       /* Inode size will be reduced, wait for dio in flight */
+                       if (orphan)
+                               inode_dio_wait(inode);
+               }
                ext4_truncate(inode);
        }