diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-18 09:57:02 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-18 09:57:02 +0100 |
| commit | 37ba317c9ed19eb126e40bbf563f2711e191a636 (patch) | |
| tree | c5865768f341fc0ab41899fe9af9dc5918784cee /fs/ecryptfs/ecryptfs_kernel.h | |
| parent | 708dc5125309cd33c5daaad3026cc4ae6ef39c8b (diff) | |
| parent | ee568b25ee9e160b32d1aef73d8b2ee9c05d34db (diff) | |
| download | kernel-crypto-37ba317c9ed19eb126e40bbf563f2711e191a636.tar.gz kernel-crypto-37ba317c9ed19eb126e40bbf563f2711e191a636.tar.xz kernel-crypto-37ba317c9ed19eb126e40bbf563f2711e191a636.zip | |
Merge branches 'sched/cleanups' and 'linus' into sched/core
Diffstat (limited to 'fs/ecryptfs/ecryptfs_kernel.h')
| -rw-r--r-- | fs/ecryptfs/ecryptfs_kernel.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/ecryptfs/ecryptfs_kernel.h b/fs/ecryptfs/ecryptfs_kernel.h index c11fc95714a..eb2267eca1f 100644 --- a/fs/ecryptfs/ecryptfs_kernel.h +++ b/fs/ecryptfs/ecryptfs_kernel.h @@ -328,6 +328,7 @@ struct ecryptfs_dentry_info { */ struct ecryptfs_global_auth_tok { #define ECRYPTFS_AUTH_TOK_INVALID 0x00000001 +#define ECRYPTFS_AUTH_TOK_FNEK 0x00000002 u32 flags; struct list_head mount_crypt_stat_list; struct key *global_auth_tok_key; @@ -696,7 +697,7 @@ ecryptfs_write_header_metadata(char *virt, int ecryptfs_add_keysig(struct ecryptfs_crypt_stat *crypt_stat, char *sig); int ecryptfs_add_global_auth_tok(struct ecryptfs_mount_crypt_stat *mount_crypt_stat, - char *sig); + char *sig, u32 global_auth_tok_flags); int ecryptfs_get_global_auth_tok_for_sig( struct ecryptfs_global_auth_tok **global_auth_tok, struct ecryptfs_mount_crypt_stat *mount_crypt_stat, char *sig); |