diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2017-12-12 00:19:37 -0500 |
|---|---|---|
| committer | Eryu Guan <eguan@redhat.com> | 2017-12-14 12:39:57 +0800 |
| commit | c71205ec949f21850383c5398fb9693b4bfbc8a9 (patch) | |
| tree | 52294d05a0a12f78241c20b0274a912e6150e9a1 | |
| parent | be341e36fd02cc73cb8360c7a61d406eb00cc48d (diff) | |
| download | xfstests-c71205ec949f21850383c5398fb9693b4bfbc8a9.tar.gz | |
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 <tytso@mit.edu>
Reviewed-by: Eryu Guan <eguan@redhat.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>
| -rw-r--r-- | common/populate | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/populate b/common/populate index b77c508107..07ea7e60a4 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" |