1 files changed, 16 insertions, 3 deletions

diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c
index 6eee25591b81..8ad112ae0ade 100644
--- a/fs/ext4/ioctl.c
+++ b/fs/ext4/ioctl.c
@@ -38,7 +38,7 @@ long ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
                 handle_t *handle = NULL;
                 int err, migrate = 0;
                 struct ext4_iloc iloc;
-                unsigned int oldflags;
+                unsigned int oldflags, mask, i;
                 unsigned int jflag;
 
                 if (!inode_owner_or_capable(inode))
@@ -115,8 +115,14 @@ long ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
                 if (err)
                         goto flags_err;
 
-                flags = flags & EXT4_FL_USER_MODIFIABLE;
-                flags |= oldflags & ~EXT4_FL_USER_MODIFIABLE;
+                for (i = 0, mask = 1; i < 32; i++, mask <<= 1) {
+                        if (!(mask & EXT4_FL_USER_MODIFIABLE))
+                                continue;
+                        if (mask & flags)
+                                ext4_set_inode_flag(inode, i);
+                        else
+                                ext4_clear_inode_flag(inode, i);
+                }
                 ei->i_flags = flags;
 
                 ext4_set_inode_flags(inode);
@@ -152,6 +158,13 @@ flags_out:
                 if (!inode_owner_or_capable(inode))
                         return -EPERM;
 
+                if (EXT4_HAS_RO_COMPAT_FEATURE(inode->i_sb,
+                                EXT4_FEATURE_RO_COMPAT_METADATA_CSUM)) {
+                        ext4_warning(sb, "Setting inode version is not "
+                                     "supported with metadata_csum enabled.");
+                        return -ENOTTY;
+                }
+
                 err = mnt_want_write_file(filp);
                 if (err)
                         return err;