diff options
| author | Jaegeuk Kim <jaegeuk@kernel.org> | 2015-05-19 22:26:54 -0700 |
|---|---|---|
| committer | Jaegeuk Kim <jaegeuk@kernel.org> | 2015-06-01 16:21:04 -0700 |
| commit | 26bf3dc7e25b813ff5c92234f8165941fdc12a63 (patch) | |
| tree | 1486f8923c5f9c05fc6684d2c4b425f65b1ca459 /fs/f2fs/dir.c | |
| parent | da554e48caab95a48afe0d7be8d9eae2bbdaa28d (diff) | |
| download | op-kernel-dev-26bf3dc7e25b813ff5c92234f8165941fdc12a63.zip op-kernel-dev-26bf3dc7e25b813ff5c92234f8165941fdc12a63.tar.gz | |
f2fs crypto: use per-inode tfm structure
This patch applies the following ext4 patch:
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>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Diffstat (limited to 'fs/f2fs/dir.c')
| -rw-r--r-- | fs/f2fs/dir.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c index 3e92376..a34ebd8 100644 --- a/fs/f2fs/dir.c +++ b/fs/f2fs/dir.c @@ -825,11 +825,11 @@ static int f2fs_readdir(struct file *file, struct dir_context *ctx) struct f2fs_str fstr = FSTR_INIT(NULL, 0); int err = 0; - err = f2fs_setup_fname_crypto(inode); - if (err) - return err; - if (f2fs_encrypted_inode(inode)) { + err = f2fs_get_encryption_info(inode); + if (err) + return err; + err = f2fs_fname_crypto_alloc_buffer(inode, F2FS_NAME_LEN, &fstr); if (err < 0) |
