aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ecryptfs/file.c
diff options
context:
space:
mode:
authorMichael Halcrow <mhalcrow@us.ibm.com>2007-10-16 04:28:10 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-16 12:43:12 -0400
commitd7cdc5febf9f2664755002c3a2f84bd348389fe9 (patch)
treead770ac2031d87474220cc20eb7b99a246dea8bb /fs/ecryptfs/file.c
parent4981e081cfe2c3f4abcfa3924ebd999cdbed4914 (diff)
eCryptfs: update metadata read/write functions
Update the metadata read/write functions and grow_file() to use the read_write.c routines. Do not open another lower file; use the persistent lower file instead. Provide a separate function for crypto.c::ecryptfs_read_xattr_region() to get to the lower xattr without having to go through the eCryptfs getxattr. Signed-off-by: Michael Halcrow <mhalcrow@us.ibm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/ecryptfs/file.c')
-rw-r--r--fs/ecryptfs/file.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ecryptfs/file.c b/fs/ecryptfs/file.c
index 59c846d29a8e..df70bfa176d9 100644
--- a/fs/ecryptfs/file.c
+++ b/fs/ecryptfs/file.c
@@ -248,7 +248,7 @@ static int ecryptfs_open(struct inode *inode, struct file *file)
248 mutex_lock(&crypt_stat->cs_mutex); 248 mutex_lock(&crypt_stat->cs_mutex);
249 if (!(crypt_stat->flags & ECRYPTFS_POLICY_APPLIED) 249 if (!(crypt_stat->flags & ECRYPTFS_POLICY_APPLIED)
250 || !(crypt_stat->flags & ECRYPTFS_KEY_VALID)) { 250 || !(crypt_stat->flags & ECRYPTFS_KEY_VALID)) {
251 rc = ecryptfs_read_metadata(ecryptfs_dentry, lower_file); 251 rc = ecryptfs_read_metadata(ecryptfs_dentry);
252 if (rc) { 252 if (rc) {
253 ecryptfs_printk(KERN_DEBUG, 253 ecryptfs_printk(KERN_DEBUG,
254 "Valid headers not found\n"); 254 "Valid headers not found\n");