diff --git a/quota/config.info b/quota/config.info index 28e1456d8..df6bcdd03 100644 --- a/quota/config.info +++ b/quota/config.info @@ -5,7 +5,7 @@ pc_show=Usage percentages to show,1,2-Hard and soft,1-Hard only,0-Soft only sort_mode=Sort users and groups by,1,0-Blocks used,2-Name,1-Order from repquota,3-Hard block quota,4-Soft block quota,5-Percent of hard quota used,6-Percent of soft quota used block_mode=Show quotas in,1,1-Kilobytes (where possible),0-Blocks hide_uids=Show deleted users?,1,0-Yes,1-No -btrfs_mode=Btrfs accounting mode when enabling quotas,15,btrfs_mode +btrfs_mode=Btrfs accounting mode when enabling quotas,4,full-Full accounting, recommended for shared space and snapshots,simple-Simple accounting, lower overhead with original ownership tracking line1.1=Quota email messages,11 email_msg=Email message for users over quota,9,80,5,\t email_subject=Subject for email message to users,3,Default diff --git a/quota/config_info.pl b/quota/config_info.pl index e879f6d35..b9abbf0d0 100755 --- a/quota/config_info.pl +++ b/quota/config_info.pl @@ -1,4 +1,4 @@ -# Build and parse the Btrfs-specific module configuration field. +# Hide Btrfs-specific configuration when it cannot be used. require './quota-lib.pl'; # config_pre_load(info, [order]) @@ -15,22 +15,4 @@ delete($info->{'btrfs_mode'}); @$order = grep { $_ ne "btrfs_mode" } @$order if ($order); } -# show_btrfs_mode(mode) -# Display the accounting mode selector, defaulting unknown values to full mode. -sub show_btrfs_mode -{ -my ($mode) = @_; -$mode = "full" if ($mode ne "simple"); -return &ui_radio("btrfs_mode", $mode, - [ [ "full", $text{'config_btrfs_full'} ], - [ "simple", $text{'config_btrfs_simple'} ] ]); -} - -# parse_btrfs_mode() -# Store only a supported mode and fall back to full accounting otherwise. -sub parse_btrfs_mode -{ -return $in{'btrfs_mode'} eq "simple" ? "simple" : "full"; -} - 1; diff --git a/quota/lang/en b/quota/lang/en index ba00c51f2..6ed06c337 100644 --- a/quota/lang/en +++ b/quota/lang/en @@ -177,9 +177,6 @@ index_btrfs_inconsistent=inconsistent index_btrfs_unavailable=Unavailable index_btrfs_error=Error: $1 -config_btrfs_full=Full accounting (recommended; tracks shared space and snapshots) -config_btrfs_simple=Simple accounting (lower overhead; tracks original ownership only) - btrfs_title=Btrfs Subvolume Quotas btrfs_return=filesystem list btrfs_status_header=Quota status for $1