summaryrefslogtreecommitdiff
path: root/fs/ext4/crypto_fname.c
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2015-05-18 17:20:47 (GMT)
committerTheodore Ts'o <tytso@mit.edu>2015-05-18 17:20:47 (GMT)
commit1aaa6e8b24114757a836ae0e62d2096deb76f274 (patch)
tree3f9e93f18c1c1d7ce9e66f844efed706755d0281 /fs/ext4/crypto_fname.c
parent8ee0371470038371729a39ee6669a2132ac47649 (diff)
downloadlinux-1aaa6e8b24114757a836ae0e62d2096deb76f274.tar.xz
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>
Diffstat (limited to 'fs/ext4/crypto_fname.c')
-rw-r--r--fs/ext4/crypto_fname.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ext4/crypto_fname.c b/fs/ext4/crypto_fname.c
index 374d0e7..e63dd29 100644
--- a/fs/ext4/crypto_fname.c
+++ b/fs/ext4/crypto_fname.c
@@ -272,9 +272,9 @@ int ext4_setup_fname_crypto(struct inode *inode)
if (!ci || ci->ci_ctfm)
return 0;
- if (ci->ci_mode != EXT4_ENCRYPTION_MODE_AES_256_CTS) {
+ if (ci->ci_filename_mode != EXT4_ENCRYPTION_MODE_AES_256_CTS) {
printk_once(KERN_WARNING "ext4: unsupported key mode %d\n",
- ci->ci_mode);
+ ci->ci_filename_mode);
return -ENOKEY;
}