From a6cbcbe63cfa8ed27276c66b12954bcaaff28cd0 Mon Sep 17 00:00:00 2001 From: Erez Zadok Date: Sun, 6 Dec 2009 18:51:15 -0500 Subject: [PATCH] --- yaml --- r: 179635 b: refs/heads/master c: 3469b57329f80db5a41cf42d1c8f7690269f57e7 h: refs/heads/master i: 179633: 4dea413fb1e3701b25e1ac03c3b32e99b73bf167 179631: 43b53c8173575ebafddb3eed853697a18af9fa64 v: v3 --- [refs] | 2 +- trunk/fs/ecryptfs/inode.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a2bff1fad676..582785867520 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c44a66d674688f1e1d0b2f6f56bd9c6a1b061cae +refs/heads/master: 3469b57329f80db5a41cf42d1c8f7690269f57e7 diff --git a/trunk/fs/ecryptfs/inode.c b/trunk/fs/ecryptfs/inode.c index e03415293625..4a430ab4115c 100644 --- a/trunk/fs/ecryptfs/inode.c +++ b/trunk/fs/ecryptfs/inode.c @@ -282,7 +282,8 @@ int ecryptfs_lookup_and_interpose_lower(struct dentry *ecryptfs_dentry, goto out; } rc = ecryptfs_interpose(lower_dentry, ecryptfs_dentry, - ecryptfs_dir_inode->i_sb, 1); + ecryptfs_dir_inode->i_sb, + ECRYPTFS_INTERPOSE_FLAG_D_ADD); if (rc) { printk(KERN_ERR "%s: Error interposing; rc = [%d]\n", __func__, rc);