[PATCH] common/populate: fix S_IFDIR.FMT_BLOCK and ATTR.FMT_LOCAL for ext4 encryption

[Date Prev] [Date Next] [Thread Prev] [Thread Next] [Date Index] [Thread Index]



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 <tytso@xxxxxxx>
---
 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.11.0.rc0.7.gbe5a750

--
To unsubscribe from this list: send the line "unsubscribe fstests" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Linux Filesystems Development]     [Linux NFS]     [Linux NILFS]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux