summaryrefslogtreecommitdiffstats
path: root/fs/ecryptfs/ecryptfs_kernel.h
diff options
context:
space:
mode:
authorTyler Hicks <tyhicks@linux.vnet.ibm.com>2011-02-17 17:35:20 -0600
committerTyler Hicks <tyhicks@linux.vnet.ibm.com>2011-02-21 14:45:57 -0600
commit70b8902199003b098fde86d1db02e7465115a02c (patch)
treef0576b1a4df43be528e7cc44a36204090ad1994a /fs/ecryptfs/ecryptfs_kernel.h
parent8787c7a3e0e3f1aa21856d6b6cd6880cc93497e9 (diff)
downloadlinux-stable-70b8902199003b098fde86d1db02e7465115a02c.tar.gz
linux-stable-70b8902199003b098fde86d1db02e7465115a02c.tar.bz2
linux-stable-70b8902199003b098fde86d1db02e7465115a02c.zip
eCryptfs: Handle NULL nameidata pointers
Allow for NULL nameidata pointers in eCryptfs create, lookup, and d_revalidate functions. Signed-off-by: Tyler Hicks <tyhicks@linux.vnet.ibm.com>
Diffstat (limited to 'fs/ecryptfs/ecryptfs_kernel.h')
-rw-r--r--fs/ecryptfs/ecryptfs_kernel.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/ecryptfs/ecryptfs_kernel.h b/fs/ecryptfs/ecryptfs_kernel.h
index dbc84ed96336..e00753496e3e 100644
--- a/fs/ecryptfs/ecryptfs_kernel.h
+++ b/fs/ecryptfs/ecryptfs_kernel.h
@@ -632,8 +632,7 @@ int ecryptfs_interpose(struct dentry *hidden_dentry,
u32 flags);
int ecryptfs_lookup_and_interpose_lower(struct dentry *ecryptfs_dentry,
struct dentry *lower_dentry,
- struct inode *ecryptfs_dir_inode,
- struct nameidata *ecryptfs_nd);
+ struct inode *ecryptfs_dir_inode);
int ecryptfs_decode_and_decrypt_filename(char **decrypted_name,
size_t *decrypted_name_size,
struct dentry *ecryptfs_dentry,