2011-05-29 20:01:42

by Tyler Hicks

[permalink] [raw]
Subject: [GIT PULL] More eCryptfs fixes

Hi Linus,

The first 2 patches are code cleanups to pave the way for the 3rd patch,
which fixes a race condition around the i_size field of new eCryptfs
inodes. The last 3 patches are more fs/ecryptfs/inode.c code cleanups
that I couldn't resist doing after I was done fixing the race condition.

Sorry for the late pull request. The reporter of the i_size race
condition was nice enough to test the fix yesterday, but I haven't had
access to a computer until this afternoon.

The following changes since commit 139f37f5e14cd883eee2a8a36289f544b5390a44:

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin (2011-05-28 23:12:28 -0700)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6.git for-linus

Tyler Hicks (6):
eCryptfs: Consolidate inode functions into inode.c
eCryptfs: Cleanup inode initialization code
eCryptfs: Fix new inode race condition
eCryptfs: Return useful code from contains_ecryptfs_marker
eCryptfs: Cleanup and optimize ecryptfs_lookup_interpose()
eCryptfs: Remove ecryptfs_header_cache_2

fs/ecryptfs/crypto.c | 74 +++++------
fs/ecryptfs/ecryptfs_kernel.h | 26 ++---
fs/ecryptfs/file.c | 2 +-
fs/ecryptfs/inode.c | 281 +++++++++++++++++++++++++----------------
fs/ecryptfs/main.c | 84 +------------
fs/ecryptfs/super.c | 16 ---
6 files changed, 220 insertions(+), 263 deletions(-)