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: Print mount_auth_tok_only param in ecryptfs_show_options ecryptfs: added ecryptfs_mount_auth_tok_only mount parameter ecryptfs: checking return code of ecryptfs_find_auth_tok_for_sig() ecryptfs: release keys loaded in ecryptfs_keyring_auth_tok_for_sig() eCryptfs: Clear LOOKUP_OPEN flag when creating lower file ecryptfs: call vfs_setxattr() in ecryptfs_setxattr()
Showing
- fs/ecryptfs/ecryptfs_kernel.h 1 addition, 0 deletionsfs/ecryptfs/ecryptfs_kernel.h
- fs/ecryptfs/inode.c 7 additions, 4 deletionsfs/ecryptfs/inode.c
- fs/ecryptfs/keystore.c 38 additions, 7 deletionsfs/ecryptfs/keystore.c
- fs/ecryptfs/main.c 7 additions, 1 deletionfs/ecryptfs/main.c
- fs/ecryptfs/super.c 2 additions, 0 deletionsfs/ecryptfs/super.c
Loading
Please register or sign in to comment