summaryrefslogtreecommitdiffstats
path: root/fs/ext4/super.c
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2015-05-31 13:34:22 -0400
committerTheodore Ts'o <tytso@mit.edu>2015-05-31 13:34:22 -0400
commitc936e1ec2879e43599d801dfa6fe58e7ccfee433 (patch)
treea09688def0b1c75f7e23a9b1c98848f41e043d2e /fs/ext4/super.c
parent71dea01ea2edb73f3c5d9a0cd7ba028bb9313287 (diff)
downloadop-kernel-dev-c936e1ec2879e43599d801dfa6fe58e7ccfee433.zip
op-kernel-dev-c936e1ec2879e43599d801dfa6fe58e7ccfee433.tar.gz
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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index b0bd1c1..56bfc2f 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
}
OpenPOWER on IntegriCloud