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

xfs_repair: remove unused fs_attributes_allowed

fs_attributes_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 978f48b84..cbf660d2e 100644
--- a/repair/versions.c
+++ b/repair/versions.c
@@ -31,10 +31,8 @@ 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);
@@ -187,23 +185,8 @@ _("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)  {
diff --git a/repair/versions.h b/repair/versions.h
index 36a526229..354a79709 100644
--- a/repair/versions.h
+++ b/repair/versions.h
@@ -26,7 +26,6 @@
 /*
  * possible XFS filesystem features
  *
- * attributes					(6.2)
  * inode version 2 (32-bit link counts)		(6.2)
  * quotas					(6.2+)
  * aligned inodes				(6.2+)
@@ -40,7 +39,6 @@
  * options
  */
 
-EXTERN int		fs_attributes_allowed;
 EXTERN int		fs_attributes2_allowed;
 EXTERN int		fs_quotas_allowed;
 EXTERN int		fs_aligned_inodes_allowed;
diff --git a/repair/xfs_repair.c b/repair/xfs_repair.c
index 6bb8ea26f..137a39c4b 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_attributes_allowed = 1;
 	fs_attributes2_allowed = 1;
 	fs_quotas_allowed = 1;
 	fs_aligned_inodes_allowed = 1;