xfs_repair: remove unused fs_aligned_inodes_allowed

fs_aligned_inodes_allowed is never set to anything but 1;
remove it and all associated code.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/repair/versions.c b/repair/versions.c
index 930ed98b93918bec7f1d1e420cf05601a465aa9c..d2c58444d42be1099d675674a7de10068a663108 100644 (file)
--- a/repair/versions.c
+++ b/repair/versions.c
@@ -215,22 +215,8 @@ _("WARNING: you have a V1 inode filesystem. It would be converted to a\n"
        }
 
        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;
        }
 
        /*

diff --git a/repair/versions.h b/repair/versions.h
index 1ce51bd33c83662fedcf410f1f89978d4cd03c9c..a0688f815156e1f9fa74ce4a779074053787d407 100644 (file)
--- a/repair/versions.h
+++ b/repair/versions.h
@@ -27,7 +27,6 @@
  * possible XFS filesystem features
  *
  * inode version 2 (32-bit link counts)                (6.2)
- * aligned inodes                              (6.2+)
  *
  * bitmask fields happend after 6.2.
  */
@@ -38,7 +37,6 @@
  * options
  */
 
-EXTERN int             fs_aligned_inodes_allowed;
 EXTERN int             fs_sb_feature_bits_allowed;
 EXTERN int             fs_has_extflgbit_allowed;
 EXTERN int             fs_shared_allowed;

diff --git a/repair/xfs_repair.c b/repair/xfs_repair.c
index 20a587c506de09579716ce7c791b42caf1588d01..0b1920805f26facd2cb811db73c8e38e790921b9 100644 (file)
--- a/repair/xfs_repair.c
+++ b/repair/xfs_repair.c
@@ -207,7 +207,6 @@ process_args(int argc, char **argv)
        sb_inoalignmt = 0;
        sb_unit = 0;
        sb_width = 0;
-       fs_aligned_inodes_allowed = 1;
        fs_sb_feature_bits_allowed = 1;
        fs_has_extflgbit_allowed = 1;
        pre_65_beta = 0;