diff options
| author | Jaegeuk Kim <jaegeuk@kernel.org> | 2015-05-12 13:33:00 -0700 |
|---|---|---|
| committer | Jaegeuk Kim <jaegeuk@kernel.org> | 2015-06-01 16:20:56 -0700 |
| commit | 640778fbc97b36757bd1f857ba4b599a200517c2 (patch) | |
| tree | 9cbbe8144f1a4090c23ebdf96104287224df2d2a /fs/f2fs/crypto_fname.c | |
| parent | 8bacf6deb02367008cc25244d9c3d23b0f797048 (diff) | |
| download | lwn-640778fbc97b36757bd1f857ba4b599a200517c2.tar.gz lwn-640778fbc97b36757bd1f857ba4b599a200517c2.zip | |
f2fs crypto: get rid of ci_mode from struct f2fs_crypt_info
This patch integrates the below patch into f2fs.
"ext4 crypto: get rid of ci_mode from struct ext4_crypt_info
The ci_mode field was superfluous, and getting rid of it gets rid of
an unused hole in the structure."
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Diffstat (limited to 'fs/f2fs/crypto_fname.c')
| -rw-r--r-- | fs/f2fs/crypto_fname.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/f2fs/crypto_fname.c b/fs/f2fs/crypto_fname.c index 8f3ff9b3caeb..e3a1bdc70b03 100644 --- a/fs/f2fs/crypto_fname.c +++ b/fs/f2fs/crypto_fname.c @@ -269,9 +269,9 @@ int f2fs_setup_fname_crypto(struct inode *inode) if (!ci || ci->ci_ctfm) return 0; - if (ci->ci_mode != F2FS_ENCRYPTION_MODE_AES_256_CTS) { + if (ci->ci_filename_mode != F2FS_ENCRYPTION_MODE_AES_256_CTS) { printk_once(KERN_WARNING "f2fs: unsupported key mode %d\n", - ci->ci_mode); + ci->ci_filename_mode); return -ENOKEY; } |