[PATCH 0/10] xfsprogs: remove old cruft

[PATCH 0/10] xfsprogs: remove old cruft

[Eric Sandeen]

This is mostly removing old hardcoded "feature" flags which were
settable via the commandline long, long ago but have been lingering
as hardcoded globals since.  Just get rid of them and all the
associated code.

The last 3 remove an option for 20-year-old irix filesystems,
a weirdly triplicated test, and finally adds some #warnings
followed by #error to get the attention of anyone building on
platforms we want to deprecate.

Thanks,
-Eric

[PATCH 01/10] xfs_repair: remove unused fs_attributes_allowed

[Eric Sandeen]

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

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
---
 repair/versions.c   | 23 +++--------------------
 repair/versions.h   |  2 --
 repair/xfs_repair.c |  1 -
 3 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/repair/versions.c b/repair/versions.c
index 978f48b..cbf660d 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 36a5262..354a797 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 6bb8ea2..137a39c 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;
-- 
1.8.3.1

[PATCH 02/10] xfs_repair: remove unused fs_attributes2_allowed

[Eric Sandeen]

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

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
---
 repair/versions.c   | 23 +++--------------------
 repair/versions.h   |  1 -
 repair/xfs_repair.c |  1 -
 3 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/repair/versions.c b/repair/versions.c
index cbf660d..1fe0dbc 100644
--- a/repair/versions.c
+++ b/repair/versions.c
@@ -34,10 +34,8 @@ update_sb_version(xfs_mount_t *mp)
 	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))
@@ -188,23 +186,8 @@ _("Superblock has unknown compat/rocompat/incompat features (0x%x/0x%x/0x%x).\n"
 	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)) {
 		if (!no_modify) {
diff --git a/repair/versions.h b/repair/versions.h
index 354a797..c487976 100644
--- a/repair/versions.h
+++ b/repair/versions.h
@@ -39,7 +39,6 @@
  * options
  */
 
-EXTERN int		fs_attributes2_allowed;
 EXTERN int		fs_quotas_allowed;
 EXTERN int		fs_aligned_inodes_allowed;
 EXTERN int		fs_sb_feature_bits_allowed;
diff --git a/repair/xfs_repair.c b/repair/xfs_repair.c
index 137a39c..006f6cc 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_attributes2_allowed = 1;
 	fs_quotas_allowed = 1;
 	fs_aligned_inodes_allowed = 1;
 	fs_sb_feature_bits_allowed = 1;
-- 
1.8.3.1

[PATCH 03/10] xfs_repair: remove unused fs_has_extflgbit_allowed

[Eric Sandeen]

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

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
---
 repair/versions.c   | 35 ++++++++---------------------------
 repair/versions.h   |  2 --
 repair/xfs_repair.c |  1 -
 3 files changed, 8 insertions(+), 30 deletions(-)

diff --git a/repair/versions.c b/repair/versions.c
index 1fe0dbc..930ed98 100644
--- a/repair/versions.c
+++ b/repair/versions.c
@@ -47,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
@@ -204,33 +202,16 @@ _("WARNING: you have a V1 inode filesystem. It would be converted to a\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))  {
diff --git a/repair/versions.h b/repair/versions.h
index c487976..1ce51bd 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)
- * quotas					(6.2+)
  * aligned inodes				(6.2+)
  *
  * bitmask fields happend after 6.2.
@@ -39,7 +38,6 @@
  * options
  */
 
-EXTERN int		fs_quotas_allowed;
 EXTERN int		fs_aligned_inodes_allowed;
 EXTERN int		fs_sb_feature_bits_allowed;
 EXTERN int		fs_has_extflgbit_allowed;
diff --git a/repair/xfs_repair.c b/repair/xfs_repair.c
index 006f6cc..20a587c 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_quotas_allowed = 1;
 	fs_aligned_inodes_allowed = 1;
 	fs_sb_feature_bits_allowed = 1;
 	fs_has_extflgbit_allowed = 1;
-- 
1.8.3.1

[PATCH 04/10] xfs_repair: remove unused fs_aligned_inodes_allowed

[Eric Sandeen]

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>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
---
 repair/versions.c   | 18 ++----------------
 repair/versions.h   |  2 --
 repair/xfs_repair.c |  1 -
 3 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/repair/versions.c b/repair/versions.c
index 930ed98..d2c5844 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 1ce51bd..a0688f8 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 20a587c..0b19208 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;
-- 
1.8.3.1

[PATCH 05/10] xfs_repair: remove unused fs_sb_feature_bits_allowed

[Eric Sandeen]

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

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
---
 repair/versions.c   | 20 ++------------------
 repair/versions.h   |  3 ---
 repair/xfs_repair.c |  1 -
 3 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/repair/versions.c b/repair/versions.c
index d2c5844..34a3097 100644
--- a/repair/versions.c
+++ b/repair/versions.c
@@ -148,24 +148,8 @@ _("This filesystem contains features not understood by this program.\n"));
 		return(1);
 	}
 
-	if (XFS_SB_VERSION_NUM(sb) >= XFS_SB_VERSION_4)  {
-		if (!fs_sb_feature_bits_allowed)  {
-			if (!no_modify)  {
-				do_warn(
-_("WARNING:  you have disallowed superblock-feature-bits-allowed\n"
-  "\tbut this superblock has feature bits.  The superblock\n"
-  "\twill be downgraded.  This may cause loss of filesystem meta-data\n"));
-			} else   {
-				do_warn(
-_("WARNING:  you have disallowed superblock-feature-bits-allowed\n"
-  "\tbut this superblock has feature bits.  The superblock\n"
-  "\twould be downgraded.  This might cause loss of filesystem\n"
-  "\tmeta-data.\n"));
-			}
-		} else   {
-			fs_sb_feature_bits = 1;
-		}
-	}
+	if (XFS_SB_VERSION_NUM(sb) >= XFS_SB_VERSION_4)
+		fs_sb_feature_bits = 1;
 
 	/* Look for V5 feature flags we don't know about */
 	if (XFS_SB_VERSION_NUM(sb) >= XFS_SB_VERSION_5 &&
diff --git a/repair/versions.h b/repair/versions.h
index a0688f8..94f5775 100644
--- a/repair/versions.h
+++ b/repair/versions.h
@@ -27,8 +27,6 @@
  * possible XFS filesystem features
  *
  * inode version 2 (32-bit link counts)		(6.2)
- *
- * bitmask fields happend after 6.2.
  */
 
 /*
@@ -37,7 +35,6 @@
  * options
  */
 
-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 0b19208..8b81ecc 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_sb_feature_bits_allowed = 1;
 	fs_has_extflgbit_allowed = 1;
 	pre_65_beta = 0;
 	fs_shared_allowed = 1;
-- 
1.8.3.1

[PATCH 06/10] xfs_repair: remove unused fs_has_extflgbit_allowed

[Eric Sandeen]

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

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
---
 repair/versions.c   | 18 +-----------------
 repair/versions.h   |  1 -
 repair/xfs_repair.c |  1 -
 3 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/repair/versions.c b/repair/versions.c
index 34a3097..e33bda2 100644
--- a/repair/versions.c
+++ b/repair/versions.c
@@ -90,8 +90,6 @@ update_sb_version(xfs_mount_t *mp)
 int
 parse_sb_version(xfs_sb_t *sb)
 {
-	int issue_warning;
-
 	fs_attributes = 0;
 	fs_attributes2 = 0;
 	fs_inode_nlink = 1;
@@ -103,7 +101,6 @@ parse_sb_version(xfs_sb_t *sb)
 	have_uquotino = 0;
 	have_gquotino = 0;
 	have_pquotino = 0;
-	issue_warning = 0;
 
 	if (sb->sb_versionnum & XFS_SB_VERSION_SHAREDBIT) {
 		do_warn(_("Shared Version bit set. Not supported. Ever.\n"));
@@ -124,21 +121,8 @@ parse_sb_version(xfs_sb_t *sb)
 	 * ok, check to make sure that the sb isn't newer
 	 * than we are
 	 */
-	if (xfs_sb_version_hasextflgbit(sb))  {
+	if (xfs_sb_version_hasextflgbit(sb))
 		fs_has_extflgbit = 1;
-		if (!fs_has_extflgbit_allowed)  {
-			issue_warning = 1;
-			do_warn(
-			_("This filesystem has uninitialized extent flags.\n"));
-		}
-	}
-
-	if (issue_warning)  {
-		do_warn(
-_("This filesystem uses feature(s) not yet supported in this release.\n"
-  "Please run a more recent version of xfs_repair.\n"));
-		return(1);
-	}
 
 	if (!xfs_sb_good_version(sb))  {
 		do_warn(_("WARNING:  unknown superblock version %d\n"),
diff --git a/repair/versions.h b/repair/versions.h
index 94f5775..8b95fc2 100644
--- a/repair/versions.h
+++ b/repair/versions.h
@@ -35,7 +35,6 @@
  * options
  */
 
-EXTERN int		fs_has_extflgbit_allowed;
 EXTERN int		fs_shared_allowed;
 
 /*
diff --git a/repair/xfs_repair.c b/repair/xfs_repair.c
index 8b81ecc..a2f3f62 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_has_extflgbit_allowed = 1;
 	pre_65_beta = 0;
 	fs_shared_allowed = 1;
 	ag_stride = 0;
-- 
1.8.3.1

[PATCH 07/10] xfs_repair: remove unused fs_shared_allowed variable

[Eric Sandeen]

The fs_shared_allowed global was set to 1 and then ignored, and
in fact the feature is never actualy allowed.  Remove it and
the last stragglers of the old features comment.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
---
 repair/versions.h   | 15 ---------------
 repair/xfs_repair.c |  1 -
 2 files changed, 16 deletions(-)

diff --git a/repair/versions.h b/repair/versions.h
index 8b95fc2..1fac278 100644
--- a/repair/versions.h
+++ b/repair/versions.h
@@ -24,20 +24,6 @@
 #endif /* EXTERN */
 
 /*
- * possible XFS filesystem features
- *
- * inode version 2 (32-bit link counts)		(6.2)
- */
-
-/*
- * filesystem feature global vars, set to 1 if the feature
- * is *allowed*, 0 otherwise.  These can be set via command-line
- * options
- */
-
-EXTERN int		fs_shared_allowed;
-
-/*
  * filesystem feature global vars, set to 1 if the feature
  * is on, 0 otherwise
  */
@@ -49,7 +35,6 @@ EXTERN int		fs_quotas;
 EXTERN int		fs_aligned_inodes;
 EXTERN int		fs_sb_feature_bits;
 EXTERN int		fs_has_extflgbit;
-EXTERN int		fs_shared;
 
 /*
  * inode chunk alignment, fsblocks
diff --git a/repair/xfs_repair.c b/repair/xfs_repair.c
index a2f3f62..3caf9bb 100644
--- a/repair/xfs_repair.c
+++ b/repair/xfs_repair.c
@@ -208,7 +208,6 @@ process_args(int argc, char **argv)
 	sb_unit = 0;
 	sb_width = 0;
 	pre_65_beta = 0;
-	fs_shared_allowed = 1;
 	ag_stride = 0;
 	thread_count = 1;
 	report_interval = PROG_RPT_DEFAULT;
-- 
1.8.3.1

[PATCH 08/10] xfs_repair: remove pre_65_beta option

[Eric Sandeen]

Irix 6.5 was released 20 years ago.  Remove this option from
the code.  (nb: it's not present in the manpage.)

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
---
 repair/globals.h    |  1 -
 repair/xfs_repair.c | 11 -----------
 2 files changed, 12 deletions(-)

diff --git a/repair/globals.h b/repair/globals.h
index c7bbe6f..5192542 100644
--- a/repair/globals.h
+++ b/repair/globals.h
@@ -97,7 +97,6 @@ EXTERN int	dumpcore;		/* abort, not exit on fatal errs */
 EXTERN int	delete_attr_ok;		/* can clear attrs w/o clearing files */
 EXTERN int	force_geo;		/* can set geo on low confidence info */
 EXTERN int	assume_xfs;		/* assume we have an xfs fs */
-EXTERN int	pre_65_beta;		/* fs was mkfs'ed by a version earlier * than 6.5-beta */
 EXTERN char	*log_name;		/* Name of log device */
 EXTERN int	log_spec;		/* Log dev specified as option */
 EXTERN char	*rt_name;		/* Name of realtime device */
diff --git a/repair/xfs_repair.c b/repair/xfs_repair.c
index 3caf9bb..c2106e4 100644
--- a/repair/xfs_repair.c
+++ b/repair/xfs_repair.c
@@ -49,8 +49,6 @@
 static char *o_opts[] = {
 #define ASSUME_XFS	0
 	"assume_xfs",
-#define PRE_65_BETA	1
-	"fs_is_pre_65_beta",
 #define	IHASH_SIZE	2
 	"ihash",
 #define	BHASH_SIZE	3
@@ -207,7 +205,6 @@ process_args(int argc, char **argv)
 	sb_inoalignmt = 0;
 	sb_unit = 0;
 	sb_width = 0;
-	pre_65_beta = 0;
 	ag_stride = 0;
 	thread_count = 1;
 	report_interval = PROG_RPT_DEFAULT;
@@ -235,14 +232,6 @@ process_args(int argc, char **argv)
 						respec('o', o_opts, ASSUME_XFS);
 					assume_xfs = 1;
 					break;
-				case PRE_65_BETA:
-					if (val)
-						noval('o', o_opts, PRE_65_BETA);
-					if (pre_65_beta)
-						respec('o', o_opts,
-							PRE_65_BETA);
-					pre_65_beta = 1;
-					break;
 				case IHASH_SIZE:
 					do_warn(
 		_("-o ihash option has been removed and will be ignored\n"));
-- 
1.8.3.1

[PATCH 09/10] xfs_repair: test XFS_SB_VERSION_SHAREDBIT only once

[Eric Sandeen]

Remove 2 of the 3 identical tests for XFS_SB_VERSION_SHAREDBIT

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
---
 repair/versions.c | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/repair/versions.c b/repair/versions.c
index e33bda2..e96ee5c 100644
--- a/repair/versions.c
+++ b/repair/versions.c
@@ -107,16 +107,6 @@ parse_sb_version(xfs_sb_t *sb)
 		return 1;
 	}
 
-	if (sb->sb_versionnum & XFS_SB_VERSION_SHAREDBIT) {
-		do_warn(_("Shared Version bit set. Not supported. Ever.\n"));
-		return 1;
-	}
-
-	if (sb->sb_versionnum & XFS_SB_VERSION_SHAREDBIT) {
-		do_warn(_("Shared Version bit set. Not supported. Ever.\n"));
-		return 1;
-	}
-
 	/*
 	 * ok, check to make sure that the sb isn't newer
 	 * than we are
-- 
1.8.3.1

[PATCH 10/10] libxfs: warn about deprecation of irix, freebsd, darwin

[Eric Sandeen]

It's not clear that anyone is using these platforms or if
they even build at this point.  Get someone's attention if
they are trying to use it.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
---
 libxfs/darwin.c  | 4 ++++
 libxfs/freebsd.c | 4 ++++
 libxfs/irix.c    | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/libxfs/darwin.c b/libxfs/darwin.c
index 16d2c35..396477e 100644
--- a/libxfs/darwin.c
+++ b/libxfs/darwin.c
@@ -26,6 +26,10 @@
 int platform_has_uuid = 1;
 extern char *progname;
 
+#warning "Darwin support is deprecated and planned for removal in July 2018"
+#warning "Contact linux-xfs@vger.kernel.org if you'd like to maintain this port"
+#error   "Remove this line if you'd like to continue the build"
+
 int
 platform_check_ismounted(char *name, char *block, struct stat *s, int verbose)
 {
diff --git a/libxfs/freebsd.c b/libxfs/freebsd.c
index 5b9ef29..d9fc837 100644
--- a/libxfs/freebsd.c
+++ b/libxfs/freebsd.c
@@ -26,6 +26,10 @@
 int platform_has_uuid = 1;
 extern char *progname;
 
+#warning "FreeBSD support is deprecated and planned for removal in July 2018"
+#warning "Contact linux-xfs@vger.kernel.org if you'd like to maintain this port"
+#error   "Remove this line if you'd like to continue the build"
+
 int
 platform_check_ismounted(char *name, char *block, struct stat *s, int verbose)
 {
diff --git a/libxfs/irix.c b/libxfs/irix.c
index 0f14aec..4ad68d5 100644
--- a/libxfs/irix.c
+++ b/libxfs/irix.c
@@ -24,6 +24,10 @@ int platform_has_uuid = 0;
 extern char *progname;
 extern int64_t findsize(char *);
 
+#warning "IRIX support is deprecated and planned for removal in July 2018"
+#warning "Contact linux-xfs@vger.kernel.org if you'd like to maintain this port"
+#error   "Remove this line if you'd like to continue the build"
+
 int
 platform_check_ismounted(char *name, char *block, struct stat *s, int verbose)
 {
-- 
1.8.3.1

Re: [PATCH 0/10] xfsprogs: remove old cruft

[Darrick J. Wong]

On Thu, Mar 29, 2018 at 10:34:12AM -0500, Eric Sandeen wrote:
> This is mostly removing old hardcoded "feature" flags which were
> settable via the commandline long, long ago but have been lingering
> as hardcoded globals since.  Just get rid of them and all the
> associated code.
> 
> The last 3 remove an option for 20-year-old irix filesystems,
> a weirdly triplicated test, and finally adds some #warnings
> followed by #error to get the attention of anyone building on
> platforms we want to deprecate.
> 
> Thanks,
> -Eric

Yay cruft dumping!  For the whole series,
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>

--D

> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 11/10] xfsprogs: remove unused delete_attr_ok

[Eric Sandeen]

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

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
---

diff --git a/repair/dinode.c b/repair/dinode.c
index 07bcf80..9af4f05 100644
--- a/repair/dinode.c
+++ b/repair/dinode.c
@@ -2093,14 +2093,9 @@ process_inode_attr_fork(
 		do_warn(_("bad attribute fork in inode %" PRIu64), lino);
 
 		if (!no_modify)  {
-			if (delete_attr_ok)  {
-				do_warn(_(", clearing attr fork\n"));
-				*dirty += clear_dinode_attr(mp, dino, lino);
-				dino->di_aformat = XFS_DINODE_FMT_LOCAL;
-			} else  {
-				do_warn("\n");
-				*dirty += clear_dinode(mp, dino, lino);
-			}
+			do_warn(_(", clearing attr fork\n"));
+			*dirty += clear_dinode_attr(mp, dino, lino);
+			dino->di_aformat = XFS_DINODE_FMT_LOCAL;
 			ASSERT(*dirty > 0);
 		} else  {
 			do_warn(_(", would clear attr fork\n"));
@@ -2111,7 +2106,7 @@ process_inode_attr_fork(
 		blkmap_free(ablkmap);
 		*retval = 1;
 
-		return delete_attr_ok ? 0 : 1;
+		return 0;
 	}
 
 	if (check_dups)  {
diff --git a/repair/globals.h b/repair/globals.h
index 5192542..e777ba2 100644
--- a/repair/globals.h
+++ b/repair/globals.h
@@ -94,7 +94,6 @@ EXTERN int	dangerously;		/* live dangerously ... fix ro mount */
 EXTERN int	isa_file;
 EXTERN int	zap_log;
 EXTERN int	dumpcore;		/* abort, not exit on fatal errs */
-EXTERN int	delete_attr_ok;		/* can clear attrs w/o clearing files */
 EXTERN int	force_geo;		/* can set geo on low confidence info */
 EXTERN int	assume_xfs;		/* assume we have an xfs fs */
 EXTERN char	*log_name;		/* Name of log device */
diff --git a/repair/xfs_repair.c b/repair/xfs_repair.c
index c2106e4..b2a2432 100644
--- a/repair/xfs_repair.c
+++ b/repair/xfs_repair.c
@@ -198,7 +198,6 @@ process_args(int argc, char **argv)
 	zap_log = 0;
 	dumpcore = 0;
 	full_ino_ex_data = 0;
-	delete_attr_ok = 1;
 	force_geo = 0;
 	assume_xfs = 0;
 	copied_sunit = 0;

Re: [PATCH 11/10] xfsprogs: remove unused delete_attr_ok

[Darrick J. Wong]

On Thu, Mar 29, 2018 at 10:43:02AM -0500, Eric Sandeen wrote:
> delete_attr_ok 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>

--D

> ---
> 
> diff --git a/repair/dinode.c b/repair/dinode.c
> index 07bcf80..9af4f05 100644
> --- a/repair/dinode.c
> +++ b/repair/dinode.c
> @@ -2093,14 +2093,9 @@ process_inode_attr_fork(
>  		do_warn(_("bad attribute fork in inode %" PRIu64), lino);
>  
>  		if (!no_modify)  {
> -			if (delete_attr_ok)  {
> -				do_warn(_(", clearing attr fork\n"));
> -				*dirty += clear_dinode_attr(mp, dino, lino);
> -				dino->di_aformat = XFS_DINODE_FMT_LOCAL;
> -			} else  {
> -				do_warn("\n");
> -				*dirty += clear_dinode(mp, dino, lino);
> -			}
> +			do_warn(_(", clearing attr fork\n"));
> +			*dirty += clear_dinode_attr(mp, dino, lino);
> +			dino->di_aformat = XFS_DINODE_FMT_LOCAL;
>  			ASSERT(*dirty > 0);
>  		} else  {
>  			do_warn(_(", would clear attr fork\n"));
> @@ -2111,7 +2106,7 @@ process_inode_attr_fork(
>  		blkmap_free(ablkmap);
>  		*retval = 1;
>  
> -		return delete_attr_ok ? 0 : 1;
> +		return 0;
>  	}
>  
>  	if (check_dups)  {
> diff --git a/repair/globals.h b/repair/globals.h
> index 5192542..e777ba2 100644
> --- a/repair/globals.h
> +++ b/repair/globals.h
> @@ -94,7 +94,6 @@ EXTERN int	dangerously;		/* live dangerously ... fix ro mount */
>  EXTERN int	isa_file;
>  EXTERN int	zap_log;
>  EXTERN int	dumpcore;		/* abort, not exit on fatal errs */
> -EXTERN int	delete_attr_ok;		/* can clear attrs w/o clearing files */
>  EXTERN int	force_geo;		/* can set geo on low confidence info */
>  EXTERN int	assume_xfs;		/* assume we have an xfs fs */
>  EXTERN char	*log_name;		/* Name of log device */
> diff --git a/repair/xfs_repair.c b/repair/xfs_repair.c
> index c2106e4..b2a2432 100644
> --- a/repair/xfs_repair.c
> +++ b/repair/xfs_repair.c
> @@ -198,7 +198,6 @@ process_args(int argc, char **argv)
>  	zap_log = 0;
>  	dumpcore = 0;
>  	full_ino_ex_data = 0;
> -	delete_attr_ok = 1;
>  	force_geo = 0;
>  	assume_xfs = 0;
>  	copied_sunit = 0;
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html