diff options
Diffstat (limited to 'fs/ecryptfs/inode.c')
| -rw-r--r-- | fs/ecryptfs/inode.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/fs/ecryptfs/inode.c b/fs/ecryptfs/inode.c index edd1e44e9d47..e23861152101 100644 --- a/fs/ecryptfs/inode.c +++ b/fs/ecryptfs/inode.c | |||
| @@ -77,13 +77,13 @@ ecryptfs_create_underlying_file(struct inode *lower_dir_inode, | |||
| 77 | struct vfsmount *vfsmount_save; | 77 | struct vfsmount *vfsmount_save; |
| 78 | int rc; | 78 | int rc; |
| 79 | 79 | ||
| 80 | dentry_save = nd->dentry; | 80 | dentry_save = nd->path.dentry; |
| 81 | vfsmount_save = nd->mnt; | 81 | vfsmount_save = nd->path.mnt; |
| 82 | nd->dentry = lower_dentry; | 82 | nd->path.dentry = lower_dentry; |
| 83 | nd->mnt = lower_mnt; | 83 | nd->path.mnt = lower_mnt; |
| 84 | rc = vfs_create(lower_dir_inode, lower_dentry, mode, nd); | 84 | rc = vfs_create(lower_dir_inode, lower_dentry, mode, nd); |
| 85 | nd->dentry = dentry_save; | 85 | nd->path.dentry = dentry_save; |
| 86 | nd->mnt = vfsmount_save; | 86 | nd->path.mnt = vfsmount_save; |
| 87 | return rc; | 87 | return rc; |
| 88 | } | 88 | } |
| 89 | 89 | ||
| @@ -819,14 +819,14 @@ ecryptfs_permission(struct inode *inode, int mask, struct nameidata *nd) | |||
| 819 | int rc; | 819 | int rc; |
| 820 | 820 | ||
| 821 | if (nd) { | 821 | if (nd) { |
| 822 | struct vfsmount *vfsmnt_save = nd->mnt; | 822 | struct vfsmount *vfsmnt_save = nd->path.mnt; |
| 823 | struct dentry *dentry_save = nd->dentry; | 823 | struct dentry *dentry_save = nd->path.dentry; |
| 824 | 824 | ||
| 825 | nd->mnt = ecryptfs_dentry_to_lower_mnt(nd->dentry); | 825 | nd->path.mnt = ecryptfs_dentry_to_lower_mnt(nd->path.dentry); |
| 826 | nd->dentry = ecryptfs_dentry_to_lower(nd->dentry); | 826 | nd->path.dentry = ecryptfs_dentry_to_lower(nd->path.dentry); |
| 827 | rc = permission(ecryptfs_inode_to_lower(inode), mask, nd); | 827 | rc = permission(ecryptfs_inode_to_lower(inode), mask, nd); |
| 828 | nd->mnt = vfsmnt_save; | 828 | nd->path.mnt = vfsmnt_save; |
| 829 | nd->dentry = dentry_save; | 829 | nd->path.dentry = dentry_save; |
| 830 | } else | 830 | } else |
| 831 | rc = permission(ecryptfs_inode_to_lower(inode), mask, NULL); | 831 | rc = permission(ecryptfs_inode_to_lower(inode), mask, NULL); |
| 832 | return rc; | 832 | return rc; |
