Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/util-linux/mkfs_ext2.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

• branches/3.2/mindi-busybox/util-linux/mkfs_ext2.c (modified) (3 diffs)

branches/3.2/mindi-busybox/util-linux/mkfs_ext2.c

@@ -8 +8 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
+
+//usage:#define mkfs_ext2_trivial_usage
+//usage:       "[-Fn] "
+/* //usage:    "[-c|-l filename] " */
+//usage:       "[-b BLK_SIZE] "
+/* //usage:    "[-f fragment-size] [-g blocks-per-group] " */
+//usage:       "[-i INODE_RATIO] [-I INODE_SIZE] "
+/* //usage:    "[-j] [-J journal-options] [-N number-of-inodes] " */
+//usage:       "[-m RESERVED_PERCENT] "
+/* //usage:    "[-o creator-os] [-O feature[,...]] [-q] " */
+/* //usage:    "[r fs-revision-level] [-E extended-options] [-v] [-F] " */
+//usage:       "[-L LABEL] "
+/* //usage:    "[-M last-mounted-directory] [-S] [-T filesystem-type] " */
+//usage:       "BLOCKDEV [KBYTES]"
+//usage:#define mkfs_ext2_full_usage "\n\n"
+//usage:       "    -b BLK_SIZE Block size, bytes"
+/* //usage:  "\n    -c      Check device for bad blocks" */
+/* //usage:  "\n    -E opts     Set extended options" */
+/* //usage:  "\n    -f size     Fragment size in bytes" */
+//usage:     "\n    -F      Force"
+/* //usage:  "\n    -g N        Number of blocks in a block group" */
+//usage:     "\n    -i RATIO    Max number of files is filesystem_size / RATIO"
+//usage:     "\n    -I BYTES    Inode size (min 128)"
+/* //usage:  "\n    -j      Create a journal (ext3)" */
+/* //usage:  "\n    -J opts     Set journal options (size/device)" */
+/* //usage:  "\n    -l file     Read bad blocks list from file" */
+//usage:     "\n    -L LBL      Volume label"
+//usage:     "\n    -m PERCENT  Percent of blocks to reserve for admin"
+/* //usage:  "\n    -M dir      Set last mounted directory" */
+//usage:     "\n    -n      Dry run"
+/* //usage:  "\n    -N N        Number of inodes to create" */
+/* //usage:  "\n    -o os       Set the 'creator os' field" */
+/* //usage:  "\n    -O features Dir_index/filetype/has_journal/journal_dev/sparse_super" */
+/* //usage:  "\n    -q      Quiet" */
+/* //usage:  "\n    -r rev      Set filesystem revision" */
+/* //usage:  "\n    -S      Write superblock and group descriptors only" */
+/* //usage:  "\n    -T fs-type  Set usage type (news/largefile/largefile4)" */
+/* //usage:  "\n    -v      Verbose" */
+
 #include "libbb.h"
 #include <linux/fs.h>
-#include <linux/ext2_fs.h>
+#include "bb_e2fs_defs.h"
 
 #define ENABLE_FEATURE_MKFS_EXT2_RESERVED_GDT 0
 #define ENABLE_FEATURE_MKFS_EXT2_DIR_INDEX    1
-
-// from e2fsprogs
-#define s_reserved_gdt_blocks s_padding1
-#define s_mkfs_time           s_reserved[0]
-#define s_flags               s_reserved[22]
 
 #define EXT2_HASH_HALF_MD4       1
@@ -444 +478 @@
     STORE_LE(sb->s_inode_size, inodesize);
     // set "Required extra isize" and "Desired extra isize" fields to 28
-    if (inodesize != sizeof(*inode))
-        STORE_LE(sb->s_reserved[21], 0x001C001C);
+    if (inodesize != sizeof(*inode)) {
+        STORE_LE(sb->s_min_extra_isize, 0x001c);
+        STORE_LE(sb->s_want_extra_isize, 0x001c);
+    }
     STORE_LE(sb->s_first_ino, EXT2_GOOD_OLD_FIRST_INO);
     STORE_LE(sb->s_log_block_size, blocksize_log2 - EXT2_MIN_BLOCK_LOG_SIZE);
@@ -577 +613 @@
     // zero boot sectors
     memset(buf, 0, blocksize);
-    PUT(0, buf, 1024); // N.B. 1024 <= blocksize, so buf[0..1023] contains zeros
+    // Disabled: standard mke2fs doesn't do this, and
+    // on SPARC this destroys Sun disklabel.
+    // Users who need/want zeroing can easily do it with dd.
+    //PUT(0, buf, 1024); // N.B. 1024 <= blocksize, so buf[0..1023] contains zeros
+
     // zero inode tables
     for (i = 0; i < ngroups; ++i)