Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

Pull Ext4 updates from Theodore Ts'o:
 "The major new feature added in this update is Darrick J Wong's
  metadata checksum feature, which adds crc32 checksums to ext4's
  metadata fields.

  There is also the usual set of cleanups and bug fixes."

* tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (44 commits)
  ext4: hole-punch use truncate_pagecache_range
  jbd2: use kmem_cache_zalloc wrapper instead of flag
  ext4: remove mb_groups before tearing down the buddy_cache
  ext4: add ext4_mb_unload_buddy in the error path
  ext4: don't trash state flags in EXT4_IOC_SETFLAGS
  ext4: let getattr report the right blocks in delalloc+bigalloc
  ext4: add missing save_error_info() to ext4_error()
  ext4: add debugging trigger for ext4_error()
  ext4: protect group inode free counting with group lock
  ext4: use consistent ssize_t type in ext4_file_write()
  ext4: fix format flag in ext4_ext_binsearch_idx()
  ext4: cleanup in ext4_discard_allocated_blocks()
  ext4: return ENOMEM when mounts fail due to lack of memory
  ext4: remove redundundant "(char *) bh->b_data" casts
  ext4: disallow hard-linked directory in ext4_lookup
  ext4: fix potential integer overflow in alloc_flex_gd()
  ext4: remove needs_recovery in ext4_mb_init()
  ext4: force ro mount if ext4_setup_super() fails
  ext4: fix potential NULL dereference in ext4_free_inodes_counts()
  ext4/jbd2: add metadata checksumming to the list of supported features
  ...

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;