aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ecryptfs/ecryptfs_kernel.h
diff options
context:
space:
mode:
authorTrevor Highland <thighlan@gmail.com>2008-02-06 04:38:36 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-06 13:41:13 -0500
commit19e66a67e9b25874cd5e184e7d381ce1b955df11 (patch)
tree6dfd5c9771a99ddf7f3978ff6be466267727e2d5 /fs/ecryptfs/ecryptfs_kernel.h
parent25bd8174036036f427b039e4857feac6c6912a37 (diff)
eCryptfs: change the type of cipher_code from u16 to u8
Only the lower byte of cipher_code is ever used, so it makes sense for its type to be u8. Signed-off-by: Trevor Highland <trevor.highland@gmail.com> Cc: Michael Halcrow <mhalcrow@us.ibm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/ecryptfs/ecryptfs_kernel.h')
-rw-r--r--fs/ecryptfs/ecryptfs_kernel.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/ecryptfs/ecryptfs_kernel.h b/fs/ecryptfs/ecryptfs_kernel.h
index 2a6103954c1e..f44f71b7605a 100644
--- a/fs/ecryptfs/ecryptfs_kernel.h
+++ b/fs/ecryptfs/ecryptfs_kernel.h
@@ -558,8 +558,8 @@ int ecryptfs_read_and_validate_header_region(char *data,
558 struct inode *ecryptfs_inode); 558 struct inode *ecryptfs_inode);
559int ecryptfs_read_and_validate_xattr_region(char *page_virt, 559int ecryptfs_read_and_validate_xattr_region(char *page_virt,
560 struct dentry *ecryptfs_dentry); 560 struct dentry *ecryptfs_dentry);
561u16 ecryptfs_code_for_cipher_string(struct ecryptfs_crypt_stat *crypt_stat); 561u8 ecryptfs_code_for_cipher_string(struct ecryptfs_crypt_stat *crypt_stat);
562int ecryptfs_cipher_code_to_string(char *str, u16 cipher_code); 562int ecryptfs_cipher_code_to_string(char *str, u8 cipher_code);
563void ecryptfs_set_default_sizes(struct ecryptfs_crypt_stat *crypt_stat); 563void ecryptfs_set_default_sizes(struct ecryptfs_crypt_stat *crypt_stat);
564int ecryptfs_generate_key_packet_set(char *dest_base, 564int ecryptfs_generate_key_packet_set(char *dest_base,
565 struct ecryptfs_crypt_stat *crypt_stat, 565 struct ecryptfs_crypt_stat *crypt_stat,