summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErez Zadok <ezk@cs.sunysb.edu>2009-12-07 00:51:15 +0100
committerTyler Hicks <tyhicks@linux.vnet.ibm.com>2010-01-20 05:36:02 +0100
commit3469b57329f80db5a41cf42d1c8f7690269f57e7 (patch)
tree1672f23b8742dd5426cd3448ab2592342e99e091
parentecryptfs: remove unnecessary d_drop calls in ecryptfs_link (diff)
downloadlinux-3469b57329f80db5a41cf42d1c8f7690269f57e7.tar.xz
linux-3469b57329f80db5a41cf42d1c8f7690269f57e7.zip
ecryptfs: pass matching flags to interpose as defined and used there
ecryptfs_interpose checks if one of the flags passed is ECRYPTFS_INTERPOSE_FLAG_D_ADD, defined as 0x00000001 in ecryptfs_kernel.h. But the only user of ecryptfs_interpose to pass a non-zero flag to it, has hard-coded the value as "1". This could spell trouble if any of these values changes in the future. Signed-off-by: Erez Zadok <ezk@cs.sunysb.edu> Cc: Dustin Kirkland <kirkland@canonical.com> Cc: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Tyler Hicks <tyhicks@linux.vnet.ibm.com>
Diffstat (limited to '')
-rw-r--r--fs/ecryptfs/inode.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c
index e03415293625..4a430ab4115c 100644
--- a/fs/ecryptfs/inode.c
+++ b/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);