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

Conflicts:
	fs/xfs/xfs_inode.c

diff --cc fs/xfs/xfs_dir2.c
Simple merge

diff --cc fs/xfs/xfs_fsops.c
Simple merge

diff --cc fs/xfs/xfs_ialloc.c
Simple merge

diff --cc fs/xfs/xfs_inode.c
index 6d6b44a508f951071fb3cc5fb46ef40ddb0011d8,9731977be528f43db1f59b228ed45d5a4484f0e4..a6115fe1ac948a4b57efb6bf00830bb9a4845ed6
--- 1/fs/xfs/xfs_inode.c
--- 2/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);
  
        /*

diff --cc fs/xfs/xfs_inode.h
Simple merge

diff --cc fs/xfs/xfs_ioctl.c
Simple merge

diff --cc fs/xfs/xfs_sb.h
Simple merge