diff options
author | Theodore Ts'o <tytso@mit.edu> | 2015-05-31 13:34:22 -0400 |
---|---|---|
committer | Theodore Ts'o <tytso@mit.edu> | 2015-05-31 13:34:22 -0400 |
commit | c936e1ec2879e43599d801dfa6fe58e7ccfee433 (patch) | |
tree | a09688def0b1c75f7e23a9b1c98848f41e043d2e /fs/ext4/dir.c | |
parent | 71dea01ea2edb73f3c5d9a0cd7ba028bb9313287 (diff) | |
download | op-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/dir.c')
-rw-r--r-- | fs/ext4/dir.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/fs/ext4/dir.c b/fs/ext4/dir.c index 28cb94f..e11e6ae 100644 --- a/fs/ext4/dir.c +++ b/fs/ext4/dir.c @@ -133,9 +133,6 @@ static int ext4_readdir(struct file *file, struct dir_context *ctx) return err; } - err = ext4_setup_fname_crypto(inode); - if (err) - return err; if (ext4_encrypted_inode(inode)) { err = ext4_fname_crypto_alloc_buffer(inode, EXT4_NAME_LEN, &fname_crypto_str); |