summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2005-01-27 19:12:05 -0500
committerTheodore Ts'o <tytso@mit.edu>2005-01-27 19:12:05 -0500
commit8430203590b285aec03706ad05cab261c8011104 (patch)
tree711013104799bacfea7e23fa7a6c2b39c8d193a9 /misc
parent20953129e6d280c3bb46ced5e8cab18faeca7cbc (diff)
downloade2fsprogs-8430203590b285aec03706ad05cab261c8011104.tar.gz
mke2fs.c (PRS): Don't use a blocksize greater than 4k, even on
2.6 kernels, unless explicitly requested by the user; not all 2.6 kernels (includeing stock 2.6 kernels as of this writing) don't support blocksizes > 4k.
Diffstat (limited to 'misc')
-rw-r--r--misc/ChangeLog5
-rw-r--r--misc/mke2fs.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/misc/ChangeLog b/misc/ChangeLog
index 65387a14..33fffb3a 100644
--- a/misc/ChangeLog
+++ b/misc/ChangeLog
@@ -1,5 +1,10 @@
2005-01-27 Theodore Ts'o <tytso@mit.edu>
+ * mke2fs.c (PRS): Don't use a blocksize greater than 4k, even on
+ 2.6 kernels, unless explicitly requested by the user; not
+ all 2.6 kernels (includeing stock 2.6 kernels as of this
+ writing) don't support blocksizes > 4k.
+
* mke2fs.c (PRS): If the device size is too big to be expressed
using a 1k blocksize, retry with a 4k blocksize.
(Addresses Sourceforge bug #1106631)
diff --git a/misc/mke2fs.c b/misc/mke2fs.c
index 4a428e74..03d163bd 100644
--- a/misc/mke2fs.c
+++ b/misc/mke2fs.c
@@ -166,8 +166,8 @@ struct mke2fs_defaults {
{ default_str, 3, 1024, 8192 },
{ "journal", 0, 4096, 8192 },
{ "news", 0, 4096, 4096 },
- { "largefile", 0, DEF_MAX_BLOCKSIZE, 1024 * 1024 },
- { "largefile4", 0, DEF_MAX_BLOCKSIZE, 4096 * 1024 },
+ { "largefile", 0, 4096, 1024 * 1024 },
+ { "largefile4", 0, 4096, 4096 * 1024 },
{ 0, 0, 0, 0},
};