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: Remove ecryptfs_header_cache_2 eCryptfs: Cleanup and optimize ecryptfs_lookup_interpose() eCryptfs: Return useful code from contains_ecryptfs_marker eCryptfs: Fix new inode race condition eCryptfs: Cleanup inode initialization code eCryptfs: Consolidate inode functions into inode.c
Showing
- fs/ecryptfs/crypto.c 32 additions, 42 deletionsfs/ecryptfs/crypto.c
- fs/ecryptfs/ecryptfs_kernel.h 9 additions, 17 deletionsfs/ecryptfs/ecryptfs_kernel.h
- fs/ecryptfs/file.c 1 addition, 1 deletionfs/ecryptfs/file.c
- fs/ecryptfs/inode.c 173 additions, 108 deletionsfs/ecryptfs/inode.c
- fs/ecryptfs/main.c 5 additions, 79 deletionsfs/ecryptfs/main.c
- fs/ecryptfs/super.c 0 additions, 16 deletionsfs/ecryptfs/super.c
Loading
Please register or sign in to comment