ovl: respect FIEMAP_FLAG_SYNC flag

[linux.git] / fs / overlayfs / inode.c

diff --git a/fs/overlayfs/inode.c b/fs/overlayfs/inode.c
index 2a5a38c81961c4aa825605117d037578cc709b76..5014749fd4b45d346f9c3d4f13495814437cf3d2 100644 (file)
--- a/fs/overlayfs/inode.c
+++ b/fs/overlayfs/inode.c
@@ -19,6 +19,7 @@
 int ovl_setattr(struct dentry *dentry, struct iattr *attr)
 {
        int err;
+       bool full_copy_up = false;
        struct dentry *upperdentry;
        const struct cred *old_cred;
 
@@ -36,9 +37,15 @@ int ovl_setattr(struct dentry *dentry, struct iattr *attr)
                err = -ETXTBSY;
                if (atomic_read(&realinode->i_writecount) < 0)
                        goto out_drop_write;
+
+               /* Truncate should trigger data copy up as well */
+               full_copy_up = true;
        }
 
-       err = ovl_copy_up(dentry);
+       if (!full_copy_up)
+               err = ovl_copy_up(dentry);
+       else
+               err = ovl_copy_up_with_data(dentry);
        if (!err) {
                struct inode *winode = NULL;
 
@@ -460,6 +467,10 @@ static int ovl_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
                return -EOPNOTSUPP;
 
        old_cred = ovl_override_creds(inode->i_sb);
+
+       if (fieinfo->fi_flags & FIEMAP_FLAG_SYNC)
+               filemap_write_and_wait(realinode->i_mapping);
+
        err = realinode->i_op->fiemap(realinode, fieinfo, start, len);
        revert_creds(old_cred);
 
@@ -864,7 +875,7 @@ struct inode *ovl_get_inode(struct super_block *sb,
                }
        }
        ovl_fill_inode(inode, realinode->i_mode, realinode->i_rdev, ino, fsid);
-       ovl_inode_init(inode, upperdentry, lowerdentry);
+       ovl_inode_init(inode, upperdentry, lowerdentry, oip->lowerdata);
 
        if (upperdentry && ovl_is_impuredir(upperdentry))
                ovl_set_flag(OVL_IMPURE, inode);
@@ -883,6 +894,9 @@ struct inode *ovl_get_inode(struct super_block *sb,
 
        OVL_I(inode)->redirect = oip->redirect;
 
+       if (bylower)
+               ovl_set_flag(OVL_CONST_INO, inode);
+
        /* Check for non-merge dir that may have whiteouts */
        if (is_dir) {
                if (((upperdentry && lowerdentry) || oip->numlower > 1) ||