From: Dave Chinner <david@fromorbit.com>
Date: Mon, 19 May 2014 22:57:02 +0000 (+1000)
Subject: Merge branch 'xfs-feature-bit-cleanup' into for-next
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=b70f14e1ffbb47369b1cc2cdf558c3468ae9e484;p=deliverable%2Flinux.git

Merge branch 'xfs-feature-bit-cleanup' into for-next

Conflicts:
	fs/xfs/xfs_inode.c
---

b70f14e1ffbb47369b1cc2cdf558c3468ae9e484
diff --cc fs/xfs/xfs_inode.c
index 6d6b44a508f9,9731977be528..a6115fe1ac94
--- a/fs/xfs/xfs_inode.c
+++ b/fs/xfs/xfs_inode.c
@@@ -3332,40 -3283,9 +3274,9 @@@ xfs_iflush_int
  	if (ip->i_d.di_flushiter == DI_MAX_FLUSH)
  		ip->i_d.di_flushiter = 0;
  
- 	/*
- 	 * If this is really an old format inode and the superblock version
- 	 * has not been updated to support only new format inodes, then
- 	 * convert back to the old inode format.  If the superblock version
- 	 * has been updated, then make the conversion permanent.
- 	 */
- 	ASSERT(ip->i_d.di_version == 1 || xfs_sb_version_hasnlink(&mp->m_sb));
- 	if (ip->i_d.di_version == 1) {
- 		if (!xfs_sb_version_hasnlink(&mp->m_sb)) {
- 			/*
- 			 * Convert it back.
- 			 */
- 			ASSERT(ip->i_d.di_nlink <= XFS_MAXLINK_1);
- 			dip->di_onlink = cpu_to_be16(ip->i_d.di_nlink);
- 		} else {
- 			/*
- 			 * The superblock version has already been bumped,
- 			 * so just make the conversion to the new inode
- 			 * format permanent.
- 			 */
- 			ip->i_d.di_version = 2;
- 			dip->di_version = 2;
- 			ip->i_d.di_onlink = 0;
- 			dip->di_onlink = 0;
- 			memset(&(ip->i_d.di_pad[0]), 0, sizeof(ip->i_d.di_pad));
- 			memset(&(dip->di_pad[0]), 0,
- 			      sizeof(dip->di_pad));
- 			ASSERT(xfs_get_projid(ip) == 0);
- 		}
- 	}
- 
 -	xfs_iflush_fork(ip, dip, iip, XFS_DATA_FORK, bp);
 +	xfs_iflush_fork(ip, dip, iip, XFS_DATA_FORK);
  	if (XFS_IFORK_Q(ip))
 -		xfs_iflush_fork(ip, dip, iip, XFS_ATTR_FORK, bp);
 +		xfs_iflush_fork(ip, dip, iip, XFS_ATTR_FORK);
  	xfs_inobp_check(mp, bp);
  
  	/*