diff options
| author | Eric Sandeen <sandeen@redhat.com> | 2018-04-03 11:13:56 -0500 |
|---|---|---|
| committer | Eric Sandeen <sandeen@sandeen.net> | 2018-04-03 11:13:56 -0500 |
| commit | 644589b162bfb7181708903288f7ee237da0adff (patch) | |
| tree | 49c4f9bc3721576bf4f9f43940dd592f226dfc7c | |
| parent | dd17791c7f4668275e66d002d134871f018d8d11 (diff) | |
| download | xfsprogs-dev-644589b162bfb7181708903288f7ee237da0adff.tar.gz | |
xfs_repair: remove unused fs_sb_feature_bits_allowed
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>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
| -rw-r--r-- | repair/versions.c | 20 | ||||
| -rw-r--r-- | repair/versions.h | 3 | ||||
| -rw-r--r-- | repair/xfs_repair.c | 1 |
3 files changed, 2 insertions, 22 deletions
diff --git a/repair/versions.c b/repair/versions.c index d2c58444d4..34a3097326 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 a0688f8151..94f5775853 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 0b1920805f..8b81ecc070 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; |