2 files changed, 6 insertions, 8 deletions

diff --git a/fs/ecryptfs/file.c b/fs/ecryptfs/file.c
index a7abbea2c096..0943f6f20b1c 100644
--- a/fs/ecryptfs/file.c
+++ b/fs/ecryptfs/file.c
@@ -49,7 +49,7 @@ static ssize_t ecryptfs_read_update_atime(struct kiocb *iocb,
                                 unsigned long nr_segs, loff_t pos)
 {
         ssize_t rc;
-        struct path lower;
+        struct path *path;
         struct file *file = iocb->ki_filp;
 
         rc = generic_file_aio_read(iocb, iov, nr_segs, pos);
@@ -60,9 +60,8 @@ static ssize_t ecryptfs_read_update_atime(struct kiocb *iocb,
         if (-EIOCBQUEUED == rc)
                 rc = wait_on_sync_kiocb(iocb);
         if (rc >= 0) {
-                lower.dentry = ecryptfs_dentry_to_lower(file->f_path.dentry);
-                lower.mnt = ecryptfs_dentry_to_lower_mnt(file->f_path.dentry);
-                touch_atime(&lower);
+                path = ecryptfs_dentry_to_lower_path(file->f_path.dentry);
+                touch_atime(path);
         }
         return rc;
 }
diff --git a/fs/ecryptfs/main.c b/fs/ecryptfs/main.c
index e924cf45aad9..eb1c5979ecaf 100644
--- a/fs/ecryptfs/main.c
+++ b/fs/ecryptfs/main.c
@@ -120,16 +120,15 @@ static int ecryptfs_init_lower_file(struct dentry *dentry,
                                     struct file **lower_file)
 {
         const struct cred *cred = current_cred();
-        struct dentry *lower_dentry = ecryptfs_dentry_to_lower(dentry);
-        struct vfsmount *lower_mnt = ecryptfs_dentry_to_lower_mnt(dentry);
+        struct path *path = ecryptfs_dentry_to_lower_path(dentry);
         int rc;
 
-        rc = ecryptfs_privileged_open(lower_file, lower_dentry, lower_mnt,
+        rc = ecryptfs_privileged_open(lower_file, path->dentry, path->mnt,
                                       cred);
         if (rc) {
                 printk(KERN_ERR "Error opening lower file "
                        "for lower_dentry [0x%p] and lower_mnt [0x%p]; "
-                       "rc = [%d]\n", lower_dentry, lower_mnt, rc);
+                       "rc = [%d]\n", path->dentry, path->mnt, rc);
                 (*lower_file) = NULL;
         }
         return rc;