diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-11 19:20:18 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-11 19:20:18 +0200 |
commit | 746919d2668037f297595da9281a22cd558f3d18 (patch) | |
tree | 427ed5f852739537e6e378a98268fdf43c05a38e /net/9p | |
parent | Merge tag 'jfs-3.11' of git://github.com/kleikamp/linux-shaggy (diff) | |
parent | Use ecryptfs_dentry_to_lower_path in a couple of places (diff) | |
download | linux-746919d2668037f297595da9281a22cd558f3d18.tar.xz linux-746919d2668037f297595da9281a22cd558f3d18.zip |
Merge tag 'ecryptfs-3.11-rc1-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs
Pull eCryptfs updates from Tyler Hicks:
"Code cleanups and improved buffer handling during page crypto
operations:
- Remove redundant code by merging some encrypt and decrypt functions
- Get rid of a helper page allocation during page decryption by using
in-place decryption
- Better use of entire pages during page crypto operations
- Several code cleanups"
* tag 'ecryptfs-3.11-rc1-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs:
Use ecryptfs_dentry_to_lower_path in a couple of places
eCryptfs: Make extent and scatterlist crypt function parameters similar
eCryptfs: Collapse crypt_page_offset() into crypt_extent()
eCryptfs: Merge ecryptfs_encrypt_extent() and ecryptfs_decrypt_extent()
eCryptfs: Combine page_offset crypto functions
eCryptfs: Combine encrypt_scatterlist() and decrypt_scatterlist()
eCryptfs: Decrypt pages in-place
eCryptfs: Accept one offset parameter in page offset crypto functions
eCryptfs: Simplify lower file offset calculation
eCryptfs: Read/write entire page during page IO
eCryptfs: Use entire helper page during page crypto operations
eCryptfs: Cocci spatch "memdup.spatch"
Diffstat (limited to 'net/9p')
0 files changed, 0 insertions, 0 deletions