Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6: eCryptfs: write lock requested keys eCryptfs: move ecryptfs_find_auth_tok_for_sig() call before mutex_lock eCryptfs: verify authentication tokens before their use eCryptfs: modified size of keysig in the ecryptfs_key_sig structure eCryptfs: removed num_global_auth_toks from ecryptfs_mount_crypt_stat eCryptfs: ecryptfs_keyring_auth_tok_for_sig() bug fix eCryptfs: Unlock page in write_begin error path ecryptfs: modify write path to encrypt page in writepage eCryptfs: Remove ECRYPTFS_NEW_FILE crypt stat flag eCryptfs: Remove unnecessary grow_file() function
Showing
- fs/ecryptfs/crypto.c 1 addition, 1 deletionfs/ecryptfs/crypto.c
- fs/ecryptfs/ecryptfs_kernel.h 13 additions, 17 deletionsfs/ecryptfs/ecryptfs_kernel.h
- fs/ecryptfs/file.c 8 additions, 1 deletionfs/ecryptfs/file.c
- fs/ecryptfs/inode.c 0 additions, 24 deletionsfs/ecryptfs/inode.c
- fs/ecryptfs/keystore.c 171 additions, 101 deletionsfs/ecryptfs/keystore.c
- fs/ecryptfs/main.c 5 additions, 5 deletionsfs/ecryptfs/main.c
- fs/ecryptfs/mmap.c 34 additions, 27 deletionsfs/ecryptfs/mmap.c
- fs/ecryptfs/read_write.c 2 additions, 10 deletionsfs/ecryptfs/read_write.c
- fs/ecryptfs/super.c 1 addition, 2 deletionsfs/ecryptfs/super.c
Loading
Please register or sign in to comment