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, 83 insertions, 0 deletions

diff --git a/fs/ext4/bitmap.c b/fs/ext4/bitmap.c
index fa3af81ac565..b319721da26a 100644
--- a/fs/ext4/bitmap.c
+++ b/fs/ext4/bitmap.c
@@ -29,3 +29,86 @@ unsigned int ext4_count_free(struct buffer_head *map, unsigned int numchars)
 
 #endif  /*  EXT4FS_DEBUG  */
 
+int ext4_inode_bitmap_csum_verify(struct super_block *sb, ext4_group_t group,
+                                  struct ext4_group_desc *gdp,
+                                  struct buffer_head *bh, int sz)
+{
+        __u32 hi;
+        __u32 provided, calculated;
+        struct ext4_sb_info *sbi = EXT4_SB(sb);
+
+        if (!EXT4_HAS_RO_COMPAT_FEATURE(sb,
+                                        EXT4_FEATURE_RO_COMPAT_METADATA_CSUM))
+                return 1;
+
+        provided = le16_to_cpu(gdp->bg_inode_bitmap_csum_lo);
+        calculated = ext4_chksum(sbi, sbi->s_csum_seed, (__u8 *)bh->b_data, sz);
+        if (sbi->s_desc_size >= EXT4_BG_INODE_BITMAP_CSUM_HI_END) {
+                hi = le16_to_cpu(gdp->bg_inode_bitmap_csum_hi);
+                provided |= (hi << 16);
+        } else
+                calculated &= 0xFFFF;
+
+        return provided == calculated;
+}
+
+void ext4_inode_bitmap_csum_set(struct super_block *sb, ext4_group_t group,
+                                struct ext4_group_desc *gdp,
+                                struct buffer_head *bh, int sz)
+{
+        __u32 csum;
+        struct ext4_sb_info *sbi = EXT4_SB(sb);
+
+        if (!EXT4_HAS_RO_COMPAT_FEATURE(sb,
+                                        EXT4_FEATURE_RO_COMPAT_METADATA_CSUM))
+                return;
+
+        csum = ext4_chksum(sbi, sbi->s_csum_seed, (__u8 *)bh->b_data, sz);
+        gdp->bg_inode_bitmap_csum_lo = cpu_to_le16(csum & 0xFFFF);
+        if (sbi->s_desc_size >= EXT4_BG_INODE_BITMAP_CSUM_HI_END)
+                gdp->bg_inode_bitmap_csum_hi = cpu_to_le16(csum >> 16);
+}
+
+int ext4_block_bitmap_csum_verify(struct super_block *sb, ext4_group_t group,
+                                  struct ext4_group_desc *gdp,
+                                  struct buffer_head *bh, int sz)
+{
+        __u32 hi;
+        __u32 provided, calculated;
+        struct ext4_sb_info *sbi = EXT4_SB(sb);
+
+        if (!EXT4_HAS_RO_COMPAT_FEATURE(sb,
+                                        EXT4_FEATURE_RO_COMPAT_METADATA_CSUM))
+                return 1;
+
+        provided = le16_to_cpu(gdp->bg_block_bitmap_csum_lo);
+        calculated = ext4_chksum(sbi, sbi->s_csum_seed, (__u8 *)bh->b_data, sz);
+        if (sbi->s_desc_size >= EXT4_BG_BLOCK_BITMAP_CSUM_HI_END) {
+                hi = le16_to_cpu(gdp->bg_block_bitmap_csum_hi);
+                provided |= (hi << 16);
+        } else
+                calculated &= 0xFFFF;
+
+        if (provided == calculated)
+                return 1;
+
+        ext4_error(sb, "Bad block bitmap checksum: block_group = %u", group);
+        return 0;
+}
+
+void ext4_block_bitmap_csum_set(struct super_block *sb, ext4_group_t group,
+                                struct ext4_group_desc *gdp,
+                                struct buffer_head *bh, int sz)
+{
+        __u32 csum;
+        struct ext4_sb_info *sbi = EXT4_SB(sb);
+
+        if (!EXT4_HAS_RO_COMPAT_FEATURE(sb,
+                        EXT4_FEATURE_RO_COMPAT_METADATA_CSUM))
+                return;
+
+        csum = ext4_chksum(sbi, sbi->s_csum_seed, (__u8 *)bh->b_data, sz);
+        gdp->bg_block_bitmap_csum_lo = cpu_to_le16(csum & 0xFFFF);
+        if (sbi->s_desc_size >= EXT4_BG_BLOCK_BITMAP_CSUM_HI_END)
+                gdp->bg_block_bitmap_csum_hi = cpu_to_le16(csum >> 16);
+}