fs/ntfs3: Update inode->i_mapping->a_ops on compression state

[ Upstream commit b432163ebd15a0fb74051949cb61456d6c55ccbd ]

Update inode->i_mapping->a_ops when the compression state changes to
ensure correct address space operations.
Clear ATTR_FLAG_SPARSED/FILE_ATTRIBUTE_SPARSE_FILE when enabling
compression to prevent flag conflicts.

v2:
Additionally, ensure that all dirty pages are flushed and concurrent access
to the page cache is blocked.

Fixes: 6b39bfaeec44 ("fs/ntfs3: Add support for the compression attribute")
Reported-by: Kun Hu <huk23@m.fudan.edu.cn>, Jiaji Qin <jjtan24@m.fudan.edu.cn>
Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/fs/ntfs3/attrib.c b/fs/ntfs3/attrib.c
index da1a9312e61a0eb37fe367ff60a1ade3b2ecf5c8..dd459316529e8ecc655f8b69b2f54eeced43bb0c 100644 (file)
--- a/fs/ntfs3/attrib.c
+++ b/fs/ntfs3/attrib.c
@@ -2663,8 +2663,9 @@ int attr_set_compress(struct ntfs_inode *ni, bool compr)
                attr->nres.run_off = cpu_to_le16(run_off);
        }
 
-       /* Update data attribute flags. */
+       /* Update attribute flags. */
        if (compr) {
+               attr->flags &= ~ATTR_FLAG_SPARSED;
                attr->flags |= ATTR_FLAG_COMPRESSED;
                attr->nres.c_unit = NTFS_LZNT_CUNIT;
        } else {

diff --git a/fs/ntfs3/file.c b/fs/ntfs3/file.c
index f704ceef953948f5aca75c7fd187c15b91d1007f..7976ac4611c8d045217246688edf7567bddf1b26 100644 (file)
--- a/fs/ntfs3/file.c
+++ b/fs/ntfs3/file.c
@@ -101,8 +101,26 @@ int ntfs_fileattr_set(struct mnt_idmap *idmap, struct dentry *dentry,
        /* Allowed to change compression for empty files and for directories only. */
        if (!is_dedup(ni) && !is_encrypted(ni) &&
            (S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode))) {
-               /* Change compress state. */
-               int err = ni_set_compress(inode, flags & FS_COMPR_FL);
+               int err = 0;
+               struct address_space *mapping = inode->i_mapping;
+
+               /* write out all data and wait. */
+               filemap_invalidate_lock(mapping);
+               err = filemap_write_and_wait(mapping);
+
+               if (err >= 0) {
+                       /* Change compress state. */
+                       bool compr = flags & FS_COMPR_FL;
+                       err = ni_set_compress(inode, compr);
+
+                       /* For files change a_ops too. */
+                       if (!err)
+                               mapping->a_ops = compr ? &ntfs_aops_cmpr :
+                                                        &ntfs_aops;
+               }
+
+               filemap_invalidate_unlock(mapping);
+
                if (err)
                        return err;
        }

diff --git a/fs/ntfs3/frecord.c b/fs/ntfs3/frecord.c
index 175662acd5eaf0fb0665015ab635bf703ac20c88..608634361a302fe8a63064c02636e0ad4c2960c9 100644 (file)
--- a/fs/ntfs3/frecord.c
+++ b/fs/ntfs3/frecord.c
@@ -3431,10 +3431,12 @@ int ni_set_compress(struct inode *inode, bool compr)
        }
 
        ni->std_fa = std->fa;
-       if (compr)
+       if (compr) {
+               std->fa &= ~FILE_ATTRIBUTE_SPARSE_FILE;
                std->fa |= FILE_ATTRIBUTE_COMPRESSED;
-       else
+       } else {
                std->fa &= ~FILE_ATTRIBUTE_COMPRESSED;
+       }
 
        if (ni->std_fa != std->fa) {
                ni->std_fa = std->fa;