aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Sterba <dsterba@suse.cz>2013-04-09 19:11:36 +0200
committerDavid Sterba <dsterba@suse.cz>2013-04-23 18:56:21 +0200
commita90354c5a108dba7c7b34b55b7ecd2e9005e751b (patch)
tree87c465a4c6db0555770394a0545b6e43e3cb9d52
parent7b20da8d525d11dabc98bdd49efef7b8be5576ab (diff)
btrfs-progs: revert skinny extents changes from mkfs
We are going to unify enabling filesystem features via option -O. For now, use btrfstune to enable the features. Signed-off-by: David Sterba <dsterba@suse.cz>
-rw-r--r--man/mkfs.btrfs.8.in8
-rw-r--r--mkfs.c11
2 files changed, 1 insertions, 18 deletions
diff --git a/man/mkfs.btrfs.8.in b/man/mkfs.btrfs.8.in
index 05180f8..a3f1503 100644
--- a/man/mkfs.btrfs.8.in
+++ b/man/mkfs.btrfs.8.in
@@ -17,7 +17,6 @@ mkfs.btrfs \- create a btrfs filesystem
[ \fB\-K\fP ]
[ \fB\-h\fP ]
[ \fB\-V\fP ]
-[ \fB\-x\fP\fI skinny-extents\fP ]
\fI device\fP [ \fIdevice ...\fP ]
.SH DESCRIPTION
.B mkfs.btrfs
@@ -80,13 +79,6 @@ Do not perform whole device TRIM operation by default.
.TP
\fB\-V\fR, \fB\-\-version\fR
Print the \fBmkfs.btrfs\fP version and exit.
-.TP
-\fB\-x\fR, \fB\-\-skinny\-extents\fR
-Use the new skinny extents disk format. This is an non-backwards compatible
-format change. This allows btrfs to use a smaller item for describing
-metadata blocks in the extent tree. This results in a 30% savings in the
-extent tree size, which improves performance on file systems with lots of
-metadata.
.SH UNIT
As default the unit is the byte, however it is possible to append a suffix
to the arguments like \fBk\fP for KBytes, \fBm\fP for MBytes...
diff --git a/mkfs.c b/mkfs.c
index 01180c3..717c68f 100644
--- a/mkfs.c
+++ b/mkfs.c
@@ -337,7 +337,6 @@ static void print_usage(void)
fprintf(stderr, "\t -r --rootdir the source directory\n");
fprintf(stderr, "\t -K --nodiscard do not perform whole device TRIM\n");
fprintf(stderr, "\t -V --version print the mkfs.btrfs version and exit\n");
- fprintf(stderr, "\t -x --skinny-extents use the new skinny extent disk format");
fprintf(stderr, "%s\n", BTRFS_BUILD_VERSION);
exit(1);
}
@@ -398,7 +397,6 @@ static struct option long_options[] = {
{ "version", 0, NULL, 'V' },
{ "rootdir", 1, NULL, 'r' },
{ "nodiscard", 0, NULL, 'K' },
- { "skinny-extents", 0, NULL, 'x'},
{ 0, 0, 0, 0}
};
@@ -1291,7 +1289,6 @@ int main(int ac, char **av)
int nodiscard = 0;
int ssd = 0;
int force_overwrite = 0;
- int skinny_meta_extents = 0;
char *source_dir = NULL;
int source_dir_set = 0;
@@ -1307,7 +1304,7 @@ int main(int ac, char **av)
while(1) {
int c;
- c = getopt_long(ac, av, "A:b:fl:n:s:m:d:L:r:VMKx",
+ c = getopt_long(ac, av, "A:b:fl:n:s:m:d:L:r:VMK",
long_options, &option_index);
if (c < 0)
break;
@@ -1359,9 +1356,6 @@ int main(int ac, char **av)
case 'K':
nodiscard=1;
break;
- case 'x':
- skinny_meta_extents = 1;
- break;
default:
print_usage();
}
@@ -1539,9 +1533,6 @@ raid_groups:
if (mixed)
flags |= BTRFS_FEATURE_INCOMPAT_MIXED_GROUPS;
- if (skinny_meta_extents)
- flags |= BTRFS_FEATURE_INCOMPAT_SKINNY_METADATA;
-
btrfs_set_super_incompat_flags(super, flags);
if ((data_profile | metadata_profile) &