diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2015-05-18 13:16:47 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2015-05-18 13:16:47 -0400 |
| commit | e2881b1b51d871a72911faf2fc7e090655940506 (patch) | |
| tree | 07bc66d72cc03479c98b7b63edb53f1fa4069383 /fs/ext4/super.c | |
| parent | d229959072eba40e1c2a4f53f8af17f1e770eb66 (diff) | |
| download | linux-e2881b1b51d871a72911faf2fc7e090655940506.tar.gz linux-e2881b1b51d871a72911faf2fc7e090655940506.tar.bz2 linux-e2881b1b51d871a72911faf2fc7e090655940506.zip | |
ext4 crypto: separate kernel and userspace structure for the key
Use struct ext4_encryption_key only for the master key passed via the
kernel keyring.
For internal kernel space users, we now use struct ext4_crypt_info.
This will allow us to put information from the policy structure so we
can cache it and avoid needing to constantly looking up the extended
attribute. We will do this in a spearate patch. This patch is mostly
mechnical to make it easier for patch review.
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'fs/ext4/super.c')
| -rw-r--r-- | fs/ext4/super.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index ca9d4a2fed41..bcd7a4bc9036 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -879,7 +879,7 @@ static struct inode *ext4_alloc_inode(struct super_block *sb) atomic_set(&ei->i_unwritten, 0); INIT_WORK(&ei->i_rsv_conversion_work, ext4_end_io_rsv_work); #ifdef CONFIG_EXT4_FS_ENCRYPTION - ei->i_encryption_key.mode = EXT4_ENCRYPTION_MODE_INVALID; + ei->i_crypt_info.ci_mode = EXT4_ENCRYPTION_MODE_INVALID; #endif return &ei->vfs_inode; |