From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 1 Jun 2012 17:12:15 +0000 (-0700)
Subject: Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso... 
X-Git-Tag: firefly_0821_release~3680^2~2694
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=firefly-linux-kernel-4.4.55.git;a=commitdiff_plain;h=4edebed86690eb8db9af3ab85baf4a34e73266cc

Merge tag 'ext4_for_linus' of git://git./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
  ...
---

4edebed86690eb8db9af3ab85baf4a34e73266cc
diff --cc fs/ext4/inode.c
index 07eaf565fdcb,fc083e87c231..02bc8cbe7281
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@@ -3646,15 -3710,46 +3712,48 @@@ struct inode *ext4_iget(struct super_bl
  	if (ret < 0)
  		goto bad_inode;
  	raw_inode = ext4_raw_inode(&iloc);
+ 
+ 	if (EXT4_INODE_SIZE(inode->i_sb) > EXT4_GOOD_OLD_INODE_SIZE) {
+ 		ei->i_extra_isize = le16_to_cpu(raw_inode->i_extra_isize);
+ 		if (EXT4_GOOD_OLD_INODE_SIZE + ei->i_extra_isize >
+ 		    EXT4_INODE_SIZE(inode->i_sb)) {
+ 			EXT4_ERROR_INODE(inode, "bad extra_isize (%u != %u)",
+ 				EXT4_GOOD_OLD_INODE_SIZE + ei->i_extra_isize,
+ 				EXT4_INODE_SIZE(inode->i_sb));
+ 			ret = -EIO;
+ 			goto bad_inode;
+ 		}
+ 	} else
+ 		ei->i_extra_isize = 0;
+ 
+ 	/* Precompute checksum seed for inode metadata */
+ 	if (EXT4_HAS_RO_COMPAT_FEATURE(sb,
+ 			EXT4_FEATURE_RO_COMPAT_METADATA_CSUM)) {
+ 		struct ext4_sb_info *sbi = EXT4_SB(inode->i_sb);
+ 		__u32 csum;
+ 		__le32 inum = cpu_to_le32(inode->i_ino);
+ 		__le32 gen = raw_inode->i_generation;
+ 		csum = ext4_chksum(sbi, sbi->s_csum_seed, (__u8 *)&inum,
+ 				   sizeof(inum));
+ 		ei->i_csum_seed = ext4_chksum(sbi, csum, (__u8 *)&gen,
+ 					      sizeof(gen));
+ 	}
+ 
+ 	if (!ext4_inode_csum_verify(inode, raw_inode, ei)) {
+ 		EXT4_ERROR_INODE(inode, "checksum invalid");
+ 		ret = -EIO;
+ 		goto bad_inode;
+ 	}
+ 
  	inode->i_mode = le16_to_cpu(raw_inode->i_mode);
 -	inode->i_uid = (uid_t)le16_to_cpu(raw_inode->i_uid_low);
 -	inode->i_gid = (gid_t)le16_to_cpu(raw_inode->i_gid_low);
 +	i_uid = (uid_t)le16_to_cpu(raw_inode->i_uid_low);
 +	i_gid = (gid_t)le16_to_cpu(raw_inode->i_gid_low);
  	if (!(test_opt(inode->i_sb, NO_UID32))) {
 -		inode->i_uid |= le16_to_cpu(raw_inode->i_uid_high) << 16;
 -		inode->i_gid |= le16_to_cpu(raw_inode->i_gid_high) << 16;
 +		i_uid |= le16_to_cpu(raw_inode->i_uid_high) << 16;
 +		i_gid |= le16_to_cpu(raw_inode->i_gid_high) << 16;
  	}
 +	i_uid_write(inode, i_uid);
 +	i_gid_write(inode, i_gid);
  	set_nlink(inode, le16_to_cpu(raw_inode->i_links_count));
  
  	ext4_clear_state_flags(ei);	/* Only relevant on 32-bit archs */
diff --cc fs/ext4/super.c
index 35b5954489ee,b8d5fc10d8c0..eb7aa3e4ef05
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@@ -2993,9 -3107,10 +3121,10 @@@ static int ext4_fill_super(struct super
  		goto out_free_orig;
  	}
  	sb->s_fs_info = sbi;
+ 	sbi->s_sb = sb;
  	sbi->s_mount_opt = 0;
 -	sbi->s_resuid = EXT4_DEF_RESUID;
 -	sbi->s_resgid = EXT4_DEF_RESGID;
 +	sbi->s_resuid = make_kuid(&init_user_ns, EXT4_DEF_RESUID);
 +	sbi->s_resgid = make_kgid(&init_user_ns, EXT4_DEF_RESGID);
  	sbi->s_inode_readahead_blks = EXT4_DEF_INODE_READAHEAD_BLKS;
  	sbi->s_sb_block = sb_block;
  	if (sb->s_bdev->bd_part)