commit 3861978ea090352f80bc4b50cb1c2d0fa6dc08da
author Colin Cross <ccross@android.com> Mon Nov 26 13:01:12 2012 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Nov 26 13:01:13 2012 -0800
tree 0e5d12447367544c56cd27e3243706feeb118f6f
parent 1eda334e947485b6b406a087167b9fb311933d32
parent 8748938228acad9e53c4f3cdfa132d2aff7917bf

Merge "make_ext4fs: fix dentry padding when dentry size is 4088 or 4092"

ext4_utils/contents.c

diff --git a/ext4_utils/contents.c b/ext4_utils/contents.c
index 8d20eb2..6300680 100644
--- a/ext4_utils/contents.c
+++ b/ext4_utils/contents.c
@@ -44,11 +44,6 @@
 		len += dentry_len;
 	}
 
-	/* include size of the dentry used to pad until the end of the block */
-	if (len % info.block_size + 8 > info.block_size)
-		len += info.block_size - (len % info.block_size);
-	len += 8;
-
 	return len;
 }
 
@@ -160,11 +155,8 @@
 		}
 	}
 
-	dentry = (struct ext4_dir_entry_2 *)(data + offset);
-	dentry->inode = 0;
-	dentry->rec_len = len - offset;
-	dentry->name_len = 0;
-	dentry->file_type = EXT4_FT_UNKNOWN;
+	/* pad the last dentry out to the end of the block */
+	dentry->rec_len += len - offset;
 
 	return inode_num;
 }