Merge remote-tracking branch 'asoc/fix/wm8962' into asoc-linus

[karo-tx-linux.git] / fs / ecryptfs / main.c

diff --git a/fs/ecryptfs/main.c b/fs/ecryptfs/main.c
index e924cf45aad9559533214814cccbb05aa7a06b44..eb1c5979ecaf673d7e984b6b78219217e63c9bc4 100644 (file)
--- 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;