commit 8a764b54002d26c01e2c7cd5aa0d038dfe0623bd
author Patrick Tjin <pattjin@google.com> Thu Oct 20 10:55:11 2016 -0700
committer gitbuildkicker <android-build@google.com> Thu Jan 05 16:19:41 2017 -0800
tree fcf2f3d81e44ac8304e43d0972ebd0ae339e7ac1
parent 378116f05a5a27d2e1f0e96d80780cca9caf53d4

make_ext4fs: add option to specify the number of inodes [DO NOT MERGE]

Add option to specify the number of inodes to create when
making the filesystem.  Read-only partitions don't have
a need for extra inodes, a lot of space is wasted by these
inodes.

Bug: 32246383
Bug: 33252070
Bug: 33428604
Test: make vendor partition with new options
Change-Id: I7063972ec4f4e617d28d2e029ad6a9f8e94add73
(cherry picked from commit 15c434682ac78262d2dad9730805eab52b748cdf)
(cherry picked from commit 7842cd2b1454fb9d4440838b119b99c35b55734b)

ext4_utils/mkuserimg.sh

diff --git a/ext4_utils/mkuserimg.sh b/ext4_utils/mkuserimg.sh
index b79baf9..08c75be 100755
--- a/ext4_utils/mkuserimg.sh
+++ b/ext4_utils/mkuserimg.sh
@@ -6,7 +6,9 @@
 cat<<EOT
 Usage:
 mkuserimg.sh [-s] SRC_DIR OUTPUT_FILE EXT_VARIANT MOUNT_POINT SIZE [-j <journal_size>]
-             [-T TIMESTAMP] [-C FS_CONFIG] [-D PRODUCT_OUT] [-B BLOCK_LIST_FILE] [-d BASE_ALLOC_FILE_IN ] [-A BASE_ALLOC_FILE_OUT ] [-L LABEL] [FILE_CONTEXTS]
+             [-T TIMESTAMP] [-C FS_CONFIG] [-D PRODUCT_OUT] [-B BLOCK_LIST_FILE]
+             [-d BASE_ALLOC_FILE_IN ] [-A BASE_ALLOC_FILE_OUT ] [-L LABEL]
+             [-i INODES ] [FILE_CONTEXTS]
 EOT
 }
 
@@ -85,6 +87,11 @@
   shift; shift
 fi
 
+INODES=
+if [[ "$1" == "-i" ]]; then
+  INODES=$2
+  shift; shift
+fi
 FC=$1
 
 case $EXT_VARIANT in
@@ -121,6 +128,9 @@
 if [ -n "$LABEL" ]; then
   OPT="$OPT -L $LABEL"
 fi
+if [ -n "$INODES" ]; then
+  OPT="$OPT -i $INODES"
+fi
 
 MAKE_EXT4FS_CMD="make_ext4fs $ENABLE_SPARSE_IMAGE -T $TIMESTAMP $OPT -l $SIZE $JOURNAL_FLAGS -a $MOUNT_POINT $OUTPUT_FILE $SRC_DIR $PRODUCT_OUT"
 echo $MAKE_EXT4FS_CMD