Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...

[firefly-linux-kernel-4.4.55.git] / fs / nfs / cache_lib.c

diff --git a/fs/nfs/cache_lib.c b/fs/nfs/cache_lib.c
index 84690319e625d5ef35aadeee5d9535291f9ffd5e..c98b439332fcf913bcc4dfb4e34242dfed5c70a0 100644 (file)
--- a/fs/nfs/cache_lib.c
+++ b/fs/nfs/cache_lib.c
@@ -113,19 +113,18 @@ int nfs_cache_wait_for_upcall(struct nfs_cache_defer_req *dreq)
 
 int nfs_cache_register(struct cache_detail *cd)
 {
-       struct nameidata nd;
        struct vfsmount *mnt;
+       struct path path;
        int ret;
 
        mnt = rpc_get_mount();
        if (IS_ERR(mnt))
                return PTR_ERR(mnt);
-       ret = vfs_path_lookup(mnt->mnt_root, mnt, "/cache", 0, &nd);
+       ret = vfs_path_lookup(mnt->mnt_root, mnt, "/cache", 0, &path);
        if (ret)
                goto err;
-       ret = sunrpc_cache_register_pipefs(nd.path.dentry,
-                       cd->name, 0600, cd);
-       path_put(&nd.path);
+       ret = sunrpc_cache_register_pipefs(path.dentry, cd->name, 0600, cd);
+       path_put(&path);
        if (!ret)
                return ret;
 err: