All of lore.kernel.org
 help / color / mirror / Atom feed
From: Eric Sandeen <sandeen@sandeen.net>
To: linux-xfs@vger.kernel.org
Subject: [PATCH 02/10] xfs_repair: remove unused fs_attributes2_allowed
Date: Thu, 29 Mar 2018 10:34:14 -0500	[thread overview]
Message-ID: <1522337662-26260-3-git-send-email-sandeen@sandeen.net> (raw)
In-Reply-To: <1522337662-26260-1-git-send-email-sandeen@sandeen.net>

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


  parent reply	other threads:[~2018-03-29 15:34 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-03-29 15:34 [PATCH 0/10] xfsprogs: remove old cruft Eric Sandeen
2018-03-29 15:34 ` [PATCH 01/10] xfs_repair: remove unused fs_attributes_allowed Eric Sandeen
2018-03-29 15:34 ` Eric Sandeen [this message]
2018-03-29 15:34 ` [PATCH 03/10] xfs_repair: remove unused fs_has_extflgbit_allowed Eric Sandeen
2018-03-29 15:34 ` [PATCH 04/10] xfs_repair: remove unused fs_aligned_inodes_allowed Eric Sandeen
2018-03-29 15:34 ` [PATCH 05/10] xfs_repair: remove unused fs_sb_feature_bits_allowed Eric Sandeen
2018-03-29 15:34 ` [PATCH 06/10] xfs_repair: remove unused fs_has_extflgbit_allowed Eric Sandeen
2018-03-29 15:34 ` [PATCH 07/10] xfs_repair: remove unused fs_shared_allowed variable Eric Sandeen
2018-03-29 15:34 ` [PATCH 08/10] xfs_repair: remove pre_65_beta option Eric Sandeen
2018-03-29 15:34 ` [PATCH 09/10] xfs_repair: test XFS_SB_VERSION_SHAREDBIT only once Eric Sandeen
2018-03-29 15:34 ` [PATCH 10/10] libxfs: warn about deprecation of irix, freebsd, darwin Eric Sandeen
2018-03-29 15:40 ` [PATCH 0/10] xfsprogs: remove old cruft Darrick J. Wong
2018-03-29 15:43 ` [PATCH 11/10] xfsprogs: remove unused delete_attr_ok Eric Sandeen
2018-03-29 15:53   ` Darrick J. Wong

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1522337662-26260-3-git-send-email-sandeen@sandeen.net \
    --to=sandeen@sandeen.net \
    --cc=linux-xfs@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.