From c71205ec949f21850383c5398fb9693b4bfbc8a9 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Tue, 12 Dec 2017 00:19:37 -0500 Subject: [PATCH] common/populate: fix S_IFDIR.FMT_BLOCK and ATTR.FMT_LOCAL for ext4 encryption When ext4 encryption is enabled, the directory entries are encrypted so we need to create fewer directory entries to guarantee that they will all fit in a single block. Also, the encryption metadata takes up extended attribute room so we can only add a single xattr to guarantee that the xattrs will fit in the inode. Signed-off-by: Theodore Ts'o Reviewed-by: Eryu Guan Signed-off-by: Eryu Guan --- common/populate | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/populate b/common/populate index b77c5081..07ea7e60 100644 --- a/common/populate +++ b/common/populate @@ -343,7 +343,7 @@ _scratch_ext4_populate() { # - BLOCK echo "+ block dir" - __populate_create_dir "${SCRATCH_MNT}/S_IFDIR.FMT_BLOCK" "$((dblksz / 24))" + __populate_create_dir "${SCRATCH_MNT}/S_IFDIR.FMT_BLOCK" "$((dblksz / 32))" # - HTREE echo "+ htree dir" @@ -369,7 +369,7 @@ _scratch_ext4_populate() { # Attribute formats # LOCAL echo "+ local attr" - __populate_create_attr "${SCRATCH_MNT}/ATTR.FMT_LOCAL" 1 + __populate_create_attr "${SCRATCH_MNT}/ATTR.FMT_LOCAL" 0 # BLOCK echo "+ block attr" -- 2.39.5