1 files changed, 3 insertions, 3 deletions

diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index 6e62155abf26..9b0c55cb2a2e 100644
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -133,7 +133,7 @@ out:
 static int
 nfs_closedir(struct inode *inode, struct file *filp)
 {
-        put_nfs_open_dir_context(filp->f_path.dentry->d_inode, filp->private_data);
+        put_nfs_open_dir_context(file_inode(filp), filp->private_data);
         return 0;
 }
 
@@ -499,7 +499,7 @@ void nfs_prime_dcache(struct dentry *parent, struct nfs_entry *entry)
         if (IS_ERR(inode))
                 goto out;
 
-        alias = d_materialise_unique(dentry, inode);
+        alias = d_splice_alias(inode, dentry);
         if (IS_ERR(alias))
                 goto out;
         else if (alias) {
@@ -1393,7 +1393,7 @@ struct dentry *nfs_lookup(struct inode *dir, struct dentry * dentry, unsigned in
         nfs_advise_use_readdirplus(dir);
 
 no_entry:
-        res = d_materialise_unique(dentry, inode);
+        res = d_splice_alias(inode, dentry);
         if (res != NULL) {
                 if (IS_ERR(res))
                         goto out_unblock_sillyrename;