xfs_repair: remove unused fs_aligned_inodes_allowed

[thirdparty/xfsprogs-dev.git] / repair / versions.c

diff --git a/repair/versions.c b/repair/versions.c
index fb1b3e428a833370506ef4ffc5f1faa7f64c27b8..d2c58444d42be1099d675674a7de10068a663108 100644 (file)
--- a/repair/versions.c
+++ b/repair/versions.c
@@ -31,15 +31,11 @@ update_sb_version(xfs_mount_t *mp)
 
        sb = &mp->m_sb;
 
-       if (fs_attributes && !xfs_sb_version_hasattr(sb))  {
-               ASSERT(fs_attributes_allowed);
+       if (fs_attributes && !xfs_sb_version_hasattr(sb))
                xfs_sb_version_addattr(sb);
-       }
 
-       if (fs_attributes2 && !xfs_sb_version_hasattr2(sb))  {
-               ASSERT(fs_attributes2_allowed);
+       if (fs_attributes2 && !xfs_sb_version_hasattr2(sb))
                xfs_sb_version_addattr2(sb);
-       }
 
        /* V2 inode conversion is now always going to happen */
        if (!(sb->sb_versionnum & XFS_SB_VERSION_NLINKBIT))
@@ -51,10 +47,8 @@ update_sb_version(xfs_mount_t *mp)
         * have quotas.
         */
        if (fs_quotas)  {
-               if (!xfs_sb_version_hasquota(sb))  {
-                       ASSERT(fs_quotas_allowed);
+               if (!xfs_sb_version_hasquota(sb))
                        xfs_sb_version_addquota(sb);
-               }
 
                /*
                 * protect against stray bits in the quota flag field
@@ -84,7 +78,7 @@ update_sb_version(xfs_mount_t *mp)
                }
        }
 
-       if (!fs_aligned_inodes && xfs_sb_version_hasalign(sb))  
+       if (!fs_aligned_inodes && xfs_sb_version_hasalign(sb))
                sb->sb_versionnum &= ~XFS_SB_VERSION_ALIGNBIT;
 }
 
@@ -187,96 +181,42 @@ _("Superblock has unknown compat/rocompat/incompat features (0x%x/0x%x/0x%x).\n"
                return 1;
        }
 
-       if (xfs_sb_version_hasattr(sb))  {
-               if (!fs_attributes_allowed)  {
-                       if (!no_modify)  {
-                               do_warn(
-_("WARNING:  you have disallowed attributes but this filesystem\n"
-  "\thas attributes.  The filesystem will be downgraded and\n"
-  "\tall attributes will be removed.\n"));
-                       } else  {
-                               do_warn(
-_("WARNING:  you have disallowed attributes but this filesystem\n"
-  "\thas attributes.  The filesystem would be downgraded and\n"
-  "\tall attributes would be removed.\n"));
-                       }
-               } else   {
-                       fs_attributes = 1;
-               }
-       }
+       if (xfs_sb_version_hasattr(sb))
+               fs_attributes = 1;
 
-       if (xfs_sb_version_hasattr2(sb))  {
-               if (!fs_attributes2_allowed)  {
-                       if (!no_modify)  {
-                               do_warn(
-_("WARNING:  you have disallowed attr2 attributes but this filesystem\n"
-  "\thas attributes.  The filesystem will be downgraded and\n"
-  "\tall attr2 attributes will be removed.\n"));
-                       } else  {
-                               do_warn(
-_("WARNING:  you have disallowed attr2 attributes but this filesystem\n"
-  "\thas attributes.  The filesystem would be downgraded and\n"
-  "\tall attr2 attributes would be removed.\n"));
-                       }
-               } else   {
-                       fs_attributes2 = 1;
-               }
-       }
+       if (xfs_sb_version_hasattr2(sb))
+               fs_attributes2 = 1;
 
        if (!(sb->sb_versionnum & XFS_SB_VERSION_NLINKBIT)) {
-               do_warn(
-_("WARNING: you have a V1 inode filesystem. It %s be converted to a\n"
+               if (!no_modify) {
+                       do_warn(
+_("WARNING: you have a V1 inode filesystem. It will be converted to a\n"
   "\tversion 2 inode filesystem. If you do not want this, run an older\n"
-  "\tversion of xfs_repair.\n"), no_modify ? "would" : "will");
+  "\tversion of xfs_repair.\n"));
+               } else  {
+                       do_warn(
+_("WARNING: you have a V1 inode filesystem. It would be converted to a\n"
+  "\tversion 2 inode filesystem. If you do not want this, run an older\n"
+  "\tversion of xfs_repair.\n"));
+               }
        }
 
        if (xfs_sb_version_hasquota(sb))  {
-               if (!fs_quotas_allowed)  {
-                       if (!no_modify)  {
-                               do_warn(
-_("WARNING:  you have disallowed quotas but this filesystem\n"
-  "\thas quotas.  The filesystem will be downgraded and\n"
-  "\tall quota information will be removed.\n"));
-                       } else  {
-                               do_warn(
-_("WARNING:  you have disallowed quotas but this filesystem\n"
-  "\thas quotas.  The filesystem would be downgraded and\n"
-  "\tall quota information would be removed.\n"));
-                       }
-               } else   {
-                       fs_quotas = 1;
+               fs_quotas = 1;
 
-                       if (sb->sb_uquotino != 0 &&
-                                       sb->sb_uquotino != NULLFSINO)
-                               have_uquotino = 1;
+               if (sb->sb_uquotino != 0 && sb->sb_uquotino != NULLFSINO)
+                       have_uquotino = 1;
 
-                       if (sb->sb_gquotino != 0 &&
-                                       sb->sb_gquotino != NULLFSINO)
-                               have_gquotino = 1;
+               if (sb->sb_gquotino != 0 && sb->sb_gquotino != NULLFSINO)
+                       have_gquotino = 1;
 
-                       if (sb->sb_pquotino != 0 &&
-                                       sb->sb_pquotino != NULLFSINO)
-                               have_pquotino = 1;
-               }
+               if (sb->sb_pquotino != 0 && sb->sb_pquotino != NULLFSINO)
+                       have_pquotino = 1;
        }
 
        if (xfs_sb_version_hasalign(sb))  {
-               if (fs_aligned_inodes_allowed)  {
-                       fs_aligned_inodes = 1;
-                       fs_ino_alignment = sb->sb_inoalignmt;
-               } else   {
-                       if (!no_modify)  {
-                               do_warn(
-_("WARNING:  you have disallowed aligned inodes but this filesystem\n"
-  "\thas aligned inodes.  The filesystem will be downgraded.\n"
-  "\tThis will permanently degrade the performance of this filesystem.\n"));
-                       } else  {
-                               do_warn(
-_("WARNING:  you have disallowed aligned inodes but this filesystem\n"
-  "\thas aligned inodes.  The filesystem would be downgraded.\n"
-  "\tThis would permanently degrade the performance of this filesystem.\n"));
-                       }
-               }
+               fs_aligned_inodes = 1;
+               fs_ino_alignment = sb->sb_inoalignmt;
        }
 
        /*