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: Prevent lower dentry from going negative during unlink eCryptfs: Propagate vfs_read and vfs_write return codes eCryptfs: Validate global auth tok keys eCryptfs: Filename encryption only supports password auth tokens eCryptfs: Check for O_RDONLY lower inodes when opening lower files eCryptfs: Handle unrecognized tag 3 cipher codes ecryptfs: improved dependency checking and reporting eCryptfs: Fix lockdep-reported AB-BA mutex issue ecryptfs: Remove unneeded locking that triggers lockdep false positives
Showing
- fs/ecryptfs/Kconfig 3 additions, 1 deletionfs/ecryptfs/Kconfig
- fs/ecryptfs/crypto.c 22 additions, 17 deletionsfs/ecryptfs/crypto.c
- fs/ecryptfs/inode.c 2 additions, 0 deletionsfs/ecryptfs/inode.c
- fs/ecryptfs/keystore.c 26 additions, 13 deletionsfs/ecryptfs/keystore.c
- fs/ecryptfs/kthread.c 8 additions, 16 deletionsfs/ecryptfs/kthread.c
- fs/ecryptfs/main.c 1 addition, 2 deletionsfs/ecryptfs/main.c
- fs/ecryptfs/mmap.c 3 additions, 1 deletionfs/ecryptfs/mmap.c
- fs/ecryptfs/read_write.c 12 additions, 20 deletionsfs/ecryptfs/read_write.c
- fs/ecryptfs/super.c 0 additions, 2 deletionsfs/ecryptfs/super.c
Loading
Please register or sign in to comment