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 | 99a1e0dac339c2c2885ba26371923570f7032654 (patch) | |
| tree | 697fb637cc02369faa120228cb1372fc84a4b191 | |
| parent | 232470f233c24676414a1d3ad433d0429f7f3241 (diff) | |
| download | xfsprogs-dev-99a1e0dac339c2c2885ba26371923570f7032654.tar.gz | |
xfs_repair: remove unused fs_has_extflgbit_allowed
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>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
| -rw-r--r-- | repair/versions.c | 35 | ||||
| -rw-r--r-- | repair/versions.h | 2 | ||||
| -rw-r--r-- | repair/xfs_repair.c | 1 |
3 files changed, 8 insertions, 30 deletions
diff --git a/repair/versions.c b/repair/versions.c index 1fe0dbc990..930ed98b93 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 c4879762eb..1ce51bd33c 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 006f6cccb8..20a587c506 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; |