aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/ecryptfs/ecryptfs_kernel.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/fs/ecryptfs/ecryptfs_kernel.h b/fs/ecryptfs/ecryptfs_kernel.h
index 424137fb5898..afb64bdbe6ad 100644
--- a/fs/ecryptfs/ecryptfs_kernel.h
+++ b/fs/ecryptfs/ecryptfs_kernel.h
@@ -29,6 +29,7 @@
29#include <keys/user-type.h> 29#include <keys/user-type.h>
30#include <linux/fs.h> 30#include <linux/fs.h>
31#include <linux/fs_stack.h> 31#include <linux/fs_stack.h>
32#include <linux/namei.h>
32#include <linux/scatterlist.h> 33#include <linux/scatterlist.h>
33 34
34/* Version verification for shared data structures w/ userspace */ 35/* Version verification for shared data structures w/ userspace */
@@ -228,8 +229,7 @@ struct ecryptfs_inode_info {
228/* dentry private data. Each dentry must keep track of a lower 229/* dentry private data. Each dentry must keep track of a lower
229 * vfsmount too. */ 230 * vfsmount too. */
230struct ecryptfs_dentry_info { 231struct ecryptfs_dentry_info {
231 struct dentry *wdi_dentry; 232 struct path lower_path;
232 struct vfsmount *lower_mnt;
233 struct ecryptfs_crypt_stat *crypt_stat; 233 struct ecryptfs_crypt_stat *crypt_stat;
234}; 234};
235 235
@@ -356,26 +356,26 @@ ecryptfs_set_dentry_private(struct dentry *dentry,
356static inline struct dentry * 356static inline struct dentry *
357ecryptfs_dentry_to_lower(struct dentry *dentry) 357ecryptfs_dentry_to_lower(struct dentry *dentry)
358{ 358{
359 return ((struct ecryptfs_dentry_info *)dentry->d_fsdata)->wdi_dentry; 359 return ((struct ecryptfs_dentry_info *)dentry->d_fsdata)->lower_path.dentry;
360} 360}
361 361
362static inline void 362static inline void
363ecryptfs_set_dentry_lower(struct dentry *dentry, struct dentry *lower_dentry) 363ecryptfs_set_dentry_lower(struct dentry *dentry, struct dentry *lower_dentry)
364{ 364{
365 ((struct ecryptfs_dentry_info *)dentry->d_fsdata)->wdi_dentry = 365 ((struct ecryptfs_dentry_info *)dentry->d_fsdata)->lower_path.dentry =
366 lower_dentry; 366 lower_dentry;
367} 367}
368 368
369static inline struct vfsmount * 369static inline struct vfsmount *
370ecryptfs_dentry_to_lower_mnt(struct dentry *dentry) 370ecryptfs_dentry_to_lower_mnt(struct dentry *dentry)
371{ 371{
372 return ((struct ecryptfs_dentry_info *)dentry->d_fsdata)->lower_mnt; 372 return ((struct ecryptfs_dentry_info *)dentry->d_fsdata)->lower_path.mnt;
373} 373}
374 374
375static inline void 375static inline void
376ecryptfs_set_dentry_lower_mnt(struct dentry *dentry, struct vfsmount *lower_mnt) 376ecryptfs_set_dentry_lower_mnt(struct dentry *dentry, struct vfsmount *lower_mnt)
377{ 377{
378 ((struct ecryptfs_dentry_info *)dentry->d_fsdata)->lower_mnt = 378 ((struct ecryptfs_dentry_info *)dentry->d_fsdata)->lower_path.mnt =
379 lower_mnt; 379 lower_mnt;
380} 380}
381 381