From: Eric Sandeen <sandeen@redhat.com>
Date: Tue, 3 Apr 2018 16:13:56 +0000 (-0500)
Subject: xfs_repair: remove unused fs_aligned_inodes_allowed
X-Git-Tag: v4.16.0-rc1~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dd17791c7f4668275e66d002d134871f018d8d11;p=thirdparty%2Fxfsprogs-dev.git

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 930ed98b9..d2c58444d 100644
--- 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 1ce51bd33..a0688f815 100644
--- 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 20a587c50..0b1920805 100644
--- 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;