diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-26 03:03:04 +0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-26 03:03:04 +0400 |
commit | 3074c0350b173c9e98b62685e0a61a66d9ff8728 (patch) | |
tree | 28f2cd48f1278983b1fa7d5b4a5895882ce5ca84 /fs/efs | |
parent | f8275f9694b8adf9f3498e747ea4c3e8b984499b (diff) | |
parent | 58ded24f0fcb85bddb665baba75892f6ad0f4b8a (diff) | |
download | linux-3074c0350b173c9e98b62685e0a61a66d9ff8728.tar.xz |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs
Says Tyler:
"Tim's logging message update will be really helpful to users when
they're trying to locate a problematic file in the lower filesystem
with filename encryption enabled.
You'll recognize the fix from Li, as you commented on that.
You should also be familiar with my setattr/truncate improvements,
since you were the one that pointed them out to us (thanks again!).
Andrew noted the /dev/ecryptfs write count sanitization needed to be
improved, so I've got a fix in there for that along with some other
less important cleanups of the /dev/ecryptfs read/write code."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs:
eCryptfs: Fix oops when printing debug info in extent crypto functions
eCryptfs: Remove unused ecryptfs_read()
eCryptfs: Check inode changes in setattr
eCryptfs: Make truncate path killable
eCryptfs: Infinite loop due to overflow in ecryptfs_write()
eCryptfs: Replace miscdev read/write magic numbers
eCryptfs: Report errors in writes to /dev/ecryptfs
eCryptfs: Sanitize write counts of /dev/ecryptfs
ecryptfs: Remove unnecessary variable initialization
ecryptfs: Improve metadata read failure logging
MAINTAINERS: Update eCryptfs maintainer address
Diffstat (limited to 'fs/efs')
0 files changed, 0 insertions, 0 deletions