diff options
author | Theodore Ts'o <tytso@mit.edu> | 2015-05-31 20:34:22 +0300 |
---|---|---|
committer | Theodore Ts'o <tytso@mit.edu> | 2015-05-31 20:34:22 +0300 |
commit | c936e1ec2879e43599d801dfa6fe58e7ccfee433 (patch) | |
tree | a09688def0b1c75f7e23a9b1c98848f41e043d2e /fs/ext4/super.c | |
parent | 71dea01ea2edb73f3c5d9a0cd7ba028bb9313287 (diff) | |
download | linux-c936e1ec2879e43599d801dfa6fe58e7ccfee433.tar.xz |
ext4 crypto: use per-inode tfm structure
As suggested by Herbert Xu, we shouldn't allocate a new tfm each time
we read or write a page. Instead we can use a single tfm hanging off
the inode's crypt_info structure for all of our encryption needs for
that inode, since the tfm can be used by multiple crypto requests in
parallel.
Also use cmpxchg() to avoid races that could result in crypt_info
structure getting doubly allocated or doubly freed.
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 b0bd1c1061b3..56bfc2f25d90 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -959,7 +959,7 @@ void ext4_clear_inode(struct inode *inode) } #ifdef CONFIG_EXT4_FS_ENCRYPTION if (EXT4_I(inode)->i_crypt_info) - ext4_free_encryption_info(inode); + ext4_free_encryption_info(inode, EXT4_I(inode)->i_crypt_info); #endif } |